diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 3457b6ac2..e00ae2275 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -2094,6 +2094,7 @@ export default { }).then(res => { this.verifySarStandard = this.$route.query.verifySarStandard let mes = JSON.parse(res.mes) + this.submitType = mes.submitType mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) this.roleForm = mes.roleForm this.commentText = mes.commentText @@ -3136,7 +3137,7 @@ export default { // id: this.id taskInfo: '申请人发起', form: this.form, - + submitType: this.submitType, roleForm: this.roleForm, commentText: this.commentText })) @@ -3218,6 +3219,7 @@ export default { json.applyUpdUserId = this.form.applyUpdUserId json.prcCreateUser = this.form.prcCreateUser json.prcCreateUserName = this.form.prcCreateUserName + json.submitType = this.submitType this.$http.post('lawss/activiti/startProcessRollBack', { createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.uName, @@ -3276,6 +3278,7 @@ export default { json.applyUpdUserId = this.form.applyUpdUserId json.prcCreateUser = this.form.prcCreateUser json.prcCreateUserName = this.form.prcCreateUserName + json.submitType = this.submitType this.$http.post('lawss/activiti/startProcessRollBack', { createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.uName, diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index 62e84ed7a..c39d5759b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -775,6 +775,7 @@ export default { name: "bzrkStep3", data () { return { + submitType: '', xgdFileMap: [], fbgbjbdFileMap: [], bpgFileMap: [], @@ -1072,6 +1073,7 @@ export default { }).then(res => { if (res) { const processForm = JSON.parse(res.mesg) + this.submitType = processForm.submitType this.xgdFileId = processForm.xgd this.fbgbjbdFileId = processForm.fbgbjbd this.bpgFileId = processForm.bpg @@ -1121,7 +1123,6 @@ export default { getFormFieldList (item) { this.$nextTick(() => { this.form = JSON.parse(JSON.stringify(item)) - console.log("this.form",this.form); this.defaultCheckedKeys = [this.form.standSystem] this.defaultCheckedKeys1 = [this.form.cycvppsbm] this.defaultCheckedKeys2 = [this.form.kccvppsbm] @@ -1172,7 +1173,8 @@ export default { sarAccessInfoListADMIN: this.sarAccessInfoListADMIN, bzqdForm: this.bzqdForm, listInfo: this.listInfo, - id: this.id + id: this.id, + submitType: this.submitType })) saveTaskFirst(_formData).then(res => { this.saveLoading = false @@ -1187,6 +1189,7 @@ export default { this.form.commentText = this.commentText this.form.approvalOpinion = this.approvalOpinion const json = JSON.stringify(this.form); + json.submitType = this.submitType this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId : this.userId, diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 42adab735..950d566a0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -1568,6 +1568,7 @@ export default { }, data() { return { + submitType: '', modalShowRoleFlag: false, fileList: [], caFileList: [], @@ -2584,14 +2585,12 @@ export default { }).then(res => { if (res) { const processForm = JSON.parse(res.mesg) - console.log(processForm); - console.log(this.form); + this.submitType = processForm.submitType // this.commentText = processForm.commentText if (processForm.form === undefined) { this.getFormFieldList(processForm) } else { //表单文件处理 - console.log(2); this.getFormFieldList(processForm.form) } } @@ -2731,6 +2730,7 @@ export default { form: this.form, roleForm: this.roleForm, commentText: this.commentText, + submitType: this.submitType, // taskInfo: '申请人修订', // taskIds:this.taskIds })) @@ -2782,27 +2782,73 @@ export default { this.form.country = this.countryArr; this.$refs['form'].validate((valid) => { if (valid) { - this.fileInfoHandle(); - this.isSubmit = true - this.form.commentText = this.commentText - this.form.approvalOpinion = this.approvalOpinion - const json = JSON.stringify(this.form); - this.$http.post('lawss/activiti/completeTask', { - taskIds: this.taskIds, - userId: this.userId, - json: json - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message) - // 流程提交之后，应该流转至待办任务页面 - this.$router.push({path: '/processCenter?tabsName=ProcessCenter'}) + if (this.submitType === 1) { + let standType + if (this.form.standInData === '0') { + standType = 'INLAND' } else { - this.$message.success(res.message) + standType = 'FOREIGN' } - this.isSubmit = false - }) + 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.commentText = this.commentText + this.form.approvalOpinion = this.approvalOpinion + const json = JSON.stringify(this.form); + json.submitType = this.submitType + this.$http.post('lawss/activiti/completeTask', { + taskIds: this.taskIds, + userId: this.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message) + // 流程提交之后，应该流转至待办任务页面 + this.$router.push({path: '/processCenter?tabsName=ProcessCenter'}) + } else { + this.$message.success(res.message) + } + this.isSubmit = false + }) + } else { + this.$message.warning('标准号重复') + return + } + }) + } else { + this.fileInfoHandle(); + this.isSubmit = true + this.form.commentText = this.commentText + this.form.approvalOpinion = this.approvalOpinion + const json = JSON.stringify(this.form); + json.submitType = this.submitType + this.$http.post('lawss/activiti/completeTask', { + taskIds: this.taskIds, + userId: this.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message) + // 流程提交之后，应该流转至待办任务页面 + this.$router.push({path: '/processCenter?tabsName=ProcessCenter'}) + } else { + this.$message.success(res.message) + } + this.isSubmit = false + }) + } } }) },