diff --git a/src/pages/processCenter/pages/components/ProcessFooter.vue b/src/pages/processCenter/pages/components/ProcessFooter.vue index 07e605e5a..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" >撤销申请 + 转办 + 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..a1651ae4a 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; @@ -1311,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() { diff --git a/src/pages/regulatoryRepository/standardForComments/index.vue b/src/pages/regulatoryRepository/standardForComments/index.vue index 59d4a3b3b..66500fdb5 100644 --- a/src/pages/regulatoryRepository/standardForComments/index.vue +++ b/src/pages/regulatoryRepository/standardForComments/index.vue @@ -16,14 +16,26 @@ - - - - - - + + + + + + + + {