From aa72dd137746710e3639c9fd863ab861f263ccb1 Mon Sep 17 00:00:00 2001
From: zhangdi <15053473693@163.com>
Date: Mon, 17 Feb 2025 16:39:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/businessManagement/inspection/repair.vue | 7 +++----
 src/views/businessManagement/inspection/task.vue   | 8 +++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/views/businessManagement/inspection/repair.vue b/src/views/businessManagement/inspection/repair.vue
index d1f2a6c..2f5a36f 100644
--- a/src/views/businessManagement/inspection/repair.vue
+++ b/src/views/businessManagement/inspection/repair.vue
@@ -93,7 +93,6 @@
                 <el-table-column label="工艺要求" prop="craft" width="150"></el-table-column>
                 <el-table-column label="状态" prop="status" v-if="errorForm.repairStatus != 1" width="100">
                   <template slot-scope="scope">
-                    {{ scope.row.remark }}
                     {{ scope.row.status == 1 ? '异常' : '正常' }}
                   </template>
                 </el-table-column>
@@ -137,7 +136,7 @@
                 </el-table-column>
                 <!-- 维修完成 -->
                 <el-table-column align="center" label="维修完成图片" width="200"
-                  v-if="(viewType != 'view')|| errorForm.repairStatus == 5 || errorForm.repairStatus == 6 || errorForm.repairStatus == 7 || errorForm.repairStatus == 8">
+                  v-if="(viewType != 'view')&& (errorForm.repairStatus == 4||errorForm.repairStatus == 5 || errorForm.repairStatus == 6 || errorForm.repairStatus == 7 || errorForm.repairStatus == 8)">
                   <template slot-scope="scope">
                     <div v-if="errorForm.repairStatus == 4">
                       <el-upload action="/api/blade-resource/oss/endpoint/put-file" list-type="picture-card"
@@ -168,7 +167,7 @@
             </el-form-item>
 
             <el-form-item label="维修总计"
-              v-if="viewType != 'view' ||(errorForm.repairStatus == 2 || errorForm.repairStatus == 3 || errorForm.repairStatus == 4 || errorForm.repairStatus == 5 || errorForm.repairStatus == 6 || errorForm.repairStatus == 7 || errorForm.repairStatus == 8 || errorForm.repairStatus == 102)">
+              v-if="viewType != 'view' &&(errorForm.repairStatus == 2 || errorForm.repairStatus == 3 || errorForm.repairStatus == 4 || errorForm.repairStatus == 5 || errorForm.repairStatus == 6 || errorForm.repairStatus == 7 || errorForm.repairStatus == 8 || errorForm.repairStatus == 102)">
               <el-input placeholder="请输入" v-model="errorForm.actualAmount" style="width:98%;"
                 :disabled="viewType == 'view' || (errorForm.repairStatus != 2 && errorForm.repairStatus != 102)"><template
                   slot="append">元</template></el-input>
@@ -230,7 +229,7 @@
           </div>
           <!-- 维修效果确认 -->
           <div
-            v-show="viewType != 'view'||( errorForm.repairStatus == 6 || errorForm.repairStatus == 7 || errorForm.repairStatus == 8)">
+            v-show="viewType != 'view'&&(  errorForm.repairStatus == 5 ||errorForm.repairStatus == 6 || errorForm.repairStatus == 7 || errorForm.repairStatus == 8)">
             <div style="
                   color: #101010;
                   font-size: 20px;
diff --git a/src/views/businessManagement/inspection/task.vue b/src/views/businessManagement/inspection/task.vue
index 4ff5744..16830cf 100644
--- a/src/views/businessManagement/inspection/task.vue
+++ b/src/views/businessManagement/inspection/task.vue
@@ -175,7 +175,7 @@
             </el-form-item>
           </div>
           <!-- 维修人员 接单 -->
-          <div v-show="addForm.taskStatus == 2||addForm.taskStatus == 3||addForm.taskStatus == 4|| dialogType != '查看'">
+          <div v-show="(addForm.taskStatus == 1||addForm.taskStatus == 2||addForm.taskStatus == 3||addForm.taskStatus == 4)&& dialogType != '查看'">
             <div style="
                   color: #101010;
                   font-size: 20px;
@@ -704,6 +704,7 @@ export default {
       this.inspectionForm.tableData = this.inspectionTable
       this.deviceName = ''
       // this.activeFloor = val.value
+      console.log(111111,this.inspectionTable)
       this.activeFloorName = val
       let firstFloor = this.addForm.details.find(item => item.floorName == this.activeFloorName)
       this.roomArr = firstFloor.details.map(item => item.deptName)
@@ -843,7 +844,7 @@ export default {
         this.inspectionForm = res.data.data
         this.dialogInspection = true
         this.inspectionForm.tableData = this.checkDeepData(res.data.data.details)
-        this.inspectionTable = JSON.parse(JSON.stringify(this.inspectionForm.tableData))
+        this.inspectionTable = this.inspectionForm.tableData
 
         this.floorArr = this.inspectionForm.details.map(item => item.floorName)
         this.activeFloorName = this.floorArr[0]
@@ -878,7 +879,7 @@ export default {
         this.inspectionForm = res.data.data
         this.dialogInspection = true
         this.inspectionForm.tableData = this.checkDeepData(res.data.data.details)
-        this.inspectionTable = JSON.parse(JSON.stringify(this.inspectionForm.tableData))
+        this.inspectionTable = this.inspectionForm.tableData
         this.inspectionForm.tableData.map(item => {
 
           if (item.picUrl != '') {
@@ -1039,6 +1040,7 @@ export default {
                 cancelButtonText: '取消',
                 type: 'warning'
               }).then(() => {
+                console.log('巡检提交',query)
                 servicemanUpdateDetail(query).then(res => {
                   if (res.data.code == 200) {
                     servicemanSubmit({ id: this.inspectionForm.id }).then(res => {