From 161364a52b1b206ee29efed3081af057e0ebd11d Mon Sep 17 00:00:00 2001
From: "wangxiahui@91isoft.com" <140316hui>
Date: Thu, 16 Dec 2021 18:05:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E4=BC=9A=E9=80=89=E4=BA=BA=E5=92=8C?=
 =?UTF-8?q?=E9=99=84=E4=BB=B6=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzhHd-rh/step1.vue     | 21 ++++++++++++-------
 .../pages/creatProcess/bzhHd-rh/step2.vue     |  2 +-
 .../pages/creatProcess/bzhHd-rh/step3.vue     |  6 +++---
 .../pages/creatProcess/bzhHh-hh/step1.vue     | 18 ++++++++--------
 .../pages/creatProcess/bzhHy-ch/step1.vue     |  6 +++---
 5 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
index 792560783..13f2883aa 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
@@ -110,7 +110,7 @@
                 :action="uploadPath"
                 name="file"
                 :file-list="fileTextList"
-                accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
+                accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
                 :before-upload="handleBeforeUpload"
                 :before-remove="handleBeforeRemove"
                 :on-success="handleOnsuccess"
@@ -341,7 +341,7 @@
                   <h4>技术委员会常务副主任/总院院长</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.engineerUserId" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.engineerUser" placeholder="选择人员" @click.native="choiceZRROne('engineerUser', '选择人员', roleForm.engineerUser)">
+                    <el-input v-model="roleForm.engineerUser" placeholder="选择技术委员会常务副主任/总院院长" @click.native="choiceZRROne('engineerUser', '选择人员', roleForm.engineerUser)">
                     </el-input>
                   </div>
                 </el-form-item>
@@ -352,8 +352,8 @@
                 <el-form-item prop="totalLeader" style="margin-bottom: 0">
                   <h4>总院技术委员会主任</h4>
                   <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.startUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.startUserName" :disabled="true" placeholder="选择总院技术委员会主任">
+                    <el-input v-model="roleForm.directorUserId" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.directorUserName" placeholder="选择总院技术委员会主任" @click.native="choiceZRROne('directorUserId', '选择人员', roleForm.directorUserName)">
                     </el-input>
                   </div>
                 </el-form-item>
