From 6b493efef0914c94fe87a3e1ab71e22d661aa3e9 Mon Sep 17 00:00:00 2001
From: songwenxuan <1924103812@qq.com>
Date: Fri, 23 Feb 2024 18:00:49 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=9B=91=E7=AE=A1?=
 =?UTF-8?q?=E7=AB=AF=E5=8F=91=E8=B5=B7=E5=AE=89=E5=85=A8=E7=8E=AF=E4=BF=9D?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5=E6=97=B6=EF=BC=8C=E5=BD=93=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E4=B8=AA=E6=A3=80=E6=9F=A5=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=98=AF=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E7=9A=84=E4=BC=9A=E6=B8=85=E9=99=A4=E4=B9=8B=E5=89=8D=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E7=9A=84bug=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../safetyenvironmental/inspection/components/add.vue     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/safetyenvironmental/inspection/components/add.vue b/src/views/safetyenvironmental/inspection/components/add.vue
index 2f76f94..54407d9 100644
--- a/src/views/safetyenvironmental/inspection/components/add.vue
+++ b/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) {

From 1cd73243f6d0c3c5191632c1b455e26ba22ab180 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Mon, 26 Feb 2024 15:17:22 +0800
Subject: [PATCH 2/3] =?UTF-8?q?1=E3=80=81=E9=9B=86=E5=9B=A2=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=E6=96=B0=E5=A2=9E=E4=B8=8A=E4=BC=A0=E6=89=BF=E8=AF=BA?=
 =?UTF-8?q?=E4=B9=A6=E5=8A=9F=E8=83=BD=202=E3=80=81=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=8D=95=E4=BC=A0=E5=8F=98=E5=A4=9A=E4=BC=A0=203=E3=80=81?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E4=B8=8B=E8=BD=BD=E9=99=84=E8=BF=91?=
 =?UTF-8?q?=E5=90=88=E9=9B=86=204=E3=80=81=E4=BF=AE=E6=94=B9=E5=8E=86?=
 =?UTF-8?q?=E5=8F=B2=E6=96=87=E4=BB=B6=E6=9C=AA=E6=B8=85=E7=A9=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xgf/flow/components/entrust.vue | 12 +++++++-----
 src/views/xgf/flow/components/list.vue    |  2 +-
 src/views/xgf/flow_audit/userInfo.vue     | 10 +++++++++-
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/views/xgf/flow/components/entrust.vue b/src/views/xgf/flow/components/entrust.vue
index c412e3e..f199ce4 100644
--- a/src/views/xgf/flow/components/entrust.vue
+++ b/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('推送成功')
diff --git a/src/views/xgf/flow/components/list.vue b/src/views/xgf/flow/components/list.vue
index c1c6c8b..411ca21 100644
--- a/src/views/xgf/flow/components/list.vue
+++ b/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>
diff --git a/src/views/xgf/flow_audit/userInfo.vue b/src/views/xgf/flow_audit/userInfo.vue
index de94bdd..da7dd0e 100644
--- a/src/views/xgf/flow_audit/userInfo.vue
+++ b/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>

From a9c0eb45d7181c12231b529715e04745d4303c17 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Tue, 27 Feb 2024 11:03:55 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/util/uploadFile/index.vue | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/views/util/uploadFile/index.vue b/src/views/util/uploadFile/index.vue
index ba25c46..a672a6e 100644
--- a/src/views/util/uploadFile/index.vue
+++ b/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) {