diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue index a26e77563..d3f680706 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -413,36 +413,6 @@ export default { zcCompletionTime: "" //在产的完成时间 }] }, - // listForm: { - // standNumber: "", //标准编号 - // standName: "",//标准名称 - // certifiedEngineer: "", //认证工程师 - // qualityEngineer: "", //质量工程师 - // dataList: [{ - // certifiedEngineer: '', - // projectManager: '', - // standNumber: '', - // itemsName: '', - // uname: '', - // projectNumber: '', - // implementer: '', - // implementerId: '', - // productLine: '', - // itemNum:'', - // qualityEngineer: '', - // distributePerson:'', - // projectName:'', - // standName:'', - // distributePersonId:'', - // complianceReasons:'', //在研合规原因 - // noCompliance:'', //在研不合规项目 - // countermeasures:'', //在研应对措施 - // completionTime:'', //在研完成时间 - // zcComplianceReasons: '', //在产的合规原因 - // zcCountermeasures:'', //在产的应对措施 - // zcCompletionTime:'', //在产的完成时间 - // }] - // }, choiceForm: {}, //选择标准清单列表 countryOptions: [], //适用区域下拉框数据 user1: "", @@ -477,7 +447,6 @@ export default { taskIds: this.taskIds, pId: this.pId }).then(res => { - console.log(res.mesg); if (res) { const processForm = JSON.parse(res.mesg); this.getFormFieldList(processForm); @@ -492,11 +461,18 @@ export default { getFormFieldList(item) { this.$nextTick(() => { this.listForm = JSON.parse(JSON.stringify(item)); - console.log(item.fenFlag); if (item.fenFlag === undefined ) { + item.step3DTOS.forEach(item => { + item.implementerId = this.$store.getters.userInfo.userId + item.implementer = this.$store.getters.userInfo.userName + }) this.dataList = item.step3DTOS; } else { this.dataList = item.dataList; + this.dataList.forEach(item => { + item.implementerId = this.$store.getters.userInfo.userId + item.implementer = this.$store.getters.userInfo.userName + }) } this.listForm.prcNum = this.prcNum; this.listForm.prcName = this.prcName; @@ -524,6 +500,7 @@ export default { this.listForm.signFlag = ""; this.listForm.dataList = this.dataList; const json = JSON.stringify(this.listForm); + console.log(json); this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue new file mode 100644 index 000000000..5ef4d2c7b --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue @@ -0,0 +1,368 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue new file mode 100644 index 000000000..a61c3a4a4 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue index 709ebe063..3ac149a2f 100644 --- a/src/pages/processCenter/pages/newProcess/index.vue +++ b/src/pages/processCenter/pages/newProcess/index.vue @@ -10,7 +10,8 @@
标准清单发布/更新流程
-
项目合规评估流程
+
项目合规评估流程-标准
+
项目合规评估流程-项目
未符合项整改流程
标准解读流程
@@ -87,11 +88,17 @@ export default { }) break case '7': - //项目评估流程 + //项目评估流程 - 标准 this.$router.push({ name: 'xmpgStep1' }) break + case '10': + //项目评估流程- 项目 + this.$router.push({ + name: 'xmpg2Step1' + }) + break case '8': //未符合项整改流程 this.$router.push({ diff --git a/src/router/index.js b/src/router/index.js index 5c93b42a3..3e7dd9d26 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -339,6 +339,24 @@ const routes = [ title: '项目合规评估流程' } }, + { + path: '/xmpg2Step1', + name: 'xmpg2Step1', + component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step1.vue'), + meta: { + requireAuth: true, + title: '项目合规评估流程-项目' + } + }, + { + path: '/xmpg2Step2', + name: 'xmpg2Step2', + component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step2.vue'), + meta: { + requireAuth: true, + title: '项目合规评估流程-项目' + } + }, { path: '/wfhxzgStep1', name: 'wfhxzgStep1',