diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue index d2f7884cf..22e269256 100644 --- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue @@ -89,6 +89,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessTitle from "process/components/ProcessTitle"; import ProcessFooter from "process/components/ProcessFooter"; +import { queryTaskFirst, saveTaskFirst } from "api/process"; export default { name: "cywbbzzxdStep1", @@ -109,6 +110,8 @@ export default { roleForm: { prcCreateUserName: this.$store.getters.userInfo.userName, prcCreateUser: this.$store.getters.userInfo.userId, + firstUserName: this.$store.getters.userInfo.userName, + firstUser: this.$store.getters.userInfo.userId, dockUser: "", directorUser: "", dockUserName: "", @@ -124,7 +127,21 @@ export default { }, }; }, + mounted() { + this.bpnId = this.$route.query.bpnId + if (this.bpnId !== undefined) { + this.getData() + } + }, methods:{ + getData() { + queryTaskFirst({ + bpnId: this.$route.query.bpnId + }).then(res => { + let mes = JSON.parse(res.mes) + this.roleForm = mes.roleForm + }); + }, choiceZRR(type, title, id) { this.nodeList = []; this.nodeList.push(id); @@ -194,7 +211,23 @@ export default { }, handleSave(){ - + this.saveLoading = true; + let _formData = new FormData(); + _formData.append("id", this.bpnId || ""); + _formData.append("createUser", this.$store.getters.userInfo.userId); + _formData.append("createUserName", this.$store.getters.userInfo.userName); + _formData.append("prcType", "14"); + _formData.append("json", JSON.stringify({ + taskInfo: '责任部门对接人选择责任人', + roleForm: this.roleForm, + })); + saveTaskFirst(_formData).then(res => { + this.saveLoading = false; + this.$message.success("保存成功"); + this.bpnId = res.result; + }).catch(e => { + this.saveLoading = false; + }); }, }, }; diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue index 8025f3886..dddcfb8de 100644 --- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue @@ -276,6 +276,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessTitle from "process/components/ProcessTitle"; import ProcessFooter from "process/components/ProcessFooter"; +import { inboundLiaisonDetail } from "api/process"; export default { name: "cywbbzzxdStep3", @@ -330,7 +331,38 @@ export default { }] }; }, + mounted() { + this.getData(); + this.processTable(); + }, methods: { + getData() { + return new Promise((resolve, reject) => { + inboundLiaisonDetail({ + taskIds: this.$route.query.taskIds, + pId: this.$route.query.prcId + }).then(res => { + if (res) { + const processForm = JSON.parse(res.mesg); + this.getFormFieldList(processForm); + } + }).catch(e => { + }); + }); + }, + /** + * @description: 动态表单读取 + */ + getFormFieldList(item) { + this.$nextTick(() => { + if(item.wbbzform !== undefined){ + this.wbbzform = item.wbbzform + this.participantsData = item.participantsData + }else{ + return + } + }); + }, //审批历史信息 processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { @@ -354,8 +386,23 @@ export default { handleSave() { }, //不备案 - handleRecord(){ - + handleRecord() { + let json = { + signFlag: '2', + }; + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.$route.query.taskIds, + userId: this.$store.getters.userInfo.userId, + json: JSON.stringify(json) + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + this.isSubmit = false + }); }, handleSubmit() { if (this.participantsData.length < 1) { @@ -370,7 +417,7 @@ export default { let json = { participantsData: this.participantsData, wbbzform: this.wbbzform, - dlFlag: '1', + signFlag: '1', }; this.$refs["wbbzForm"].validate((valid) => { if (valid) { diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step4.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step4.vue index 48690df4b..2f1490c90 100644 --- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step4.vue @@ -133,49 +133,21 @@ prop="projectNumber" label="项目编号" align="center"> - - - - @@ -248,17 +220,26 @@ + + @@ -266,7 +247,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessTitle from "process/components/ProcessTitle"; import ProcessFooter from "process/components/ProcessFooter"; -import { inboundLiaisonDetail } from "api/process"; +import { changeAssigneeNew, inboundLiaisonDetail } from "api/process"; export default { name: "cywbbzzxdStep4", @@ -284,7 +265,11 @@ export default { recordLoading: false, saveLoading: false, loading: false, + drawerModal: false, + isTransfer: false, + drawerTitle: '', detailData: [], //审批历史信息 + nodeList: [], wbbzform: { reportingUnit: "", standNumber: "", @@ -323,6 +308,7 @@ export default { }, mounted() { this.getData(); + this.processTable(); }, methods: { getData() { @@ -345,6 +331,8 @@ export default { getFormFieldList(item) { console.log(item); this.$nextTick(() => { + this.wbbzform = item.wbbzform + this.participantsData = item.participantsData }); }, //审批历史信息 @@ -369,11 +357,8 @@ export default { }, handleSave() { }, - //不备案 - handleRecord(){ - - }, - handleSubmit() { + //驳回 + beforeBack(){ if (this.participantsData.length < 1) { this.$message.warning("项目信息不能为空"); } else { @@ -386,7 +371,7 @@ export default { let json = { participantsData: this.participantsData, wbbzform: this.wbbzform, - dlFlag: '1', + signFlag: '2', }; this.$refs["wbbzForm"].validate((valid) => { if (valid) { @@ -409,6 +394,69 @@ export default { }); } }, + handleSubmit() { + this.isSubmit = true; + if (this.participantsData.length < 1) { + this.$message.warning("项目信息不能为空"); + } else { + this.participantsData.forEach(item => { + if (item.projectNumber === undefined) { + this.$message.warning("请完善项目信息"); + } + }); + this.wbbzform.commentText = this.commentText; + let json = { + participantsData: this.participantsData, + wbbzform: this.wbbzform, + signFlag: '1', + }; + this.$refs["wbbzForm"].validate((valid) => { + if (valid) { + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.$route.query.taskIds, + userId: this.$store.getters.userInfo.userId, + json: JSON.stringify(json) + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + this.isSubmit = false + }); + } else { + return this.$message.warning("请完善基础信息"); + } + }); + } + }, + //转办按钮 + handleTransfer(){ + this.drawerModal = true + this.drawerTitle = '转办处理人' + this.selectPeople = row + }, + //确认转办 + checkedTransferRole (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) + } + }) + }, }, computed: { listNoDataText() { diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step5.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step5.vue new file mode 100644 index 000000000..a9d49dfbf --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step5.vue @@ -0,0 +1,525 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step6.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step6.vue new file mode 100644 index 000000000..45b9aa29a --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step6.vue @@ -0,0 +1,525 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue index 190d4a4b2..06a8b2058 100644 --- a/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue @@ -126,7 +126,7 @@
+ @click.native="choiceZRR('dockUser', '选择署名人领导', roleForm.dockUser)">
@@ -140,7 +140,7 @@
+ @click.native="choiceZRR('ministerUser', '选择标准法规部部长', roleForm.ministerUser)">
@@ -423,6 +423,10 @@ export default { ProcessTitle }, mounted() { + this.bpnId = this.$route.query.bpnId + if (this.bpnId !== undefined) { + this.getDatas() + } this.getStandData() this.getData() //从数据库中查询下拉框数据 @@ -436,6 +440,16 @@ export default { }) }, methods: { + getDatas(){ + queryTaskFirst({ + bpnId: this.$route.query.bpnId + }).then(res => { + let mes = JSON.parse(res.mes) + this.roleForm = mes.roleForm + this.dataList = mes.dataList + this.commentText = mes.commentText + }); + }, getData() { return new Promise((resolve, reject) => { inboundLiaisonDetail({ @@ -618,7 +632,7 @@ export default { _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUserName', this.$store.getters.userInfo.userName) - _formData.append('prcType', '8') + _formData.append('prcType', '16') _formData.append('json', JSON.stringify({ roleForm: this.roleForm, dataList: this.dataList, diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index d1e0901ab..d6ab25b8a 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -929,6 +929,28 @@ export default { prcType: row.prcType } }) + } else if(row.taskInfo === '标准法规工程师审核'){ + this.$router.push({ + name: 'cywbbzzxdStep5', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '标准法规部部长批准'){ + this.$router.push({ + name: 'cywbbzzxdStep6', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) } break case '15': diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index 95e5e6642..f1a8a170e 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -409,6 +409,16 @@ export default { } }) break + case '14': + this.$router.push({ + name: 'cywbbzzxdStep1', + query: { + type: '14', + processName: '参与外部标准制修订信息提报流程', + bpnId: id + } + }) + break case '15': if(mes !== null && mes.taskInfo !== null){ if (mes.taskInfo === '备案任务下发') { @@ -432,13 +442,22 @@ export default { }) } }else{ - + this.$router.push({ + name: 'jrbzhxhStep1', + query: { + type: '15', + processName: '加入标准化协会信息提报流程', + bpnId: id + } + }) } + break + case '16': this.$router.push({ - name: 'jrbzhxhStep1', + name: 'wbsmStep1', query: { - type: '15', - processName: '加入标准化协会信息提报流程', + type: '16', + processName: '外部署名推荐审批流程', bpnId: id } }) diff --git a/src/router/index.js b/src/router/index.js index 38197dec4..afb044992 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1186,6 +1186,24 @@ const routes = [ title: '参与外部标准制修订信息提报流程' } }, + { + path: '/cywbbzzxdStep5', + name: 'cywbbzzxdStep5', + component: () => import('@/pages/processCenter/pages/creatProcess/cywbbzzxd/step5.vue'), + meta: { + requireAuth: true, + title: '参与外部标准制修订信息提报流程' + } + }, + { + path: '/cywbbzzxdStep6', + name: 'cywbbzzxdStep6', + component: () => import('@/pages/processCenter/pages/creatProcess/cywbbzzxd/step6.vue'), + meta: { + requireAuth: true, + title: '参与外部标准制修订信息提报流程' + } + }, { path: '/jrbzhxhStep1', name: 'jrbzhxhStep1',