From 5208846fc786c9a3414ebaa0d9ff6c84c3fdfb9d Mon Sep 17 00:00:00 2001
From: shanao <wangpeng@zcloudchina.com>
Date: Wed, 13 Nov 2024 16:46:46 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E4=BF=AE=E6=94=B9=E3=80=91=201.=20?=
 =?UTF-8?q?=E5=AE=89=E5=85=A8=E7=8E=AF=E4=BF=9D=E6=A3=80=E6=9F=A5=E6=9A=82?=
 =?UTF-8?q?=E5=AD=98=E5=86=8D=E6=AC=A1=E6=8F=90=E4=BA=A4=202.=20pc?=
 =?UTF-8?q?=E7=AB=AF=E6=97=A0=E6=B3=95=E5=86=8D=E6=AC=A1=E9=AA=8C=E6=94=B6?=
 =?UTF-8?q?=203.=20=E6=B6=88=E9=98=B2=E6=A3=80=E6=9F=A5=E6=89=93=E5=9B=9E?=
 =?UTF-8?q?=E6=B2=A1=E5=8F=8D=E5=BA=94=204.=20=E6=89=93=E5=9B=9E=E7=9A=84?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=20=E5=8A=A0=E5=88=A4=E7=A9=BA?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E5=88=A4=E7=A9=BA=E7=9A=84=E7=BA=A2=E6=98=9F?=
 =?UTF-8?q?=205.=20=E6=96=87=E4=BB=B6=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../record/components/recordInfo.vue          | 30 ++++++++++++-------
 .../forcedRollback/components/list.vue        | 18 +++++------
 .../inspection/components/edit.vue            |  3 +-
 3 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/src/views/firefighting/record/components/recordInfo.vue b/src/views/firefighting/record/components/recordInfo.vue
index 14e1f04..312ea13 100644
--- a/src/views/firefighting/record/components/recordInfo.vue
+++ b/src/views/firefighting/record/components/recordInfo.vue
@@ -110,8 +110,9 @@
                 </td>
               </template>
               <template>
-                <td v-if="data.ISCHECKED !== 2" class="text-center" ><a style="text-decoration: underline" @click="hitBackFunction(data.EQUIPMENT_RECORD_ID)">打回</a></td>
-                <td v-else class="text-center" >已打回</td>
+                <td class="text-center" >
+                  <a style="text-decoration: underline" @click="hitBackFunction(data.EQUIPMENT_RECORD_ID, data.ISCHECKED)">{{ data.ISCHECKED !== 2 ? '打回' : '已打回' }}</a>
+                </td>
               </template>
               <!--              <template>-->
               <!--                <td v-if="data.INDEX_F == '1'" :rowspan="data.ROWSPAN" class="text-center">-->
@@ -377,7 +378,11 @@ export default {
         this.listLoading = false
       })
     },
-    hitBackFunction(id) {
+    hitBackFunction(id, ISCHECKED) {
+      if (ISCHECKED === 2) {
+        this.$message.warning('已打回的不能再打回')
+        return
+      }
       console.log(id)
       this.EQUIPMENT_POINT_ID = id
       this.hitBack = true
@@ -388,6 +393,10 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
+        if (this.hitBackReason == null || this.hitBackReason === '') {
+          this.$message.warning('请填写打回说明')
+          return
+        }
         requestFN(
           '/fireRecord/cancel',
           {
@@ -396,16 +405,17 @@ export default {
           }
         ).then((data) => {
           this.listLoading = false
-          // 隐患待添加
+          this.getData()
         }).catch((e) => {
           this.listLoading = false
         })
-        this.FIRE_CHECK_ID = this.$parent.FIRE_CHECK_ID
-        this.FIRE_RECORD_ID = this.$parent.FIRE_RECORD_ID
-        this.SHOW_OR_EDIT = this.$parent.SHOW_OR_EDIT
-        this.recordBase = Object.assign({}, this.$parent.row)
-        this.getData()
-        this.getSignImgs(this.FIRE_RECORD_ID)
+
+        // this.FIRE_CHECK_ID = this.$parent.FIRE_CHECK_ID
+        // this.FIRE_RECORD_ID = this.$parent.FIRE_RECORD_ID
+        // this.SHOW_OR_EDIT = this.$parent.SHOW_OR_EDIT
+        // this.recordBase = Object.assign({}, this.$parent.row)
+        // this.getData()
+        // this.getSignImgs(this.FIRE_RECORD_ID)
       })
       this.hitBack = false
     }
diff --git a/src/views/hotwork/forcedRollback/components/list.vue b/src/views/hotwork/forcedRollback/components/list.vue
index 8a2dabc..28e4075 100644
--- a/src/views/hotwork/forcedRollback/components/list.vue
+++ b/src/views/hotwork/forcedRollback/components/list.vue
@@ -7,13 +7,13 @@
             <el-input v-model="searchForm.keyJobNumber" placeholder="请输入作业编号" class="filter-item" />
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label="特级动火审批状态" prop="keyHiddenDescr" label-width="130px">
-            <el-select v-model="searchForm.keyState" placeholder="请选择">
-              <el-option v-for="item in statusSuperList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
+        <!--        <el-col :span="6">-->
+        <!--          <el-form-item label="特级动火审批状态" prop="keyHiddenDescr" label-width="130px">-->
+        <!--            <el-select v-model="searchForm.keyState" placeholder="请选择">-->
+        <!--              <el-option v-for="item in statusSuperList" :key="item.id" :label="item.name" :value="item.id" />-->
+        <!--            </el-select>-->
+        <!--          </el-form-item>-->
+        <!--        </el-col>-->
         <el-col :span="6">
           <el-form-item label="动火等级" prop="HOT_WORK_LEVEL_INDEX" >
             <el-select v-model="searchForm.HOT_WORK_LEVEL_INDEX" placeholder="请选择" style="width: 80%">
@@ -26,13 +26,13 @@
             <el-input v-model="searchForm.JOB_CONTENT" placeholder="请输入动火内容" class="filter-item" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row>
         <el-col :span="6">
           <el-form-item label="动火部位" prop="keySource">
             <el-input v-model="searchForm.HOT_WORK_POSITION" placeholder="请输入动火部位" class="filter-item" />
           </el-form-item>
         </el-col>
+      </el-row>
+      <el-row>
         <el-col :span="6">
           <el-form-item label="动火区域管辖单位" prop="keySource" label-width="130px">
             <SelectTree
diff --git a/src/views/safetyenvironmental/inspection/components/edit.vue b/src/views/safetyenvironmental/inspection/components/edit.vue
index efc217b..ccdd63a 100644
--- a/src/views/safetyenvironmental/inspection/components/edit.vue
+++ b/src/views/safetyenvironmental/inspection/components/edit.vue
@@ -1192,10 +1192,11 @@ export default {
           this.$set(this.form, 'delSituations', this.delSituations.join(','))
           this.$set(this.form, 'delHiddens', this.delHiddens.join(','))
           this.$set(this.form, 'delHiddenFiles', this.delHiddenFiles.join(','))
+          this.form.INSPECTION_STATUS = '99'
           this.listLoading = true
           requestFN(
             '/safetyenvironmental/' + this.dialogType,
-            { ...this.form, INSPECTION_STATUS: '99' }
+            { ...this.form }
           ).then((data) => {
             for (let i = 0; i < data.pd.hiddenList.length; i++) {
               this.uploadImg(this.hdFile[i]['fileHdImgList'], data.pd.hiddenList[i].HIDDEN_ID)