diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue index 0eb38e88b..f34b1c8a3 100644 --- a/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue @@ -62,7 +62,7 @@ @@ -343,7 +343,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import { startProcess, completeTask, saveTaskFirst, queryTaskFirst } from '@/api/process.js' +import { startProcess, completeTask, saveTaskFirst, queryTaskFirst, inboundLiaisonDetail } from "@/api/process.js"; export default { name: "wbsmStep1", data() { @@ -424,6 +424,7 @@ export default { }, mounted() { this.getStandData() + this.getData() //从数据库中查询下拉框数据 this.$http.get('sys/dictype/getDicTypeListCode', '',{ _this:this @@ -435,6 +436,30 @@ export default { }) }, 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) { + console.log(item); + this.$nextTick(() => { + this.dataList = item.dataList + this.roleForm = item.roleForm + }); + }, //点击新增事件 addList() { this.standModel = true @@ -617,8 +642,8 @@ export default { this.$message.warning('请选择推荐署名人及单位') } }) - this.roleForm.commentText = this.commentText let json = { + commentText: this.commentText, roleForm: this.roleForm, dataList: this.dataList, } diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step2.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step2.vue index 3e9957d8e..10b839be8 100644 --- a/src/pages/processCenter/pages/creatProcess/wbsm/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/wbsm/step2.vue @@ -309,13 +309,7 @@ export default { console.log(item); this.$nextTick(() => { this.dataList = item.dataList - // if(!item.directorUser){ - // this.wbbzform = JSON.parse(JSON.stringify(item)); - // this.associationData = item.associationData - // this.participantsData = item.participantsData - // }else{ - // - // } + this.roleForm = item.roleForm }); }, // 批量选择分发责任人 @@ -369,10 +363,51 @@ export default { }, // 提交按钮 handleSubmit() { + this.isSubmit = true + let son = { + signFlag: '1', + commentText: this.commentText, + dataList: this.dataList, + roleForm: this.roleForm + } + var json = JSON.stringify(son) + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.taskIds, + userId: this.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + this.isSubmit = false + }, e => { + }); }, //驳回按钮 beforeBack(){ - + let son = { + signFlag: '2', + commentText: this.commentText, + dataList: this.dataList, + roleForm: this.roleForm + } + var json = JSON.stringify(son) + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.taskIds, + userId: this.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + }, e => { + }); }, //转办按钮 handleTransfer(){ diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step3.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step3.vue new file mode 100644 index 000000000..74b15c08e --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/wbsm/step3.vue @@ -0,0 +1,539 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step4.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step4.vue new file mode 100644 index 000000000..ec5ac6e64 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/wbsm/step4.vue @@ -0,0 +1,539 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step5.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step5.vue new file mode 100644 index 000000000..5a6de76a0 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/wbsm/step5.vue @@ -0,0 +1,539 @@ + + + + + + diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index cc184f50b..b6b603dcc 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -944,30 +944,51 @@ export default { prcType: row.prcType } }) + }else if(row.taskInfo === '标准法规部部长审核'){ + this.$router.push({ + name: 'wbsmStep3', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '技术管理中心主任审定'){ + this.$router.push({ + name: 'wbsmStep4', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if(row.taskInfo === '工程研究总院院长批准'){ + this.$router.push({ + name: 'wbsmStep5', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if(row.taskInfo === '修改信息'){ + this.$router.push({ + name: 'wbsmStep1', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) } - // else if(row.taskInfo === '标准法规工程师审核'){ - // this.$router.push({ - // name: 'jrbzhxhStep3', - // query: { - // taskIds: row.taskIds, - // prcId: row.prcId, - // prcNum: row.prcNum, - // prcName: row.prcName, - // prcType: row.prcType - // } - // }) - // }else if(row.taskInfo === '标准法规部部长批准'){ - // this.$router.push({ - // name: 'jrbzhxhStep4', - // query: { - // taskIds: row.taskIds, - // prcId: row.prcId, - // prcNum: row.prcNum, - // prcName: row.prcName, - // prcType: row.prcType - // } - // }) - // } break // 外部标准化协会入会流程 case '20': diff --git a/src/router/index.js b/src/router/index.js index a2c545c39..fc987487f 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1123,6 +1123,33 @@ const routes = [ title: '外部署名推荐审批流程' } }, + { + path: '/wbsmStep3', + name: 'wbsmStep3', + component: () => import('@/pages/processCenter/pages/creatProcess/wbsm/step3.vue'), + meta: { + requireAuth: true, + title: '外部署名推荐审批流程' + } + }, + { + path: '/wbsmStep4', + name: 'wbsmStep4', + component: () => import('@/pages/processCenter/pages/creatProcess/wbsm/step4.vue'), + meta: { + requireAuth: true, + title: '外部署名推荐审批流程' + } + }, + { + path: '/wbsmStep5', + name: 'wbsmStep5', + component: () => import('@/pages/processCenter/pages/creatProcess/wbsm/step5.vue'), + meta: { + requireAuth: true, + title: '外部署名推荐审批流程' + } + }, { path: '/cywbbzzxdStep1', name: 'cywbbzzxdStep1',