From 3081c03577c4faa9b707cd175682b9c14c70fa92 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 30 Dec 2021 14:03:01 +0800 Subject: [PATCH 1/5] here is no way the,buss node 7 reject --- .../pages/creatProcess/qbrk-product/step7.vue | 53 ++++++++++++++++-- .../pages/creatProcess/qbrk/step7.vue | 56 +++++++++++++++++-- 2 files changed, 99 insertions(+), 10 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue index ed0546294..0dc8568ac 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue @@ -208,12 +208,15 @@ @@ -352,6 +355,13 @@ @checkedRole="checkedRole" :nodeList="nodeList" > + @@ -560,7 +570,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' - import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail} from "api/process"; + import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,changeAssigneeNew} from "api/process"; import {getEvaluationIndex} from "api/businessApi"; import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; @@ -2310,6 +2320,37 @@ this.rules.commentText[0].required = true; } }, + checkedRoleTransfer (data) { + this.assigneeNewLoading = true + changeAssigneeNew({ + taskId: this.$route.query.taskIds, // 任务id + userId:this.$store.getters.userInfo.userId, // 委托人 + assignee: data[0].id, // 被委托人 + pId: this.$route.query.prcId, // 流程实例 + }).then(res => { + this.assigneeNewLoading = false + if (res.success) { + this.drawerModal = false + this.$message.success('调整成功') + this.processNum() + this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + } else { + this.$message.warning(res.message) + } + }) + }, + handleTransfer() { + this.drawerModal = true + this.drawerTitle = '转办处理人' + }, + handle1(){ + this.formTongGuo.approvalOpinion = 1 + this.handleSubmit() + }, + handle2(){ + this.formTongGuo.approvalOpinion = 0 + this.handleSubmit() + }, handleSubmit() { this.getRule() // const val= this.form.country; diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue index 0032d2c0a..b92f7ccad 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue @@ -314,13 +314,18 @@ + + + @@ -665,7 +678,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' - import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail} from "api/process"; + import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,changeAssigneeNew} from "api/process"; import {getEvaluationIndex} from "api/businessApi"; import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; @@ -1383,6 +1396,25 @@ this.roleForm.hqUserName=nameList; } }, + checkedRoleTransfer (data) { + this.assigneeNewLoading = true + changeAssigneeNew({ + taskId: this.$route.query.taskIds, // 任务id + userId:this.$store.getters.userInfo.userId, // 委托人 + assignee: data[0].id, // 被委托人 + pId: this.$route.query.prcId, // 流程实例 + }).then(res => { + this.assigneeNewLoading = false + if (res.success) { + this.drawerModal = false + this.$message.success('调整成功') + this.processNum() + this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + } else { + this.$message.warning(res.message) + } + }) + }, checkedRole (data) { if (this.type === 0) { this.roleForm.deptUserId = data[0].id @@ -2234,6 +2266,22 @@ handleTabs(name) { this.active = name }, + handleTransfer() { + this.drawerModal = true + this.drawerTitle = '转办处理人' + }, + handle1(){ + this.formTongGuo.approvalOpinion = 1 + this.handleSubmit() + }, + handle2(){ + this.formTongGuo.approvalOpinion = 0 + this.$refs['form'].validate((valid) => { + if (valid) { + this.handleSubmit() + } + }) + }, //保存 handleSave() { this.form.country=this.countryArr; From 7859b42fe3f9fd015f768e4d18daaefad5ea5e39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 30 Dec 2021 14:04:24 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg/step1-1.vue | 52 ++++++++++--------- .../pages/creatProcess/xmpg/step1.vue | 52 ++++++++++--------- .../pages/creatProcess/xmpg/step3.vue | 4 +- .../pages/creatProcess/xmpg/step4.vue | 5 +- .../pages/creatProcess/xmpg/step5.vue | 2 + .../pages/creatProcess/xmpg/step7.vue | 1 + 6 files changed, 64 insertions(+), 52 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue index 92c075e4a..c93396988 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue @@ -443,32 +443,34 @@ - + - - - - - - - + @selection-change="selectThree" + > + + + + + + + + - + - - - - - - - + @selection-change="selectThree" + > + + + + + + + + { let index; index = this.breakdownList.findIndex(items => { - return items.itemsName === item.itemsName; + return items.itemsName === item.itemsName && items.projectName === item.projectName; }); if (index > -1) { this.breakdownList.splice(index, 1); @@ -874,6 +875,7 @@ export default { //保存事件 handleSave() { this.saveLoading = true; + this.listForm.breakdownList = this.breakdownList; let _formData = new FormData(); _formData.append("id", this.bpnId || ""); _formData.append("prcType", "5"); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue index c73ea50ae..c56e7c3fd 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -731,6 +731,7 @@ export default { item.implementerId = this.$store.getters.userInfo.userId; item.implementer = this.$store.getters.userInfo.userName; }); + // this.commentText = '' this.dataList = item.step3DTOS; this.dataList.forEach(item => { this.$set(item,'complianceReasons', '') @@ -740,6 +741,7 @@ export default { }) } else { this.dataList = item.dataList; + // this.commentText = '' this.dataList.forEach(item => { item.implementerId = this.$store.getters.userInfo.userId; item.implementer = this.$store.getters.userInfo.userName; @@ -870,7 +872,7 @@ export default { saveBatchEditForm() { this.dataList.forEach(item => { this.selectList.forEach(items => { - if (item.itemNum === items.itemNum) { + if (item.itemNum === items.itemNum && item.projectName === items.projectName) { item.complianceReasons = this.batchEditForm.complianceReasons; //不合规 item.noCompliance = this.batchEditForm.noCompliance; @@ -881,6 +883,7 @@ export default { } }); }); + this.$refs.multipleTable.clearSelection() this.modalShowFlag = false; }, cancelBatchEditForm() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue index 47848c7d6..365050bf3 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue @@ -568,6 +568,7 @@ export default { if(!this.commentText){ this.$message.warning('请填写审批意见') }else{ + this.isSubmit = true this.listForm.applyUpdUserId = this.dataList[0].distributePersonId this.listForm.commentText = this.commentText; this.listForm.dataList = this.dataList @@ -584,6 +585,7 @@ export default { this.$message.success(res.message) this.$router.push('/processCenter') } + this.isSubmit = false }, e => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue index 9b38a0e3c..34161e456 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue @@ -553,6 +553,7 @@ export default { this.listForm.prcNum = this.prcNum this.listForm.prcName = this.prcName this.listForm.id = item.id + // this.commentText = '' this.dataList = item.dataList }) }, From e8b4b7f9eab0f66febf4e013f1f47e84a98a9066 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 30 Dec 2021 14:46:03 +0800 Subject: [PATCH 3/5] feat: There is no way the, --- src/pages/searchCenter/pages/advancedSearch.vue | 10 +++++++++- src/pages/searchCenter/pages/standardSearch.vue | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/pages/searchCenter/pages/advancedSearch.vue b/src/pages/searchCenter/pages/advancedSearch.vue index 0fcf27ebd..8cb60b181 100644 --- a/src/pages/searchCenter/pages/advancedSearch.vue +++ b/src/pages/searchCenter/pages/advancedSearch.vue @@ -975,7 +975,7 @@ show-overflow-tooltip > 1 ? titleSpt[titleSpt.length-1] : titleSpt[0] + }else { + return title; + } + }, judgeRolePermiOnSar(item, type) { let pagetype; if (type !== 5 && item.type === "msgdyinfo") { diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue index 2399ac2a6..dd55e8a45 100644 --- a/src/pages/searchCenter/pages/standardSearch.vue +++ b/src/pages/searchCenter/pages/standardSearch.vue @@ -243,7 +243,7 @@
- + 详情
@@ -479,6 +479,14 @@ itermsConditionsClose () { this.itermsConditionsFlag = false }, + filterTitle(title){ + if(title && (title.indexOf(",") !== -1)){ + let titleSpt = title.split(","); + return titleSpt.length > 1 ? titleSpt[titleSpt.length-1] : titleSpt[0] + }else { + return title; + } + }, // 跳转 toPage (item) { // 国内外----两个值 From 34e3a6ca1b10a8a298a38d7006fcf56219ac16b8 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 30 Dec 2021 16:00:01 +0800 Subject: [PATCH 4/5] feat: There is no way the, --- .../pages/creatProcess/qbrk/step11.vue | 2 +- .../pages/creatProcess/qbrk/step12.vue | 2 +- .../pages/creatProcess/qbrk/step5.vue | 4 ++-- .../pages/creatProcess/qbrk/step6.vue | 4 ++-- .../pages/creatProcess/qbrk/stepC3.vue | 4 ++-- .../pages/creatProcess/qbrk/stepC6.vue | 4 ++-- .../processList/tabComponents/taskDraft/index.vue | 14 +++++++------- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue index 7cf70dd8a..296fcdf79 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue @@ -2194,7 +2194,7 @@ } }, handleSubmit() { - this.getRule() + // this.getRule() // const val= this.form.country; // if (val !== '' && val !== null && typeof (val) !== 'undefined') { // if (val instanceof Array) { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue index a6518cd31..6fda9044e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue @@ -2154,7 +2154,7 @@ } }, handleSubmit() { - this.getRule() + // this.getRule() // const val= this.form.country; // if (val !== '' && val !== null && typeof (val) !== 'undefined') { // if (val instanceof Array) { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue index 2f72ddbe4..60dcc9e92 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue @@ -2353,7 +2353,7 @@ } }, handleSubmit() { - this.getRule() + // this.getRule() // const val= this.form.country; // if (val !== '' && val !== null && typeof (val) !== 'undefined') { // if (val instanceof Array) { @@ -2371,7 +2371,7 @@ this.isSubmit = true this.saveLoading = true this.form.commentText = this.formTongGuo.commentText - this.form.approvalOpinion = this.formTongGuo.approvalOpinion + // this.form.approvalOpinion = this.formTongGuo.approvalOpinion // 会签意见存储 const infoList = [] const info = {} diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue index 4b3e170e7..374baffca 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue @@ -2394,7 +2394,7 @@ } }, handleSubmit() { - this.getRule() + // this.getRule() // const val= this.form.country; // if (val !== '' && val !== null && typeof (val) !== 'undefined') { // if (val instanceof Array) { @@ -2413,7 +2413,7 @@ this.isSubmit = true this.saveLoading = true this.form.commentText = this.formTongGuo.commentText - this.form.approvalOpinion = this.formTongGuo.approvalOpinion + // this.form.approvalOpinion = this.formTongGuo.approvalOpinion const json = JSON.stringify(this.form); this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue index 29706be06..6247e964b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue @@ -2333,7 +2333,7 @@ } }, handleSubmit() { - this.getRule() + // this.getRule() // const val= this.form.country; // if (val !== '' && val !== null && typeof (val) !== 'undefined') { // if (val instanceof Array) { @@ -2352,7 +2352,7 @@ this.isSubmit = true this.saveLoading = true this.form.commentText = this.formTongGuo.commentText - this.form.approvalOpinion = this.formTongGuo.approvalOpinion + // this.form.approvalOpinion = this.formTongGuo.approvalOpinion const json = JSON.stringify(this.form); this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue index 249b590a0..2ae773d3e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue @@ -2394,7 +2394,7 @@ } }, handleSubmit() { - this.getRule() + // this.getRule() // const val= this.form.country; // if (val !== '' && val !== null && typeof (val) !== 'undefined') { // if (val instanceof Array) { @@ -2413,7 +2413,7 @@ this.isSubmit = true this.saveLoading = true this.form.commentText = this.formTongGuo.commentText - this.form.approvalOpinion = this.formTongGuo.approvalOpinion + // this.form.approvalOpinion = this.formTongGuo.approvalOpinion const json = JSON.stringify(this.form); this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index 24367772e..0a13ab093 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -425,7 +425,7 @@ export default { this.$router.push({ name: 'bussLibrary1', query: { - type: '1', + type: 'buss1', processName: '发起企标制修订流程', bpnId: id, verifySarStandard: true, @@ -439,7 +439,7 @@ export default { this.$router.push({ name: 'bussLibraryProduct2', query: { - type: 'buss1', + type: 'buss2', processName: mes.taskInfo, bpnId: id, verifySarStandard: true, @@ -449,7 +449,7 @@ export default { this.$router.push({ name: 'bussLibraryProduct3', query: { - type: 'buss1', + type: 'buss2', processName: mes.taskInfo, bpnId: id, verifySarStandard: true, @@ -459,7 +459,7 @@ export default { this.$router.push({ name: 'bussLibraryProductC3', query: { - type: 'buss1', + type: 'buss2', processName: mes.taskInfo, bpnId: id, verifySarStandard: true, @@ -469,7 +469,7 @@ export default { this.$router.push({ name: 'bussLibraryProduct6', query: { - type: 'buss1', + type: 'buss2', processName: mes.taskInfo, bpnId: id, verifySarStandard: true, @@ -479,7 +479,7 @@ export default { this.$router.push({ name: 'bussLibraryProductC6', query: { - type: 'buss1', + type: 'buss2', processName: mes.taskInfo, bpnId: id, verifySarStandard: true, @@ -490,7 +490,7 @@ export default { this.$router.push({ name: 'bussLibraryProduct1', query: { - type: '1', + type: 'buss2', processName: '发起企标制修订流程', bpnId: id, verifySarStandard: true, From cd0549f8e25c6f0e9061603e4eae4db6db4a87c1 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Thu, 30 Dec 2021 16:00:26 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/details/otherStandardDetails/index.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 1404296b9..2d49db0a1 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -90,7 +90,7 @@ - +
{{ file.oldFileName }} @@ -106,7 +106,7 @@ class="icon-download2" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'" /> - +