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 @@
技术委员会常务副主任/总院院长
-
+
@@ -352,8 +352,8 @@
总院技术委员会主任
-
-
+
+
@@ -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 @@
外部标准化协会入会流程
- 选择人员确认
+ 提名入会代表