diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue new file mode 100644 index 000000000..0878bdc83 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue new file mode 100644 index 000000000..9d6912cc0 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue new file mode 100644 index 000000000..9c9449cee --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue index 34def29dd..26fee2b8e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue @@ -48,12 +48,12 @@ @@ -70,6 +70,16 @@ label="标准名称" > + + + + @@ -345,22 +335,34 @@ export default { selectList: [], treeData: [], // 人员数据 roleForm: { - liablePeople: "" + workPeople: "" }, + itemFlag: true, peopleFlag: true, - nodeList: [], defaultProps: { children: "children", label: "name" }, + complianceReasons:'', + zcComplianceReasons:'', //表单的数据 listForm: { projectNumber: "", //项目编号 projectName: "", //项目名称 - dataList: [], //项目下的标准数据 - children: [], //标准下的分解单数据 + dataList: [ + { + complianceReasons:'', + zcComplianceReasons:'', + } + ], //项目下的标准数据 + children: [] //标准下的分解单数据 }, - dataList: [], //展示的标准数据 + dataList: [ + { + complianceReasons:'', + zcComplianceReasons:'', + } + ], //展示的标准数据 commentText: "", //审批意见 detailData: [], //流程历史数据 userId: this.$store.getters.userInfo.userId, @@ -410,10 +412,33 @@ export default { this.listForm.prcName = this.prcName; this.listForm["id"] = item.id; this.listForm.dataList = item.dataList; - console.log(item.dataList); this.dataList = item.dataList; - this.dataList.distributePerson = item.dataList[0].distributePerson; - this.listForm.breakdownList = item.breakdownList; + let children = []; + item.breakdownList.forEach( + item => { + let aa = { + key: item.standId, + id: item.id, + standId: item.itemsNum, + itemsNum: item.itemsNum, + itemsName: item.itemsName, + workPeople: "请选择责任人" + }; + children.push(aa); + } + ); + this.dataList.forEach(key => { + key["children"] = []; + children.forEach(breakDown => { + if (key.standId === breakDown.key) { + key["children"].push(breakDown); + } + }); + if (key["children"].length === 0) { + delete key["children"]; + } + }); + this.listForm.children = children; }); }, //保存事件 @@ -423,7 +448,7 @@ export default { //提交事件 handleSubmit() { this.listForm.dataList.forEach(item => { - if (item.liablePeople !== undefined) { + if (item.workPeople !== undefined) { this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); console.log(json); @@ -445,17 +470,6 @@ export default { } }); }, - //批量操作按钮 - batchOperation(id) { - console.log(this.selectList); - if (this.selectList.length === 0) { - this.$message.warning("请至少选择一条数据进行批量分发"); - } else { - this.nodeList = []; - this.nodeList.push(id); - this.modalshowflag = true; - } - }, //标准表格选择框改变 selectStandChange(data) { this.selectList = data; @@ -474,26 +488,6 @@ export default { this.roleRow = this.$refs.tree.getCheckedNodes()[0]; } }, - checkedRole(data) { - // 选取负责人时的操作 - let mis = []; - this.selectList.forEach(item => { - item.liablePeople = data[0].name; - item.liablePeopleId = data[0].id; - mis.push(item.standId); - }); - this.dataList.forEach(item => { - if (!mis.includes(item.standId)) { - this.selectList.push(item); - } - }); - this.dataList = this.selectList; - this.$refs.selection.clearSelection(); - this.modalshowflag = false; - }, - cancleUserInfo() { - this.modalshowflag = false; - } }, computed: { listNoDataText() { @@ -558,24 +552,9 @@ export default { height: calc(~'100% - 103px'); overflow: auto; - .tableTitle { - margin-bottom: 10px; - height: 30px; - line-height: 30px; - position: relative; - font-size: 13px; - font-weight: bold; - - .tableButton { - position: absolute; - right: 0; - top: 0; - } - .accessStandardsAndRegulations { height: 100%; } - } } .demo-drawer-content { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue new file mode 100644 index 000000000..91e5db738 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue new file mode 100644 index 000000000..8d214e447 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue new file mode 100644 index 000000000..9f9eaad0e --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/router/index.js b/src/router/index.js index 1e81556bc..eac7a7939 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -393,6 +393,60 @@ const routes = [ title: '项目合规评估流程-项目' } }, + { + path: '/xmpg2Step7', + name: 'xmpg2Step7', + component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step7.vue'), + meta: { + requireAuth: true, + title: '项目合规评估流程-项目' + } + }, + { + path: '/xmpg2Step8', + name: 'xmpg2Step8', + component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step8.vue'), + meta: { + requireAuth: true, + title: '项目合规评估流程-项目' + } + }, + { + path: '/xmpg2Step9', + name: 'xmpg2Step9', + component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step9.vue'), + meta: { + requireAuth: true, + title: '项目合规评估流程-项目' + } + }, + { + path: '/xmpg2Step10', + name: 'xmpg2Step10', + component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step10.vue'), + meta: { + requireAuth: true, + title: '项目合规评估流程-项目' + } + }, + { + path: '/xmpg2Step11', + name: 'xmpg2Step11', + component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step11.vue'), + meta: { + requireAuth: true, + title: '项目合规评估流程-项目' + } + }, + { + path: '/xmpg2Step12', + name: 'xmpg2Step12', + component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step12.vue'), + meta: { + requireAuth: true, + title: '项目合规评估流程-项目' + } + }, { path: '/wfhxzgStep1', name: 'wfhxzgStep1',