diff --git a/src/main.js b/src/main.js index 569a45775..eff8a3abc 100644 --- a/src/main.js +++ b/src/main.js @@ -200,7 +200,7 @@ router.beforeEach(function (to, from, next) { if (path === "/xmpgStep2" || path === "/xmpgStep1" || path === "/xmpgStep1-2") { extracted("xmpgStep1-2"); } else { - extracted("xmpgStep1-7"); + extracted("bzpgStep8-1"); } } else if (prcType === '6') { //标准项目合规评估 项目维度 diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue index 176dc863b..56ce7693a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -125,13 +125,6 @@ 查看条款内容 - - + + 查看条款内容 - - + + - - + + - + { - if(item.projectName === tab.name){ - this.dataList.push(item) - } - }) + this.projectName = tab.name }, getData() { return new Promise((resolve, reject) => { @@ -377,6 +372,7 @@ export default { * @description: 动态表单读取 */ getFormFieldList (item) { + console.log(item); this.$nextTick(() => { this.listForm = JSON.parse(JSON.stringify(item)) this.fileType = item.fileType @@ -389,6 +385,7 @@ export default { this.projectTabName.push(item.projectName) } }) + this.projectName = this.activeName = this.projectTabName[Object.keys(this.projectTabName)[0]] this.listForm.resDats = [] this.listForm.breakdownList = [] this.dataList.distributePerson = item.dataList[0].distributePerson @@ -533,6 +530,7 @@ export default { this.selectProject = data }, choiceZRRS(row, type, index) { + localStorage.setItem('selectProject', JSON.stringify(this.selectProject)) this.type = type; if (type === 1) { this.nodeList2 = []; @@ -574,6 +572,7 @@ export default { projectList[this.lsIndex].implementer = nameList; this.dataList = projectList } else if (this.type === 2) { + this.selectProject = JSON.parse(localStorage.getItem('selectProject')) let projectList = JSON.parse(JSON.stringify(this.dataList)) projectList.forEach(item => { this.selectProject.forEach(items => { @@ -671,8 +670,8 @@ export default { } } } - /deep/.el-tabs__header{ - margin: 0; + /deep/.el-tabs--border-card>.el-tabs__content{ + padding: 0; } .demo-drawer-content { margin-top: 10px; diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue index 471af52e5..5badbc1cf 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue @@ -135,9 +135,18 @@ + + + + { + if(!this.projectTabName.includes(item.projectName)){ + this.projectTabName.push(item.projectName) + } + }) + this.projectName = this.activeName = this.projectTabName[Object.keys(this.projectTabName)[0]] } else { this.listForm = item.form; this.dataList = item.form.dataList; @@ -727,6 +748,9 @@ export default { .demo-drawer-content { margin-top: 10px; } + /deep/.el-tabs--border-card>.el-tabs__content{ + padding: 0; + } /deep/.el-table th > .cell{ font-size: 14px; } diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue new file mode 100644 index 000000000..3b4239e97 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue @@ -0,0 +1,761 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue index a8264ba86..aac3a90b9 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue @@ -1,4 +1,4 @@ - +