Merge remote-tracking branch 'origin/pet' into pet

src/views/hidden/list/components/list.vue

@@ -360,25 +360,26 @@ export default {
     },
     // 重置
     goKeyReset() {
-      this.KEYWORDS = ''
+      // this.KEYWORDS = ''
-      this.STATE = ''
+      // this.STATE = ''
-      this.SOURCE = ''
+      // this.SOURCE = ''
-      this.RECTIFICATIONORNAME = ''
+      // this.RECTIFICATIONORNAME = ''
-      this.HIDDENFIND_NAME = ''
+      // this.HIDDENFIND_NAME = ''
-      this.CHECKNAME = ''
+      // this.CHECKNAME = ''
-      this.confirmUserName = ''
+      // this.confirmUserName = ''
-      this.keyFindUserDept = ''
+      // this.keyFindUserDept = ''
-      this.keyHiddenPart = ''
+      // this.keyHiddenPart = ''
-      this.DEPARTMENT_ID = ''
+      // this.DEPARTMENT_ID = ''
-      this.dates = []
+      // this.dates = []
-      this.DISPOSESTATE = ''
+      // this.DISPOSESTATE = ''
-      this.ISQUALIFIED = ''
+      // this.ISQUALIFIED = ''
-      this.$refs.deptTree_Select3.clearHandle()
+      // this.$refs.deptTree_Select3.clearHandle()
-      this.$refs.deptTree_Select.clearHandle()
+      // this.$refs.deptTree_Select.clearHandle()
-      this.$refs.hlTree_Select.clearHandle()
+      // this.$refs.hlTree_Select.clearHandle()
-      this.HIDDENLEVEL = ''
+      // this.HIDDENLEVEL = ''
-      this.$refs.hiddenPart_Select.clearHandle()
+      // this.$refs.hiddenPart_Select.clearHandle()
-      this.getQuery()
+      this.$refs.multipleTable.clearSelection()
+      this.getList()
     },
     // 获得部门树
     getTreeData1() {

src/views/hiddenApi/publicMethod/list.vue

@@ -186,7 +186,7 @@
           <template v-if="row.checkNames != ''"><span>{{ row.checkNames }}</span></template>
         </template>
       </el-table-column>
-      <el-table-column prop="" label="操作" width="200" align="center">
+      <el-table-column prop="" label="操作" width="400" align="center">
         <template slot-scope="{row}">
           <el-button v-if="hasButtenAllMap.buttenTypeGoView" icon="el-icon-view" size="mini" @click="goView(row.HIDDEN_ID)">查看</el-button>
           <el-button v-if="hasButtenAllMap.buttenTypeRectify" type="success" icon="el-icon-document" size="mini" @click="addTempSafeMeasureBtn(row.DAYNUM, row.HIDDEN_ID, row.TEMP_SAFE_MEASURE)">临时安全措施</el-button>

src/views/hiddenUtil/information.vue

@@ -103,7 +103,7 @@
                 <td class="tbg">整改类型</td>
                 <td>
                   <template>
-                    {{ pd.RECTIFICATIONTYPE === '1' ? '限期整改' : '立即整改' }}
+                    {{ pd.RECTIFICATIONTYPE === '1' ? '立即整改' : '限期整改' }}
                   </template>
                 </td>
               </tr>

src/views/hotwork/hotwork/components/info.vue

@@ -44,7 +44,7 @@
               <td colspan="5">{{ pd.JOB_CONTENT }}</td>
             </tr>
             <tr>
-              <td class="tbg" rowspan="2">现场负责人</td>
+              <td class="tbg" rowspan="2">现场管辖人</td>
               <td>姓名：{{ pd.SITE_LEADER_NAME }}</td>
               <td class="tbg" rowspan="2">动火操作人</td>
               <td rowspan="2">{{ pd.HOT_WORK_OPERATOR_NAME }}</td>

src/views/safetyenvironmental/inspection/components/edit.vue

@@ -907,6 +907,7 @@ export default {
           this.$set(this.form, 'delHiddens', this.delHiddens.join(','))
           this.$set(this.form, 'delHiddenFiles', this.delHiddenFiles.join(','))
           this.listLoading = true
+          this.form.INSPECTION_STATUS = '0'
           requestFN(
             '/safetyenvironmental/' + this.dialogType,
             { ...this.form }