diff --git a/src/pages/processCenter/pages/components/ProcessFooter.vue b/src/pages/processCenter/pages/components/ProcessFooter.vue
index d594b5bb4..0e7bcbdb5 100644
--- a/src/pages/processCenter/pages/components/ProcessFooter.vue
+++ b/src/pages/processCenter/pages/components/ProcessFooter.vue
@@ -70,7 +70,7 @@
size="mini"
class="common-button-primary"
@click="handleSave"
- :loading="submitLoading"
+ :loading="saveLoading"
v-if="showSave">
保存
@@ -80,7 +80,7 @@
size="small"
class="common-button-danger"
@click="beforeBack"
- :loading="submitLoading"
+ :loading="isSubmitBack"
v-if="showBack">
{{ backBTNText }}
@@ -239,7 +239,7 @@ export default {
type: Boolean,
default: false
},
- // 保存按钮loading
+ // 退回按钮loading
isSubmitBack: {
type: Boolean,
default: false
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
index dd60c72b3..a2e046905 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
@@ -15,7 +15,7 @@
基础信息
-
+
@@ -156,7 +156,7 @@
-
+
@@ -196,35 +196,35 @@
fontWeight: 'bold', height: '20px'}">
-
+
-
+
-
+
-
+
@@ -252,7 +252,7 @@
-
+
技术委员会分委会主任/技术主管部门负责人
@@ -264,85 +264,85 @@
-
+
-
+
责任工程师
-
-
+
+
-
+
-
+
参会人员所在部门负责人
-
-
+
+
-
+
-
+
标准法规部人员
-
-
+
+
-
+
-
+
标准法规部主管领导
-
-
+
+
-
+
-
+
费用管理部门
-
-
+
+
-
+
-
+
技术委员会常务副主任/总院院长
-
-
+
+
-
+
-
+
总院技术委员会主任
-
-
+
+
@@ -363,6 +363,12 @@
+ {
+ let mes = JSON.parse(res.mes)
+ this.rh_pageData = mes.rh_pageData
+ this.roleForm = mes.roleForm
+ });
+ },
//上传按钮
- uploadFile (val) {
+ uploadFile(val) {
},
// 文件上传限制条件
handleBeforeUpload(file) {
@@ -489,8 +521,8 @@ export default {
handleBeforeRemove(file, fileList) {
this.fileData = fileList
this.fileTextList.forEach((item, index) => {
- if (item.name === file.name || item.id === file.id ) {
- this.fileTextList.splice(index,1)
+ if (item.name === file.name || item.id === file.id) {
+ this.fileTextList.splice(index, 1)
}
})
},
@@ -509,7 +541,7 @@ export default {
name: res.data.standName
})
}
- this.fileListData.fileText = this.newDataList
+ this.rh_pageData.infoSources = this.newDataList
this.$message({
showClose: true,
message: res.message,
@@ -563,31 +595,86 @@ export default {
},
// 流程阶段负责人选择
- choiceZRR (type, title, id) {
+ choiceZRR(type, title, id) {
this.nodeList = []
this.nodeList.push(id)
this.type = type
this.drawerTitle = title
this.roleShowflag = true
},
- drawerCheck (data) {
+ drawerCheck(data) {
+ var idList = ''
+ var nameList = ''
+ data.forEach(item => {
+ if (nameList.length > 0) {
+ nameList += ','
+ idList += ','
+ }
+ idList += item.id;
+ nameList += item.name;
+ });
+ console.log(this.type)
+ if (this.type === 'feeUser') {
+ this.roleForm.feeUser = nameList
+ this.roleForm.feeUserId = idList
+ } else {
+ this.roleForm.dockUser = idList
+ this.roleForm.dockUserName = nameList
+ this.rh_pageData.comityInRole = nameList
+ this.rh_pageData.comityInRoleId = idList
+ }
+ this.roleShowflag = false
+ },
+
+ // 流程阶段人选择
+ choiceZRROne(type, title, id) {
+ this.nodeListOne = []
+ this.nodeListOne.push(id)
+ this.type = type
+ this.drawerTitleOne = title
+ this.roleShowflagOne = true
+ },
+ drawerCheckOne(data) {
this.unqualidiedData.forEach(item => {
item.engineer = data[0].name
item.engineerId = data[0].id
})
- this.roleForm.dockUser = data[0].id
- this.roleForm.dockUserName = data[0].name
- this.roleShowflag = false
+ if (this.type === 'leaderUser') {
+ this.roleForm.leaderUser = data[0].name
+ this.roleForm.leaderUserId = data[0].id
+ } else {
+ this.roleForm.engineerUser = data[0].name
+ this.roleForm.engineerUserId = data[0].id
+ }
+ this.roleShowflagOne = false
},
+
// 保存按钮
- handleSave(){},
+ handleSave() {
+ this.saveLoading = true
+ let _formData = new FormData()
+ _formData.append('id', this.bpnId || '')
+ _formData.append('createUser', this.$store.getters.userInfo.userId)
+ _formData.append('createUserName', this.$store.getters.userInfo.userName)
+ _formData.append('prcType', '20')
+ _formData.append('json', JSON.stringify({
+ roleForm: this.roleForm,
+ rh_pageData: this.rh_pageData
+ }))
+ saveTaskFirst(_formData).then(res => {
+ this.saveLoading = false
+ this.$message.success('保存成功')
+ this.bpnId = res.result
+ }).catch(e => {
+ this.saveLoading = false
+ })
+ },
// 提交按钮
handleSubmit() {
let json = {
- prcCreateUser: this.$store.getters.userInfo.userId,
- prcCreateUserName: this.$store.getters.userInfo.userName,
+ roleList: this.roleForm,
rh_pageData: this.rh_pageData,
- directorList: this.roleForm.dockUser,
+ directorList: this.rh_pageData.comityInRoleId,
}
this.$refs['rh_pageData'].validate((valid) => {
if (valid) {
@@ -595,16 +682,16 @@ export default {
if (valid) {
this.isSubmit = true
const paramsInfo = {
- type: '11'
+ type: '20'
}
- startProcess(paramsInfo).then(res=>{
+ startProcess(paramsInfo).then(res => {
this.taskID = res.data
const params = new FormData();
params.set('json', JSON.stringify(json))
params.set('userId', this.$store.getters.userInfo.userId)
params.set('taskId', this.taskID)
completeTask(params).then(res => {
- if(res.success === true) {
+ if (res.success === true) {
this.$message.success('提交成功')
this.$router.push("/processCenter");
}
@@ -613,7 +700,8 @@ export default {
})
}
})
- } })
+ }
+ })
}
}
}
@@ -621,15 +709,18 @@ export default {
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index 150e4b0ea..bb98c0b53 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -919,7 +919,7 @@ export default {
prcType: row.prcType
}
})
- } else if (row.taskInfo === '') {
+ } else if (row.taskInfo === '入会代表填写入会信息表') {
this.$router.push({
name: 'bzrhStep3',
query:{
@@ -930,7 +930,7 @@ export default {
prcType: row.prcType
}
})
- } else if (row.taskInfo === '') {
+ } else if (row.taskInfo === '入会人员所在部门负责人审核') {
this.$router.push({
name: 'bzrhStep4',
query:{
@@ -941,7 +941,7 @@ export default {
prcType: row.prcType
}
})
- } else if (row.taskInfo === '') {
+ } else if (row.taskInfo === '标准法规工程师汇总修订') {
this.$router.push({
name: 'bzrhStep5',
query:{
@@ -952,13 +952,11 @@ export default {
prcType: row.prcType
}
})
- }
- break
- case '17':
- if (row.taskInfo === '法规认证部副部长审核') {
+ }else if (row.taskInfo === '标准法规部主管领导审核') {
this.$router.push({
- name: 'zcrhStep2',
- query: {
+ name: 'bzrhStep6',
+ query:{
+ taskInfo: row.taskInfo,
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
@@ -966,10 +964,11 @@ export default {
prcType: row.prcType
}
})
- } else if (row.taskInfo === '法规认证部副总监批准') {
+ } else if (row.taskInfo === '费用管理部门会签') {
this.$router.push({
- name: 'zcrhStep3',
- query: {
+ name: 'bzrhStep6',
+ query:{
+ taskInfo: row.taskInfo,
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
@@ -977,10 +976,11 @@ export default {
prcType: row.prcType
}
})
- } else if (row.taskInfo === '公司副总批准') {
+ } else if (row.taskInfo === '技术委员会常务副主任/总院院长审定') {
this.$router.push({
- name: 'zcrhStep4',
- query: {
+ name: 'bzrhStep6',
+ query:{
+ taskInfo: row.taskInfo,
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
@@ -988,10 +988,11 @@ export default {
prcType: row.prcType
}
})
- } else if (row.taskInfo === '修订入会信息') {
+ } else if ('标准法规工程师汇总修订'){
this.$router.push({
- name: 'zcrhStep1-1',
- query: {
+ name: 'bzrhStep6',
+ query:{
+ taskInfo: row.taskInfo,
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
diff --git a/src/router/index.js b/src/router/index.js
index 7ae3a1428..ba365c489 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1205,6 +1205,15 @@ const routes = [
title: '外部标准化协会入会流程（修订）'
}
},
+ {
+ path: '/bzrhStep6',
+ name: 'bzrhStep6',
+ component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue'),
+ meta: {
+ requireAuth: true,
+ title: '外部标准化协会入会流程（审批)'
+ }
+ },
// 外部标准化协会参会流程
{