@@ -477,7 +477,8 @@ export default {
         feeUserId: '',
         engineerUser: '',
         engineerUserId: '',
-
+        directorUserId: '',
+        directorUserName: '',
       },
       rh_rules: {},
       roleFormRules: {
@@ -486,6 +487,7 @@ export default {
         leaderUser: [{required: true, message: "请选择标准法规部主管领导", trigger: ['blur', 'change']}],
         feeUser: [{required: true, message: "请选择费用管理部门人员", trigger: ['blur', 'change']}],
         engineerUser: [{required: true, message: "请选择技术委员会常务副主任/总院院长", trigger: ['blur', 'change']}],
+        directorUserName: [{required: true, message: "请选择总院技术委员会主任", trigger: ['blur', 'change']}],
       },
       roleShowflag: false,
       roleShowflagOne: false,
@@ -556,11 +558,11 @@ export default {
       var fileSuffix = filename.substring(index1, index2)
       // const fileSuffix = file.name.split('.')[1] // 后缀名
       // 判断上传文件格式
-      if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+      if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') {
         return true
       } else {
         this.spinShow = false
-        this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件')
+        this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX/PDF或XLS文件')
         return false
       }
       // 判断文件上传大小
@@ -699,9 +701,12 @@ export default {
       if (this.type === 'leaderUser') {
         this.roleForm.leaderUser = data[0].name
         this.roleForm.leaderUserId = data[0].id
-      } else {
+      } else if(this.type === 'ngineerUser'){
         this.roleForm.engineerUser = data[0].name
         this.roleForm.engineerUserId = data[0].id
+      } else {
+        this.roleForm.directorUserName = data[0].name
+        this.roleForm.directorUserId = data[0].id
       }
       this.roleShowflagOne = false
     },
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
index 0c1ce8d08..41be31d75 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
@@ -2,7 +2,7 @@
   <div class="bzrhStep2">
     <ProcessHeader toggle>
       <template slot="proName">外部标准化协会入会流程</template>
-      <template slot="proNode">选择人员确认</template>
+      <template slot="proNode">提名入会代表</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
index c0b71a1bd..61cf5efe7 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
@@ -184,7 +184,7 @@
                     :action="uploadPath"
                     name="file"
                     :file-list="fillFileList"
-                    accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
+                    accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
                     :before-upload="handleBeforeUpload"
                     :before-remove="handleBeforeRemove"
                     :on-success="handleOnsuccess"
@@ -506,11 +506,11 @@ export default {
       var fileSuffix = filename.substring(index1, index2)
       // const fileSuffix = file.name.split('.')[1] // 后缀名
       // 判断上传文件格式
-      if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+      if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') {
         return true
       } else {
         this.spinShow = false
-        this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件')
+        this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX/PDF或XLS文件')
         return false
       }
       // 判断文件上传大小
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue
index 275d52ffd..321baa576 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue
@@ -127,7 +127,7 @@
                 ref="uploadOtherFile"
                 name="file"
                 :file-list="upOtherData"
-                accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
+                accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
                 :before-upload="beforeUploadOther"
                 :before-remove="beforeRemoveOther"
                 :on-success="onsuccessOther"
@@ -202,7 +202,7 @@
         :action="actionPath"
         name="file"
         :file-list="reData"
-        accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
+        accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
         :before-upload="handleBeforeUpload"
         :before-remove="handleBeforeRemove"
         :on-success="handleOnsuccess"
@@ -223,7 +223,7 @@
         :action="actionPath"
         name="file"
         :file-list="themeData"
-        accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
+        accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
         :before-upload="beforeUploadTheme"
         :before-remove="beforeRemoveTheme"
         :on-success="onsuccessTheme"
@@ -420,11 +420,11 @@ export default {
       var fileSuffix = filename.substring(index1, index2)
       // const fileSuffix = file.name.split('.')[1] // 后缀名
       // 判断上传文件格式
-      if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+      if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') {
         return true
       } else {
         this.spinShow = false
-        this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件')
+        this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX/PDF或XLS文件')
         return false
       }
       // 判断文件上传大小
@@ -493,11 +493,11 @@ export default {
       var fileSuffix = filename.substring(index1, index2)
       // const fileSuffix = file.name.split('.')[1] // 后缀名
       // 判断上传文件格式
-      if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+      if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') {
         return true
       } else {
         this.spinShow = false
-        this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件')
+        this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX/PDF或XLS文件')
         return false
       }
       // 判断文件上传大小
@@ -553,11 +553,11 @@ export default {
       var fileSuffix = filename.substring(index1, index2)
       // const fileSuffix = file.name.split('.')[1] // 后缀名
       // 判断上传文件格式
-      if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+      if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') {
         return true
       } else {
         this.spinShow = false
-        this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件')
+        this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX/PDF或XLS文件')
         return false
       }
       // 判断文件上传大小
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
index 96510f1c9..939f0d879 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
@@ -124,7 +124,7 @@
                     :action="uploadPath"
                     name="file"
                     :file-list="ch_pageData.fileTextList"
-                    accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
+                    accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
                     :before-upload="handleBeforeUpload"
                     :before-remove="handleBeforeRemove"
                     :on-success="handleOnsuccess"
@@ -484,11 +484,11 @@ export default {
       var fileSuffix = filename.substring(index1, index2)
       // const fileSuffix = file.name.split('.')[1] // 后缀名
       // 判断上传文件格式
-      if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+      if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') {
         return true
       } else {
         this.spinShow = false
-        this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件')
+        this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX/PDF或XLS文件')
         return false
       }
       // 判断文件上传大小