diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue index e0cb7145e..e6ec3219a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue @@ -445,7 +445,8 @@ { if(!item.distributePerson || !item.projectGroupPeople){ this.$message.warning('请填写完整的人员信息') - }else{ + }else { this.isSubmit = true; - this.listForm.dataList = this.dataList + this.listForm.dataList = this.dataList; this.listForm.commentText = this.commentText; let json = Object.assign(this.listForm, this.roleForm); console.log(json); @@ -837,7 +829,7 @@ export default { this.$http.post("lawss/activiti/startProcessRollBack", { createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, - type: '5', + type: "5", json: JSON.stringify({ taskInfo: "选择已拆分标准", form: this.listForm, diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue index c8b88baa9..1cea64f58 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue @@ -391,17 +391,7 @@ export default { listForm: {}, dataList: [], projectDataList: [], - // projectDataList: [ - // { - // managementHostName: '', //管理主体 - // developmentHostName: '', //开发主体 - // categoryName: '', //项目细分类 - // projectStatus: '', //项目状态 - // projectName: '', //项目名称 - // projectNumber: '', //项目编号 - // uname: '', //项目经理 - // } - // ], + breakdownList: [], //标准下的分解单数据 detailData: [], nodeList: [], nodeList2: [], @@ -456,6 +446,14 @@ export default { this.listForm.prcName = this.prcName; this.listForm["id"] = item.id; this.projectGroup = item.dataList[0].projectGroup; + this.$http.get('SarStandItems/sar-stand-items/findAllItems', { + ids: item.standId, + type: item.fileType + },{ + _this: this + }, res => { + this.breakdownList = res.data + }) }); }, choiceZRRS(row, type, index) { @@ -562,6 +560,7 @@ export default { this.$set(this.projectDataList, "categoryName", this.selectProjectList[0].categoryName); this.$set(this.projectDataList, "projectStatus", this.selectProjectList[0].projectStatus); this.$set(this.projectDataList, "uname", this.selectProjectList[0].uname); + this.$set(this.projectDataList, "unameId", this.selectProjectList[0].projectManager); this.dataList.push({ projectName: this.projectDataList.projectName, projectNumber: this.projectDataList.projectNumber, @@ -570,6 +569,7 @@ export default { categoryName: this.projectDataList.categoryName, projectStatus: this.projectDataList.projectStatus, uname: this.projectDataList.uname, + unameId: this.projectDataList.unameId, }) } else { this.$message.warning("请勿重复添加数据"); @@ -618,9 +618,12 @@ export default { this.$message.warning('您最多只能选择五条数据') }else{ this.listForm.dataList = this.dataList; + this.listForm.breakdownList = this.breakdownList this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); - this.isSubmit = true; + // this.isSubmit = true; + console.log(json); + return this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue new file mode 100644 index 000000000..60a5fa44d --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/router/index.js b/src/router/index.js index 91dc27b14..9f3813bff 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -556,6 +556,15 @@ const routes = [ title: '标准合规评估流程' } }, + { + path: '/bzpgStep5', + name: 'bzpgStep5', + component: () => import('@/pages/processCenter/pages/creatProcess/bzpg/step5.vue'), + meta: { + requireAuth: true, + title: '标准合规评估流程' + } + }, { path: '/xmpgStep1', name: 'xmpgStep1',