diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue index eb7cec8e9..085615618 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue @@ -60,7 +60,7 @@ - + - + - +
{{ item.name }} diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue index 573bbe5b5..39a96db42 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue @@ -50,7 +50,7 @@ - -
- +
{{ item.name }} @@ -91,12 +91,16 @@
- + + @@ -249,6 +253,9 @@ formRules: { fileName: [ { required: true, message: '请上传调研结果', trigger: 'change' }, + ], + dyhz: [ + { required: true, message: '请输入回执说明', trigger: 'change' }, ] }, json: {}, diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue index 330f6ecde..6d2708a05 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue @@ -50,7 +50,7 @@ - -
- +
{{ item.name }} @@ -91,6 +91,9 @@ diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue index d760a1bce..0eaf5161c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue @@ -62,12 +62,12 @@ 导出汇总单 + size="mini">生成汇总单 导出征求意见稿 + @click="upload(oldData, '上报意见.xls')" + size="mini">生成上报意见
导出汇总单 + size="mini">生成汇总单 导出征求意见搞 + @click="upload(oldData, '上报意见.xls')" + size="mini">生成上报意见
导出汇总单 + size="mini">生成汇总单 导出征求意见搞 + @click="upload(oldData, '上报意见.xls')" + size="mini">生成上报意见
导出汇总单 + size="mini">生成汇总单 导出征求意见搞 + @click="upload(oldData, '上报意见.xls')" + size="mini">生成上报意见 - {{ scope.row.distributePerson }} + > + @@ -563,6 +563,7 @@ export default { distributePerson: "", //分发责任人 distributePersonId: "", //分发责任人id id: "", + pastProject: [], //用来存放上次选中的产品线信息 sarStandProjectLibraries: [{ projectManager: "", projectLevel: "", @@ -710,6 +711,7 @@ export default { }, //确认添加事件 okStand() { + this.pastProject = JSON.parse(localStorage.getItem('projectList')) let proData = []; if (this.dataList.length >= 1) { this.dataList.forEach(item => { @@ -727,6 +729,14 @@ export default { this.standModel = false; } else { if (this.standList.length >= 1) { + this.pastProject.forEach(item => { + this.standList.map(items => { + if( item.productLine === items.productLine){ + items.distributePersonId = item.distributePersonId + items.distributePerson = item.distributePerson + } + }) + }) this.dataList = this.standList; this.roleForm.directorUser = this.dataList[0].uname; this.listForm.dataList = this.standList; @@ -774,6 +784,7 @@ export default { this.isSubmit = true; this.listForm.commentText = this.commentText; var json = Object.assign(this.listForm, this.roleForm); + localStorage.setItem('projectList', JSON.stringify(this.dataList)) this.$refs["listForm"].validate((valid) => { if (valid) { this.$refs["roleForm"].validate((valid) => { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index 7dde63dce..35783abf5 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -686,7 +686,7 @@ export default { }, //确认添加事件 okStand() { - // this.pastProject = JSON.parse(localStorage.getItem('projectList')) + this.pastProject = JSON.parse(localStorage.getItem('projectList')) let proData = []; if (this.dataList.length >= 1) { this.dataList.forEach(item => { @@ -704,6 +704,14 @@ export default { this.standModel = false; } else { if (this.standList.length >= 1) { + this.pastProject.forEach(item => { + this.standList.map(items => { + if( item.productLine === items.productLine){ + items.distributePersonId = item.distributePersonId + items.distributePerson = item.distributePerson + } + }) + }) this.dataList = this.standList; this.roleForm.directorUser = this.dataList[0].uname; this.listForm.dataList = this.standList; @@ -749,7 +757,7 @@ export default { this.isSubmit = true; this.listForm.commentText = this.commentText; var json = Object.assign(this.listForm, this.roleForm); - // localStorage.setItem('projectList', JSON.stringify(this.dataList)) + localStorage.setItem('projectList', JSON.stringify(this.dataList)) this.$refs["listForm"].validate((valid) => { if (valid) { this.$refs["roleForm"].validate((valid) => { diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 5a62053a6..03e821061 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -7,7 +7,7 @@
+ label-width="100px"> @@ -42,7 +42,7 @@ >

- + + + {{ sarAccessEO.remark || "-" }}

- +

{{ item.name }} @@ -109,6 +109,14 @@ width="55" align="center"> + + 基础信息

- + @@ -26,7 +26,7 @@ >

- + + +
+ label-width="100px"> @@ -39,7 +39,7 @@ >

- + + + 导出 - 批量删除 + --> + 配置标准 - 配置标准 -
@@ -182,6 +182,7 @@