From 6b8ae349e72380fb07ed6a394a613fe528a901ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 10 Sep 2021 11:06:19 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A3=80=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standardForComments/index.vue | 35 +++++++++++-------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/src/pages/regulatoryRepository/standardForComments/index.vue b/src/pages/regulatoryRepository/standardForComments/index.vue index 59d4a3b3b..6a0ece6d2 100644 --- a/src/pages/regulatoryRepository/standardForComments/index.vue +++ b/src/pages/regulatoryRepository/standardForComments/index.vue @@ -16,14 +16,24 @@ - - - - - - + + + + + + + + { From 5238674ad4019412bb69e8de91674837306798f3 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Fri, 10 Sep 2021 11:10:49 +0800 Subject: [PATCH 2/5] commit --- src/pages/regulatoryRepository/standardForComments/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/regulatoryRepository/standardForComments/index.vue b/src/pages/regulatoryRepository/standardForComments/index.vue index 6a0ece6d2..66500fdb5 100644 --- a/src/pages/regulatoryRepository/standardForComments/index.vue +++ b/src/pages/regulatoryRepository/standardForComments/index.vue @@ -20,6 +20,7 @@ @@ -29,6 +30,7 @@ @@ -108,8 +110,6 @@ export default { components: {}, data() { return { - //格式化成'yy-mm-dd hh:mm:ss'的时间格式 - formatedTime:'', standCommonlySearch: { categorg: "", cname: "", From b2a359b2ba42a74a61fc560a4a208c2dec022049 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Mon, 13 Sep 2021 10:36:04 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E6=B5=81=E7=A8=8Bbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step1-1.vue | 14 ++++--------- .../pages/creatProcess/bzqdfb/step1.vue | 20 +++++++------------ 2 files changed, 11 insertions(+), 23 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index 8f68ca173..6937d3afb 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -231,7 +231,7 @@
+ disabled>
@@ -788,10 +788,10 @@ export default { startUserName: this.$store.getters.userInfo.userName, startUser: this.$store.getters.userInfo.userId, dockUser: "", - ministerUser: "", + ministerUser: this.$store.getters.userInfo.userId, directorUser: "", dockUserName: "", - ministerUserName: "", + ministerUserName: this.$store.getters.userInfo.userName, directorUserName: "" }, formRules: { @@ -806,9 +806,6 @@ export default { dockUserName: [ { required: true, message: "请选择会签责任人", trigger: "change" } ], - ministerUserName: [ - { required: true, message: "请选择修订责任人", trigger: "change" } - ], directorUserName: [ { required: true, message: "请选择审批责任人", trigger: "change" } ] @@ -898,10 +895,7 @@ export default { if (this.type === "dockUser") { this.roleForm.dockUser = this.roleRow.id; this.roleForm.dockUserName = this.roleRow.name; - } else if (this.type === "ministerUser") { - this.roleForm.ministerUser = data[0].id; - this.roleForm.ministerUserName = data[0].name; - } else if (this.type === "directorUser") { + } else if (this.type === "directorUser") { this.roleForm.directorUser = data[0].id; this.roleForm.directorUserName = data[0].name; } diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index f8f02eaf0..b961e76cb 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -131,20 +131,20 @@ + disabled> @@ -758,10 +758,10 @@ export default { prcCreateUserName: this.$store.getters.userInfo.userName, prcCreateUser: this.$store.getters.userInfo.userId, dockUser: "", - ministerUser: "", + ministerUser: this.$store.getters.userInfo.userId, directorUser: "", dockUserName: "", - ministerUserName: "", + ministerUserName: this.$store.getters.userInfo.userName, directorUserName: "" }, formRules: { @@ -776,9 +776,6 @@ export default { dockUserName: [ {required: true, message: "请选择会签责任人", trigger: "change"} ], - ministerUserName: [ - {required: true, message: "请选择修订责任人", trigger: "change"} - ], directorUserName: [ {required: true, message: "请选择审批责任人", trigger: "change"} ] @@ -857,9 +854,6 @@ export default { if (this.type === "dockUser") { this.roleForm.dockUser = this.roleRow.id; this.roleForm.dockUserName = this.roleRow.name; - } else if (this.type === "ministerUser") { - this.roleForm.ministerUser = data[0].id; - this.roleForm.ministerUserName = data[0].name; } else if (this.type === "directorUser") { this.roleForm.directorUser = data[0].id; this.roleForm.directorUserName = data[0].name; From b181d759e50318c908024058d29df08975924817 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Mon, 13 Sep 2021 14:33:52 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E8=BD=AC=E5=8A=9E=E6=8C=89=E9=92=AE=E5=85=AC=E5=85=B1=E7=BB=84?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/components/ProcessFooter.vue | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/pages/processCenter/pages/components/ProcessFooter.vue b/src/pages/processCenter/pages/components/ProcessFooter.vue index 07e605e5a..8d152ad90 100644 --- a/src/pages/processCenter/pages/components/ProcessFooter.vue +++ b/src/pages/processCenter/pages/components/ProcessFooter.vue @@ -75,6 +75,15 @@ :loading="submitLoading" v-if="showConfirm" >确认 + 转办 @@ -140,6 +149,10 @@ export default { type: Boolean, default: false }, + showTransfer:{ + type: Boolean, + default: false + }, showConfirm: { type: Boolean, default: false @@ -159,6 +172,11 @@ export default { type: Boolean, default: false }, + //转办按钮loading + transferLoading: { + type: Boolean, + default: false + }, // 保存按钮loading saveLoading: { type: Boolean, @@ -225,6 +243,9 @@ export default { handleSubmit() { this.$emit('submit') }, + handleTransfer(){ + this.$emit('transfer') + }, handleSendEmail() { this.$emit('sendEmail') }, From d528127a9b677318efa7692112a3bff25234079d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Mon, 13 Sep 2021 15:14:59 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=BD=AC=E5=8A=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/components/ProcessFooter.vue | 18 +++--- .../pages/creatProcess/bzqdfb/step1.vue | 8 ++- .../pages/creatProcess/bzqdfb/step2.vue | 62 +++++++++++++++++-- 3 files changed, 73 insertions(+), 15 deletions(-) diff --git a/src/pages/processCenter/pages/components/ProcessFooter.vue b/src/pages/processCenter/pages/components/ProcessFooter.vue index 8d152ad90..a3fc3a5c0 100644 --- a/src/pages/processCenter/pages/components/ProcessFooter.vue +++ b/src/pages/processCenter/pages/components/ProcessFooter.vue @@ -38,6 +38,15 @@ :loading="submitLoading" v-if="showOver" >撤销申请 + 转办 确认 - 转办 diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index b961e76cb..a1651ae4a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -1305,11 +1305,15 @@ export default { } this.dataList = res.data.records; this.dataList.forEach(item => { - if(item.xcxssrqgj === 'undefined'){ + if(item.xcxssrqgj === 'undefined' ||item.xcxssrqgj === '-' ){ item.xcxssrqgj = '' + }else{ + this.$set(item, "XCXSSRQ", item.xcxssrqgj) } - if(item.zccssrqgj === 'undefined'){ + if(item.zccssrqgj === 'undefined' || item.zccssrqgj === '-'){ item.zccssrqgj = '' + }else{ + this.$set(item, "ZCCSSRQ", item.zccssrqgj) } }) this.listForm.dataList = this.dataList; diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue index 83d65f7c4..bf383749b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue @@ -212,11 +212,22 @@ + + @@ -224,8 +235,9 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { inboundLiaisonDetail, queryDetail } from "api/process"; +import { inboundLiaisonDetail, queryDetail ,changeAssigneeNew} from "api/process"; import seeDatalis from "@/pages/localTool/standContrast/pages/seeDatalis"; +import axios from "axios"; export default { name: "bzqdfbStep2", @@ -240,6 +252,7 @@ export default { // 当前流程类型(1待办/2已办) processType: 1, loading: false, + nodeList:[], dataList: [],//清单里的标准数据 active: "1", userId: this.$store.getters.userInfo.userId, @@ -247,6 +260,8 @@ export default { pId: this.$route.query.prcId, listType: "country", //选择的清单类型 isSubmit: false, + isTransfer: false, + drawerTitle:'', saveLoading: false, tabValue: "listOfCountries", selectedList: [], //选择清单的选择框 @@ -255,6 +270,8 @@ export default { fileList:[], fileIds: "", commentText: "", //填写会签意见 + // 调整处理人抽屉状态 + drawerModal: false, page: 1, total: 0, pageSize: this.$store.getters.userInfo.configContent, @@ -384,9 +401,46 @@ export default { } } }, - //保存事件 - handleSave() { - + //确认转办 + checkedRole (data) { + this.assigneeNewLoading = true + changeAssigneeNew({ + taskId: this.$route.query.taskIds, // 任务id + assignee: data[0].id, // 被委托人 + userId: this.$store.getters.userInfo.userId, // 委托人 + pId: this.$route.query.prcId // 流程实例 + }).then(res => { + this.isTransfer = false + if (res.success) { + this.drawerModal = false + this.$message.success('调整成功') + this.$router.push("/processCenter"); + this.processNum() + } else { + this.$message.warning(res.message) + } + }) + }, + // 请求转换流程图 + processNum (row) { + axios.request({ + url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(), + responseType: 'blob', + method: 'get', + params: { + prcNum: this.$route.query.prcNum + } + }).then(res => { + // let blob = new Blob([res.data], {type: 'image/jpg'}) + // let url = window.URL.createObjectURL(res.data) + this.processStep = window.URL.createObjectURL(res.data) + }) + }, + //转办事件 + handleTransfer(){ + this.drawerModal = true + this.drawerTitle = '转办处理人' + this.selectPeople = row }, //提交事件 handleSubmit() {