From 06b3fa934d50f6e12088a2faa239d0d28f2604e2 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 18 Nov 2022 15:20:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk/step1-2.vue | 266 +++++++++--------- .../pages/creatProcess/qbrk/step1.vue | 4 +- .../qbzxdjhgk/component/establish.vue | 6 +- .../pages/creatProcess/qbzxdjhgk/step1.vue | 2 + .../pages/creatProcess/qbzxdjhgk/step5.vue | 28 +- .../pages/creatProcess/qbzxdlx/step2.vue | 1 + .../tabComponents/processCenter/index.vue | 12 + .../enterpriseStandardPlan/index.vue | 2 +- 8 files changed, 172 insertions(+), 149 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue index d02e8c805..60d90b52a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue @@ -893,14 +893,14 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1204,7 +1205,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,taskDel} from "api/process"; +import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,taskDel,inboundLiaisonDetail} from "api/process"; import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; import treeSelectModule from "@/components/treeSelect/treeSelectModule.vue"; @@ -2273,9 +2274,6 @@ export default { } }, handleSearchStandard () { - if(!this.form.reviseStatus){ - this.$message.warning('请先选择制修订类型') - }else { this.tableData.standardData = [] this.standardDrawer = true this.$nextTick(() => { @@ -2286,7 +2284,6 @@ export default { } }) this.getDomesticStandardTable() - } }, saveUserInfo () { this.filterText = '' @@ -3088,51 +3085,61 @@ export default { json.prcCreateUser = this.form.prcCreateUser json.prcCreateUserName = this.form.prcCreateUserName json.standCode = this.tableData.standardData[0].standCode - this.$http.post('lawss/activiti/startProcessRollBack', { - createUser: this.$store.getters.userInfo.userId, - createUserName: this.$store.getters.userInfo.userName, - type: 'buss1', - json: JSON.stringify({ - form: this.form, - roleForm: this.roleForm, - commentText: this.commentText - }) - }, {}, 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) - 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.$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.$http.post('lawss/activiti/startProcessRollBack', { + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: 'buss1', + json: JSON.stringify({ + form: this.form, + roleForm: this.roleForm, + commentText: this.commentText + }) + }, {}, 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.ok) { - if (res.data === '操作成功') { - this.submitLoading = false - this.isSubmit = false - if (this.$route.query.bpnId !== '') { - let taskId = { - id: this.$route.query.bpnId + if (res.success) { + this.$message.success(res.message) + 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 { } - taskDel(taskId).then(res=>{ - return res - }) + } else { + this.$message.warning(res.data) } - // 流程提交之后，应该流转至待办任务页面 - this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) } else { - } - } else { - this.$message.warning(res.data) + }) } }) } @@ -3177,6 +3184,7 @@ export default { }) }, }, + mounted () { this.getTaskId() this.getTree() diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index e9d405ece..6d05c73e1 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -3087,8 +3087,8 @@ export default { json.applyUpdUserId = this.form.applyUpdUserId json.prcCreateUser = this.form.prcCreateUser json.prcCreateUserName = this.form.prcCreateUserName - json.standCode = this.tableData.standardData[0].standCode - json.id = this.tableData.standardData[0].id + json.standCode = this.standardCheckedList[0].standCode + json.id = this.standardCheckedList[0].id this.$http.post('lawss/activiti/startProcessRollBack', { createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue index 3459fd0fd..416b51a05 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue @@ -583,9 +583,9 @@ export default { newReason: [ {required: true, message: '请输入立项原因', trigger: 'blur'}, ], - LXDName: [ - { required: true, validator: validateFsOnlineFile, trigger: 'blur' } - ], + // LXDName: [ + // { required: true, validator: validateFsOnlineFile, trigger: 'blur' } + // ], }, } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index ae0f7f488..61d160641 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -534,6 +534,7 @@ export default { if (valid) { this.isSubmit = true; qbzxdFrom.commentText = this.commentText; + qbzxdFrom.addFlag = '0' let json = Object.assign(qbzxdFrom, this.roleForm); this.$http.post("lawss/activiti/startProcessRollBack", { createUser: this.$store.getters.userInfo.userId, @@ -588,6 +589,7 @@ export default { if (valid) { this.isSubmit = true; qbzxdFrom.commentText = this.commentText; + qbzxdFrom.addFlag = '0' var json = Object.assign(qbzxdFrom, this.roleForm); this.$http.post("lawss/activiti/completeTask", { taskIds: this.$route.query.taskIds, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue index 4f87ae865..480282332 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue @@ -519,20 +519,20 @@ export default { } this.qbfsForm.commentText = this.commentText let json = JSON.stringify(this.qbfsForm); - this.$http.post('lawss/activiti/completeTask', { - taskIds: this.$route.query.taskIds, - userId: this.$store.getters.userInfo.userId, - json: json, - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message) - this.$router.push('/processCenter') - } - this.isSubmit = false - }, e => { - }); + this.$http.post('lawss/activiti/completeTask', { + taskIds: this.$route.query.taskIds, + userId: this.$store.getters.userInfo.userId, + json: json, + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message) + this.$router.push('/processCenter') + } + this.isSubmit = false + }, e => { + }); }, beforeBack(){ if(!this.commentText){ diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue index 52a1f82f3..41ac95f8c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue @@ -848,6 +848,7 @@ export default { this.isSubmit = true; this.qbfsForm.type = '5' this.qbfsForm.commentText = this.commentText; + this.qbfsForm.addFlag = '0' let json = Object.assign(this.qbfsForm, this.roleForm); this.$http.post("lawss/activiti/startProcessRollBack", { createUser: this.$store.getters.userInfo.userId, diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 755c85930..1cbe90e56 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -2200,6 +2200,18 @@ export default { } }) } + else if(row.taskInfo === '技术标准起草') { + this.$router.push({ + name: 'qbzxdjhgkStep6', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } break } }, diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue index b65f62fa4..950d2b3c9 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue @@ -11,7 +11,7 @@ - +