From 72c7422faacabbd09ee691b96b98de401a1b21ec Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 1 Mar 2022 14:38:20 +0800 Subject: [PATCH] commit --- src/pages/home2/components/todoList/index.vue | 6 +- .../pages/creatProcess/bzrk/step1.vue | 177 +++++++++++++----- 2 files changed, 130 insertions(+), 53 deletions(-) diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue index 458b47999..01b160c62 100644 --- a/src/pages/home2/components/todoList/index.vue +++ b/src/pages/home2/components/todoList/index.vue @@ -70,7 +70,7 @@ export default { const prcType = row.prcType switch(prcType) { case '1': - if (row.taskInfo === '标准法规业务经理审批') { + if (row.taskInfo === '批准') { this.$router.push({ name: 'bzrkStep2', query: { @@ -81,7 +81,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '责任人会签'){ + }else if (row.taskInfo === '会签'){ this.$router.push({ name: 'bzrkStep3', query: { @@ -92,7 +92,7 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '申请人修订'){ + }else if (row.taskInfo === '修订'){ this.$router.push({ name: 'bzrkStep4', query: { diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index c9cca1b73..3457b6ac2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -1450,6 +1450,7 @@ export default { callback() } return { + submitType: '', nodeList3: [], fileList: [], caFileList: [], @@ -2210,6 +2211,7 @@ export default { } // 标准信息 }, handleProcessStandardNext(status) { + this.submitType = status switch (status) { // 新增 case 1: @@ -3190,58 +3192,133 @@ export default { if (valid) { this.$refs['userForm'].validate((valid) => { if (valid) { - this.fileInfoHandle() - this.isSubmit = true - this.form.country = this.countryArr; - var json = Object.assign(this.form, this.roleForm) - json.zrUserId = this.form.zrUserId - json.jlUserId = this.form.jlUserId - json.commentText = this.commentText - json.applyUpdUserId = this.form.applyUpdUserId - json.prcCreateUser = this.form.prcCreateUser - json.prcCreateUserName = this.form.prcCreateUserName - this.$http.post('lawss/activiti/startProcessRollBack', { - createUser: this.$store.getters.userInfo.userId, - createUserName: this.$store.getters.userInfo.uName, - json: JSON.stringify({ - taskInfo: '申请人发起', - form: this.form, - roleForm: this.roleForm, - commentText: this.commentText - }), - type: '1', - }, { - _this: this - }, res => { - if (res.ok) { - this.$http.post('lawss/activiti/completeTask', { - taskIds: res.data, - userId: this.$store.getters.userInfo.userId, - json: JSON.stringify(json) - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message) - this.isSubmit = false - if (this.bpnId !== '') { - let taskId = { - id: this.bpnId - } - taskDel(taskId).then(res => { - return res - }) - } - // 流程提交之后，应该流转至待办任务页面 - this.$router.push({path: '/processCenter?tabsName=ProcessCenter'}) - } else { - this.isSubmit = false - } - }) + if (this.submitType === 1) { + let standType + if (this.form.standInData === '0') { + standType = 'INLAND' } else { - this.isSubmit = false + standType = 'FOREIGN' } - }) + this.$http.get('sarStandardsInfo/sar-standards-info/checkIsOnly', { + standType: standType, + standSort: this.form.standSort, + standNumber: this.form.standNumber, + standYear: this.form.standYear, + }, { + _this: this + }, res => { + if (res.ok) { + this.fileInfoHandle() + this.isSubmit = true + this.form.country = this.countryArr; + var json = Object.assign(this.form, this.roleForm) + json.zrUserId = this.form.zrUserId + json.jlUserId = this.form.jlUserId + json.commentText = this.commentText + json.applyUpdUserId = this.form.applyUpdUserId + json.prcCreateUser = this.form.prcCreateUser + json.prcCreateUserName = this.form.prcCreateUserName + this.$http.post('lawss/activiti/startProcessRollBack', { + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.uName, + json: JSON.stringify({ + taskInfo: '申请人发起', + form: this.form, + roleForm: this.roleForm, + commentText: this.commentText + }), + type: '1', + }, { + _this: this + }, res => { + if (res.ok) { + this.$http.post('lawss/activiti/completeTask', { + taskIds: res.data, + userId: this.$store.getters.userInfo.userId, + json: JSON.stringify(json) + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message) + this.isSubmit = false + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res => { + return res + }) + } + // 流程提交之后，应该流转至待办任务页面 + this.$router.push({path: '/processCenter?tabsName=ProcessCenter'}) + } else { + this.isSubmit = false + } + }) + } else { + this.isSubmit = false + } + }) + } else { + this.$message.warning('标准号重复') + return + } + }) + } else { + this.fileInfoHandle() + this.isSubmit = true + this.form.country = this.countryArr; + var json = Object.assign(this.form, this.roleForm) + json.zrUserId = this.form.zrUserId + json.jlUserId = this.form.jlUserId + json.commentText = this.commentText + json.applyUpdUserId = this.form.applyUpdUserId + json.prcCreateUser = this.form.prcCreateUser + json.prcCreateUserName = this.form.prcCreateUserName + this.$http.post('lawss/activiti/startProcessRollBack', { + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.uName, + json: JSON.stringify({ + taskInfo: '申请人发起', + form: this.form, + roleForm: this.roleForm, + commentText: this.commentText + }), + type: '1', + }, { + _this: this + }, res => { + if (res.ok) { + this.$http.post('lawss/activiti/completeTask', { + taskIds: res.data, + userId: this.$store.getters.userInfo.userId, + json: JSON.stringify(json) + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message) + this.isSubmit = false + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res => { + return res + }) + } + // 流程提交之后，应该流转至待办任务页面 + this.$router.push({path: '/processCenter?tabsName=ProcessCenter'}) + } else { + this.isSubmit = false + } + }) + } else { + this.isSubmit = false + } + }) + } } else { this.$message.warning('请检查人员信息表单是否填写完整') }