From 30796b6799b721b6c7371d9c7144032af37436f3 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Wed, 6 Sep 2023 08:57:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E4=BD=9C=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/modules/EquipRepairExecute.vue | 20 +++++++++++++++-----
 pages/modules/MaintainResultFill.vue | 17 ++++++++++++++---
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/pages/modules/EquipRepairExecute.vue b/pages/modules/EquipRepairExecute.vue
index f7fdbc2..1383605 100644
--- a/pages/modules/EquipRepairExecute.vue
+++ b/pages/modules/EquipRepairExecute.vue
@@ -40,10 +40,10 @@
 			</view>
 		</view>
 		<view class="submit-bar">
-			<button class="submit-button" :class="{'btn-disabled': !val1 || !pkId || !index}" :disabled="disabled" @tap="_confirmInstor">开始维修</button>
-			<button class="submit-button" @tap="searchList">填报</button>
-			<button class="submit-button" @tap="searchList">委外维修</button>
-			<button class="submit-button" @tap="searchList">结束维修</button>
+			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled1" @tap="toSure1">开始维修</button>
+			<button class="submit-button" :class="{'btn-disabled': !pkId}" @tap="toJump">填报</button>
+			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled2" @tap="toSure2">委外维修</button>
+			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled3" @tap="toSure3">结束维修</button>
 		</view>
 	</view>
 </template>
@@ -63,7 +63,9 @@
 				dataList: [],
 				pkId: '',
 				pkObj: {},
-				disabled: false
+				disabled1: false,
+				disabled2: false,
+				disabled3: false
 			};
 		},
 		created () {
@@ -98,6 +100,14 @@
 			toCheck (e) {
 				this.pkId = this.pkId === e.repair_id ? '' : e.repair_id
 				this.pkObj = this.pkId === e.repair_id ? e : {}
+			},
+			toJump () {
+				if (this.pkId) {
+				this.$store.dispatch('setPublicObj', this.pkObj)
+				uni.navigateTo({
+					url: '/pages/modules/MaintainResultFill'
+				})
+				}
 			}
 		}
 	}
diff --git a/pages/modules/MaintainResultFill.vue b/pages/modules/MaintainResultFill.vue
index 885a9dd..57e73fc 100644
--- a/pages/modules/MaintainResultFill.vue
+++ b/pages/modules/MaintainResultFill.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="zd_container">
-		<nav-bar title="维修结果填报"></nav-bar>
+		<nav-bar :inner2="true" @goIn="goIn" title="维修结果填报"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
 				<view class="filter_item">
@@ -56,8 +56,8 @@
 			</view>
 		</view>
 		<view class="submit-bar">
-			<button class="submit-button" :class="{'btn-disabled': !val1 || !pkId || !index}" :disabled="disabled" @tap="_confirmInstor">确认</button>
-			<button class="submit-button" @tap="searchList">取消</button>
+			<button class="submit-button" :class="{'btn-disabled': dataList.length === 0}" :disabled="disabled" @tap="dataList.length === 0">确认</button>
+			<button class="submit-button" @tap="toCancle">取消</button>
 		</view>
 	</view>
 </template>
@@ -74,6 +74,8 @@
 		data() {
 			return {
 				val1: '',
+				val2: '',
+				val3: '',
 				dataList: [],
 				pkId: '',
 				pkObj: {},
@@ -112,6 +114,15 @@
 			toCheck (e) {
 				this.pkId = this.pkId === e.repair_id ? '' : e.repair_id
 				this.pkObj = this.pkId === e.repair_id ? e : {}
+			},
+			toCancle () {
+			  this.$store.dispatch('setPublicObj', {})
+			  this.goIn()
+			},
+			goIn () {
+				uni.redirectTo({
+					url: '/pages/modules/EquipRepairExecute'
+				})
 			}
 		}
 	}