diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue index 2f265bf1c..f077373ff 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -2988,20 +2988,32 @@ _this: this }, res => { if (res.success) { - this.submitLoading = false - this.isSubmit = false - if (this.$route.query.bpnId !== '') { - let taskId = { - id: this.$route.query.bpnId + const planForm = {} + planForm.reviseStatus = this.form.reviseStatus + planForm.standCode = this.form.DTQBBHBUSS + planForm.processType = "buss2"; + this.$http.post("esRevisePlan/es-revise-plan/modPlanByState", planForm, { + _this: this + }, res => { + if (res.ok) { + if (res.data === '操作成功') { + this.submitLoading = false + this.isSubmit = false + if (this.$route.query.bpnId !== '') { + let taskId = { + id: this.$route.query.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } + // 流程提交之后，应该流转至待办任务页面 + this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) } else { + } + } else { + this.$message.warning(res.data) } - taskDel(taskId).then(res=>{ - return res - }) - } - // 流程提交之后，应该流转至待办任务页面 - this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) - } else { - this.$message.warning(res.data) + }) } }) } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue index 6b488757d..028384d5e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -2501,6 +2501,17 @@ return if (res.result === '操作成功' || res.ok) { // 自动匹配配置标准 this.saveConfStand(res.data) + const planForm = {} + planForm.planStatus = '4' + planForm.reviseStatus = this.form.reviseStatus + planForm.standCode = this.form.DTQBBHBUSS + planForm.processType = "buss2"; + this.$http.post("esRevisePlan/es-revise-plan/modPlanByState", planForm, { + _this: this + }, res => { + this.submitLoading = false + this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + }) } else { this.$message.warning(res.message) this.isSubmit = false diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index a6be96fce..e7b83f3ea 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -2927,6 +2927,43 @@ json.applyUpdUserId = this.form.applyUpdUserId json.prcCreateUser = this.form.prcCreateUser json.prcCreateUserName = this.form.prcCreateUserName + + + + + const planForm = {} + planForm.id = this.form.planId + planForm.reviseStatus = this.form.reviseStatus + planForm.standCode = this.form.DTQBBHBUSS + planForm.processType = "buss1"; + this.$http.post("esRevisePlan/es-revise-plan/modPlanByState", planForm, { + _this: this + }, res => { + if (res.ok) { + if (res.data === '操作成功') { + this.submitLoading = false + this.isSubmit = false + if (this.$route.query.bpnId !== '') { + let taskId = { + id: this.$route.query.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } + // 流程提交之后，应该流转至待办任务页面 + this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) } else { + } + } else { + this.$message.warning(res.data) + } + }) + + return + + + + this.$http.post('lawss/activiti/startProcessRollBack', { createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, @@ -2949,7 +2986,9 @@ this.$message.success(res.message) const planForm = {} planForm.id = this.form.planId - planForm.planStatus = '2' + planForm.reviseStatus = this.form.reviseStatus + planForm.standCode = this.form.DTQBBHBUSS + planForm.processType = "buss1"; this.$http.post("esRevisePlan/es-revise-plan/modPlanByState", planForm, { _this: this }, res => { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue index 1297948fb..b84238721 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue @@ -2554,17 +2554,12 @@ const planForm = {} planForm.id = this.form.planId planForm.planStatus = '4' + planForm.reviseStatus = this.form.reviseStatus + planForm.standCode = this.form.DTQBBHBUSS + planForm.processType = "buss1"; this.$http.post("esRevisePlan/es-revise-plan/modPlanByState", planForm, { _this: this }, res => { - if (this.$route.query.bpnId && this.$route.query.bpnId !== '') { - let taskId = { - id: this.$route.query.bpnId - } - taskDel(taskId).then(res=>{ - return res - }) - } this.submitLoading = false this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) }) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue index c1f0c13b9..a355675ef 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue @@ -2720,7 +2720,9 @@ this.$message.success(res.message) const planForm = {} planForm.id = this.form.planId - planForm.planStatus = '2' + planForm.reviseStatus = this.form.reviseStatus + planForm.standCode = this.form.DTQBBHBUSS + planForm.processType = "buss1"; this.$http.post("esRevisePlan/es-revise-plan/modPlanByState", planForm, { _this: this }, res => { diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue index 9569bdd37..4586db6f2 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue @@ -508,8 +508,12 @@ export default { handleSubmit(){ this.isSubmit = true this.qbfsForm.bzfgbzFlag = '0' - this.qbfsForm.planStatus = '未开始' - this.qbfsForm.area = this.qbfsForm.area.join(',') + this.qbfsForm.planStatus = '计划已确认' + if(this.qbfsForm.area && this.qbfsForm.length > 0){ + this.qbfsForm.area = this.qbfsForm.area.join(',') + }else { + this.qbfsForm.area = "" + } this.qbfsForm.commentText = this.commentText let json = JSON.stringify(this.qbfsForm); this.$http.post('lawss/activiti/completeTask', { diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue index 13187006c..b807dce55 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue @@ -951,7 +951,6 @@ export default { }) }, listSubmit (item) { - console.log(item); return new Promise((resolve, reject) => { let newForm = Object.assign(this.roleForm, item,this.qblx_pageData); newForm.startUserName = this.$store.getters.userInfo.userName @@ -978,22 +977,16 @@ export default { _this: this }, res => { if (res.success) { - const _formData = new FormData() - _formData.append('infoJson', JSON.stringify(newForm)) - processCreatePlan(_formData).then(res => { - if (res.result === '操作成功' || res.data === '入库成功') { - resolve() - this.$message.success(res.message); - if (this.bpnId !== undefined && this.bpnId !== '') { - let taskId = { - id: this.bpnId - } - taskDel(taskId).then(res=>{ - // return res - }) - } - } + resolve() + this.$message.success(res.message); + if (this.bpnId !== undefined && this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + // return res }) + } // this.$router.push("/processCenter"); } }); diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue index 7e5d9bd36..b21ed321d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue @@ -582,7 +582,7 @@ import ProcessTitle from "../../components/ProcessTitle"; import MechanismTree from "@/components/mechanismTree"; import CustomInputForAllStandards from '@/components/CustomFormComponents/InputForAllStandards' import CustomInputForAllStandards2 from '@/components/CustomFormComponents/InputForAllStandards2' -import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst, taskDel } from "api/process"; +import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst, taskDel,processCreatePlan } from "api/process"; export default { @@ -816,46 +816,53 @@ export default { _this: this }, res => { if (res.success) { - this.isSubmit = true; - this.qbfsForm.type = '5' - this.qbfsForm.commentText = this.commentText; - let json = Object.assign(this.qbfsForm, this.roleForm); - this.$http.post("lawss/activiti/startProcessRollBack", { - createUser: this.$store.getters.userInfo.userId, - createUserName: this.$store.getters.userInfo.userName, - type: '25', - json: JSON.stringify({ - roleForm: this.roleForm, - qbfsForm: this.qbfsForm, - commentText: this.commentText - }) - }, { - _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) + const _formData = new FormData() + _formData.append('infoJson', JSON.stringify(this.qbfsForm)) + processCreatePlan(_formData).then(res => { + this.qbfsForm.planId = res.data + if (res.code === '200' || res.message === '入库成功'){ + this.isSubmit = true; + this.qbfsForm.type = '5' + this.qbfsForm.commentText = this.commentText; + let json = Object.assign(this.qbfsForm, this.roleForm); + this.$http.post("lawss/activiti/startProcessRollBack", { + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '25', + json: JSON.stringify({ + roleForm: this.roleForm, + qbfsForm: this.qbfsForm, + commentText: this.commentText + }) }, { _this: this }, res => { - if (res.success) { - this.$message.success(res.message); - if (this.bpnId !== '') { - let taskId = { - id: this.bpnId + 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("企标制修订立项计划-立项已完成"); + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } + this.isSubmit = false; + this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" }); } - taskDel(taskId).then(res=>{ - return res - }) - } - this.isSubmit = false; - this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" }); + }); } }); } - }); + }) } this.isSubmit = false }, e => { diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 9b78b021f..b0a2dec3e 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -429,13 +429,13 @@ @@ -1210,7 +1210,7 @@ - + - + + +