diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index a759791e9..df4797b8a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -559,8 +559,16 @@ export default { this.$refs['Form'].validate((valid) => { if (valid) { this.isSubmit = true - this.$http.get('lawss/activiti/startProcess', { - type: '2' + this.$http.get('lawss/activiti/startProcessRollBack', { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '2', + json: JSON.stringify({ + form: this.form, + roleForm: this.roleForm, + commentText: this.commentText + }) }, {}, res => { if (res.ok) { var json = Object.assign(this.form, this.roleForm) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue index 3ff87198d..42041d108 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue @@ -462,6 +462,8 @@ export default { comityOptionsOne: [], comityOptionsTwo: [], comityOptionsTree: [], + comityOpRole: '', + comityOpRoleId: '', }, comityRoleOptions: [ {value: '0', label: '委员'}, diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue index 11615fc3c..b3d7f0df8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue @@ -113,8 +113,9 @@ @@ -212,6 +213,13 @@ @submit="handleSubmit" > + + @@ -257,7 +265,7 @@ export default { workPath: '', comityTel: [], comityOpRole: '', - comityInRoleId: '', + comityOpRoleId: '', }, roleForm: {}, commentText: '', @@ -317,7 +325,6 @@ export default { getFormFieldList(item) { this.$nextTick(() => { this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData - this.rh_pageData.comityOpRole = this.$store.getters.userInfo.userName this.roleForm = JSON.parse(JSON.stringify(item)).roleList this.infoSourcesLength = this.rh_pageData.infoSources.length // this.rh_pageData.comityFileNum = this.fileTextList @@ -371,6 +378,28 @@ export default { window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; } }, + + /** 选择入会人员 */ + choiceRole(id) { + this.nodeList = [] + this.nodeList.push(id) + this.roleShowflag = true + }, + drawerCheck(data) { + var idList = '' + var nameList = '' + data.forEach(item => { + if (nameList.length > 0) { + nameList += ',' + idList += ',' + } + idList += item.id; + nameList += item.name; + }) + this.rh_pageData.comityOpRole = nameList + this.rh_pageData.comityOpRoleId = idList + this.roleShowflag = false + }, // 退回按钮 handleSubmitNo() { if (this.commentText === '') { diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index f7f47e2ea..5efe18811 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -1185,8 +1185,18 @@ export default { this.$message.warning('请选择责任人') } else { this.isSubmit = true - this.$http.get('lawss/activiti/startProcess', { - type: '9' + this.$http.post('lawss/activiti/startProcessRollBack', { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '9', + json: JSON.stringify({ + form: this.form, + roleForm: this.roleForm, + commentText: this.commentText, + itemList: this.itemList, + sarType: this.sarType + }) }, {}, res => { if (res.ok) { var json = Object.assign(this.form, this.roleForm) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index 6283b88ff..3cfe97df7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -140,6 +140,16 @@ label="在产车型实施日期" align="center"> + + + { }) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index b12aa421e..707111fcd 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -178,7 +178,7 @@ @@ -292,27 +292,27 @@ size="800px">
- - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + +