Merge branch 'liujun-2024-02-04-相关方新流程上线后新提需求' into dev

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

@@ -519,8 +519,8 @@ export default {
         ).then((data) => {
           if (data.message != null) {
             this.INSPECTION_DEPARTMENT_ID = ''
-            this.INSPECTOR_List = []
             this.INSPECTION_USER_ID = ''
+            this.form.inspectorList.splice(i,1)
             this.$message.error(data.message)
           } else {
             // 获取人员列表
@@ -544,9 +544,9 @@ export default {
         }).catch((e) => {
         })
       }
-      this.form.inspectorList = []
-      this.form.inspectorList.push({ INSPECTION_INSPECTOR_ID: item.INSPECTION_INSPECTOR_ID, INSPECTION_DEPARTMENT_ID: item.INSPECTION_DEPARTMENT_ID, INSPECTION_USER_ID: '', USER_SIDE: item.USER_SIDE })
-      this.INSPECTOR_List.push([])
+      // this.form.inspectorList = []
+      // this.form.inspectorList.push({ INSPECTION_INSPECTOR_ID: item.INSPECTION_INSPECTOR_ID, INSPECTION_DEPARTMENT_ID: item.INSPECTION_DEPARTMENT_ID, INSPECTION_USER_ID: '', USER_SIDE: item.USER_SIDE })
+      // this.INSPECTOR_List.push([])
     },
     // 获取人员列表
     getInspectorList(DEPARTMENT_ID, i) {

src/views/util/uploadFile/index.vue

@@ -66,6 +66,17 @@ export default {
         this.$refs.uploadFile.clearFiles()
         return false
       }
+      let nameNumber = 0
+      for (let j = 0; j < fileList.length; j++) {
+        if (fileList[j].name === file.name) {
+          nameNumber = nameNumber + 1
+        }
+      }
+      if (nameNumber > 1) {
+        this.$message.error('文件名重复,请重新选择!')
+        this.$refs.uploadFile.handleRemove(file)
+        return false
+      }
       this.$emit('update:fileList', fileList)
     },
     onRemove(file, fileList) {

src/views/xgf/flow/components/entrust.vue

@@ -1,10 +1,10 @@
 <template>
   <div>
     <el-dialog v-loading = "loading" :visible.sync="visible" :append-to-body="appendToBody" :before-close="beforeClose" title="审批" width="1200px" destroy-on-close>
-      <el-form ref="form" :model="form" :rules="rules" label-width="200px" label-position="right" type="flex">
+      <el-form ref="form" :model="form" :rules="rules" label-width="210px" label-position="right" type="flex">
         <el-row :gutter="12">
           <el-col :span="12">
-            <el-form-item prop="APPOINT_DEPARTMENT_ID" label="指定监管部门:">
+            <el-form-item prop="APPOINT_DEPARTMENT_ID" label="指定辖区单位主管部门:">
               <Treeselect
                 :options="departmentTree"
                 :normalizer="normalizer"
@@ -18,7 +18,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item prop="APPOINT_USER_ID" label="指定监管部门审批人:">
+            <el-form-item prop="APPOINT_USER_ID" label="指定辖区单位主管部门审批人:">
               <el-select v-model="form.user" style="width: 300px" placeholder="请选择" @change="chooseUser">
                 <el-option v-for="item in peopleList" :key="item.USER_ID" :value="JSON.stringify(item)" :label="item.NAME"/>
               </el-select>
@@ -32,7 +32,7 @@
                 :file-list.sync="form.APPOINT_ANNEX"
                 :multiple="false"
                 :accept="'.pdf,.jpg,.png,doc,docx'"
-                :limit="1"
+                :limit="20"
                 :size="1024"
                 :upload-type="1"/>
             </el-form-item>
@@ -133,7 +133,9 @@ export default {
           Object.keys(this.form).map(key => {
             formData.append(key, this.form[key])
           })
-          formData.append('weiTuoShu', this.form.APPOINT_ANNEX[0].raw)
+          for (let i = 0; i < this.form.APPOINT_ANNEX.length; i++) {
+            formData.append('weiTuoShu', this.form.APPOINT_ANNEX[i].raw)
+          }
           upload('/xgf/user/attorney', formData)
             .then((data) => {
               this.$message.success('推送成功')

src/views/xgf/flow/components/list.vue

@@ -43,7 +43,7 @@
         <template slot-scope="{row}">
           <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row)">详情</el-button>
           <el-button v-if="row.power_flag === '1'" type="primary" icon="el-icon-s-claim" size="mini" @click="approve([row])">审批</el-button>
-          <el-button v-if="row.power_flag === '1' && row.FLOWS_STEP === 1" type="primary" icon="el-icon-s-claim" size="mini" @click="entrust([row])">委托制单单位审批</el-button>
+          <el-button v-if="row.power_flag === '1' && row.FLOWS_STEP === 1" type="primary" icon="el-icon-s-claim" size="mini" @click="entrust([row])">委托辖区单位审批</el-button>
           <el-button v-if="false" type="success" icon="el-icon-edit" size="mini" @click="getUserInfo(row)">电子合格证</el-button>
         </template>
       </el-table-column>

src/views/xgf/flow_audit/userInfo.vue

@@ -139,12 +139,20 @@
           </table>
           <div v-if="userDetailForm.ANNEX" style="padding-bottom: 10px">
             <div class="level-title">
-              <h1>承诺书</h1>
+              <h1>相关方承诺书</h1>
             </div>
             <div>
               <el-button icon="el-icon-download" type="primary" @click = "download(userDetailForm.ANNEX)">下载附件</el-button>
             </div>
           </div>
+          <div v-if="userDetailForm.COMMITMENT_LETTER" style="padding-bottom: 10px">
+            <div class="level-title">
+              <h1>集团单位承诺书</h1>
+            </div>
+            <div>
+              <el-button icon="el-icon-download" type="primary" @click = "download(userDetailForm.COMMITMENT_LETTER)">下载附件</el-button>
+            </div>
+          </div>
           <div v-if="userDetailForm.ATTORNEY" style="padding-bottom: 10px">
             <div class="level-title">
               <h1>委托书</h1>