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

src/views/firefighting/points/components/list.vue

@@ -133,7 +133,7 @@
     <el-dialog v-loading ="listLoading" :visible.sync="dialogEditUser" title="批量修改负责人" width="800px">
       <el-form ref="firefightingBatchEditDept" :model="dialogEditUserForm" :rules="dialogEditUserRules" label-width="150px">
         <el-row>
-          <el-form-item label="负责部门" prop="USER_ID">
+          <el-form-item label="负责人员" prop="USER_ID">
             <el-select v-model="dialogEditUserForm.USER_ID" placeholder="请选择人员" class="filter-item" style="width: 80%;">
               <el-option v-for="item in userList" :key="item.USER_ID" :label="item.NAME" :value="item.USER_ID"/>
             </el-select>

src/views/firefighting/region/components/list.vue

@@ -304,9 +304,9 @@ export default {
               DATA_IDS: this.editDataIds.join(','),
               DEPARTMENT_ID: this.form.DEPARTMENT_ID
             }
-          ).then(() => {
+          ).then((data) => {
             this.$message({
-              message: '修改成功',
+              message: data.msg,
               type: 'success'
             })
             this.$refs.multipleTable.clearSelection()

src/views/xgf/flowApply/components/userInfo.vue

@@ -263,18 +263,38 @@
                 <td style="width: 180px">{{ item.SPECIAL_TYPE_NAME }}</td>
                 <th style="width: 150px">操作项目</th>
                 <td>{{ item.OPERATION_TYPE_NAME }}</td>
+                <th style="width: 100px">证书照片</th>
+                <td>
+                  <span>
+                    <div class="img-flex">
+                      <viewer>
+                        <img
+                          :src="config.fileUrl + item.FILEPATH"
+                          width="40"
+                          height="40"
+                          style="object-fit: cover;">
+                        <img
+                          v-if="item.FILEPATH_BACK"
+                          :src="config.fileUrl + item.FILEPATH_BACK"
+                          width="40"
+                          height="40"
+                          style="object-fit: cover;">
+                      </viewer>
+                    </div>
+                  </span>
+                </td>
               </tr>
               <tr>
                 <th>特种作业证书编号</th>
                 <td>{{ item.SPECIAL_NUMBER }}</td>
                 <th>发证机关</th>
-                <td colspan="3">{{ item.ISSUING_AUTHORITY }}</td>
+                <td colspan="5">{{ item.ISSUING_AUTHORITY }}</td>
               </tr>
               <tr>
                 <th>复审时间</th>
                 <td>{{ item.REVIEW_TIME }}</td>
                 <th>有效期</th>
-                <td colspan="3">{{ item.VALIDITY_TIME_START }} 至 {{ item.VALIDITY_TIME_END }}</td>
+                <td colspan="5">{{ item.VALIDITY_TIME_START }} 至 {{ item.VALIDITY_TIME_END }}</td>
               </tr>
             </table>
             <div v-if="applyList.length > 0" class="level-title mt-20">

src/views/xgf/insert/components/corpInfoAdd.vue

@@ -419,11 +419,6 @@ export default {
       ).then((data) => {
         const treeData = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes')
         this.treeData = this.removeEmptyChildren(treeData)
-        this.treeData.push({
-          id: '0',
-          name: '无',
-          nodes: []
-        })
       }).catch((e) => {
       })
     },

src/views/xgf/insert/components/corpInfoEdit.vue

@@ -539,11 +539,6 @@ export default {
         ).then((data) => {
           const treeData = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes')
           this.treeData = this.removeEmptyChildren(treeData)
-          this.treeData.push({
-            id: '0',
-            name: '无',
-            nodes: []
-          })
           console.log(this.treeData)
         }).catch((e) => {
         })