禅道bug修复

src/views/hiddenDangerManagement/hazardRectificationManagement/hazardRectificationApproval/index.vue

@@ -41,6 +41,12 @@
           format="yyyy-MM-dd"
         />
       </el-form-item>
+
+      <el-form-item label="审批状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择审批状态" clearable>
+          <el-option v-for="item in approvalStatusOptions" :key="item.value" :label="item.label" :value="item.value" />
+        </el-select>
+      </el-form-item>
       <el-form-item style="display: flex; justify-content: flex-end" v-if="userType == '00'">
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">查询</el-button>
         <el-button icon="el-icon-refresh" @click="handleReset">重置</el-button>
@@ -270,7 +276,7 @@
         <template slot-scope="scope">
           <el-button type="text" size="mini" @click="handleRectify(scope.row, 5)">查看</el-button>
           <el-button
-            v-if="userType == '00' && (scope.row.intoStatus == '1' || scope.row.intoStatus == '2')"
+            v-if="userType == '00' && scope.row.intoStatus == '1'"
             type="text"
             size="mini"
             style="color: #f56c6c"
@@ -278,6 +284,15 @@
           >
             审批
           </el-button>
+          <!-- <el-button
+            v-if="userType == '00' && (scope.row.intoStatus == '1' || scope.row.intoStatus == '2')"
+            type="text"
+            size="mini"
+            style="color: #f56c6c"
+            @click="handleRectify(scope.row, 1)"
+          >
+            审批
+          </el-button> -->
           <el-button
             v-if="
               userType == '02' &&
@@ -377,6 +392,7 @@ export default {
         findTimeRange: [], // 发现时间范围
         createTimeRange: [], // 创建日期
         checkState: '', // 审批状态
+        status: '1',
       },
       // 隐患问题类别-下拉
       pitfallTypeOpts: [],

src/views/pro/supervisor/supervisedAdmission/index.vue

@@ -146,7 +146,7 @@ export default {
         2: '审批中',
         3: '已通过',
         4: '已驳回',
-        5: '已撤销',
+        5: '已撤回',
       },
     }
   },
@@ -212,6 +212,7 @@ export default {
               isExamine: false,
               btnShow: false,
               showType: 1,
+              enterStatus: this.updateStatus(row.intoStatus),
             })
           )
       )

src/views/pro/supervisor/supervisedAdmission/supervisorApproval.vue

@@ -307,6 +307,7 @@
         v-on:finalInstance="approvalFinalInstance"
         :opinionValueOther="opinionValueOther"
         :auditReason="[]"
+        :enterStatus="enterStatus"
       />
     </el-tab-pane>
   </el-tabs>
@@ -398,12 +399,14 @@ export default {
       // 阅读文件时的意见
       opinionValueOther: '',
       approvalItems: [],
+      enterStatus: '',
     }
   },
   created() {
     this.lookFaceFile = lookFaceFile()
     const params = this.$route.params && this.$route.params.data
     this.paramsData = JSON.parse(decryptCBC(params))
+    this.enterStatus = this.paramsData.enterStatus
     console.log('this.paramsData', this.paramsData)
     this.getSupervisorList()
   },