From cfaf5c33c7947ae4a32f3c44d10aa1626fcad5a9 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Tue, 28 Dec 2021 14:56:21 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=BA=93=20-=20=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=88=86=E8=A7=A3=E5=8D=95=20-=20=E9=80=82=E7=94=A8?= =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E5=9B=9E=E6=98=BE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../details/otherStandardDetails/index.vue | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index e0e75c8b5..79f6eacee 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -1724,6 +1724,7 @@ import CustomOrg from '@/components/CustomFormComponents/OrgTree' import {dateFormat} from '@/common/date' import RelatedTermsSelect from './components/RelatedTermsSelect' import { getBusStandFileByAttId } from 'api/process' +import {dicTypeData} from "api/unqualProcess"; export default { @@ -1746,6 +1747,7 @@ export default { }, data() { return { + CycxOptions: [], activeNames: ['基础信息','过程稿件','实施日期'], activeState: true, itemExistList: [], @@ -3085,6 +3087,19 @@ export default { }, {}, res => { this.selectedItemList = [] if (res.ok) { + console.log('3092',res.data.list) + res.data.list.forEach(item => { + let k = (item.applyArctic || "").split(',') + for (let i in this.applyArcticOptions.options) { + for (let m = 0; m < k.length; m++) { + if (this.applyArcticOptions.options[i].value === k[m]) { + k[m] = this.applyArcticOptions.options[i].label + } + item.applyArctic = k.join(',') + } + } + item.applyArctic = item.applyArctic.replaceAll('\"', '').replaceAll('\[', '').replaceAll('\]', '') + }) this.standItemList = res.data.list; this.total7 = res.data.count // 分页需要 } @@ -3583,6 +3598,12 @@ export default { return item.id } }, + created() { + dicTypeData().then(res => { + // 能源类型数据字典 + this.CycxOptions = res.data.CLLX + }) + }, async mounted() { this.sarStandardsInfoEO.id = this.$route.params.id // await this.selectStandMessage() From 488b9795752032c7507801a270e3eea9acc987fe Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Tue, 28 Dec 2021 15:28:33 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=BA=93=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 085ea947d..0043f6bc0 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -3576,7 +3576,7 @@ export default { // }, // 清空搜索框 clearAllSearch(flag) { - if (flag === 'sarStandardsSearch') { + if (flag === 'sarStandardsSearch' || flag === 'standCommonlySearch') { // 标准搜索 this.sarStandardsSearch.country = '' this.sarStandardsSearch.standSort = '' @@ -3593,7 +3593,7 @@ export default { this.sarStandardsSearch.synopsis = '' this.sarStandardsSearch.category = '' this.isAdvancedSearch = false - } else if (flag === 'standCommonlySearch') { + // } else if (flag === 'standCommonlySearch') { this.standCommonlySearch.standName = '' this.standCommonlySearch.standNumber = '' this.pageChange(1) @@ -4272,7 +4272,12 @@ export default { this.sarStandardsSearch.page = page } this.standCommonlySearch.page = page - this.getDomesticStandardTable(this.standCommonlySearch) + if (this.sarStandardsSearch) { + this.getDomesticStandardTable(this.sarStandardsSearch) + } else { + this.getDomesticStandardTable(this.standCommonlySearch) + } + }, // 分页每页显示数改变后方法 pageSizeChange(pageSize) { @@ -4283,6 +4288,7 @@ export default { }, // 分页查询国内标准 getDomesticStandardTable(item) { + console.log(item) if (item !== '' && item !== null && item !== undefined) { item.pageSize = this.$store.getters.userInfo.configContent } @@ -4293,6 +4299,7 @@ export default { } // this.sarStandardsSearch.menuId = this.selectSarMenu.id const formData = {...data} + console.log(formData) if (!item) { formData.menuId = this.sarStandardsSearch.menuId } else { From 45373a6a6063ecae8fd3eb075e79ba7d9f1e700e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 28 Dec 2021 15:30:12 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=8F=91=E5=B8=83bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step1-1.vue | 138 +++++++++--------- .../pages/creatProcess/bzqdfb/step1.vue | 138 +++++++++--------- .../pages/creatProcess/bzqdfb/step3.vue | 10 +- .../pages/creatProcess/bzqdfb/step4.vue | 2 + 4 files changed, 147 insertions(+), 141 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index 2c79ed7ac..bcb421fc3 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -119,7 +119,7 @@ width="260px" > - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + Date: Tue, 28 Dec 2021 15:38:00 +0800 Subject: [PATCH 4/9] feat: There is no way the,buss and product process --- .../pages/components/ProcessMixin.vue | 4 + .../qbrk-product/common/formEditList.vue | 675 ++++ .../qbrk-product/common/formList.vue | 418 +++ .../pages/creatProcess/qbrk-product/step1.vue | 2765 +++++++++++++++++ .../creatProcess/qbrk-product/step10.vue | 2462 +++++++++++++++ .../creatProcess/qbrk-product/step11.vue | 2462 +++++++++++++++ .../creatProcess/qbrk-product/step12.vue | 2462 +++++++++++++++ .../creatProcess/qbrk-product/step13.vue | 2613 ++++++++++++++++ .../creatProcess/qbrk-product/step14.vue | 2613 ++++++++++++++++ .../pages/creatProcess/qbrk-product/step2.vue | 2514 +++++++++++++++ .../pages/creatProcess/qbrk-product/step3.vue | 2630 ++++++++++++++++ .../pages/creatProcess/qbrk-product/step4.vue | 2462 +++++++++++++++ .../pages/creatProcess/qbrk-product/step5.vue | 2562 +++++++++++++++ .../pages/creatProcess/qbrk-product/step6.vue | 2635 ++++++++++++++++ .../pages/creatProcess/qbrk-product/step7.vue | 2616 ++++++++++++++++ .../pages/creatProcess/qbrk-product/step8.vue | 2462 +++++++++++++++ .../pages/creatProcess/qbrk-product/step9.vue | 2462 +++++++++++++++ .../creatProcess/qbrk-product/stepC3.vue | 2622 ++++++++++++++++ .../creatProcess/qbrk-product/stepC6.vue | 2635 ++++++++++++++++ .../creatProcess/qbrk-product/stepDetail.vue | 2413 ++++++++++++++ .../creatProcess/qbrk/common/formEditList.vue | 2 +- .../creatProcess/qbrk/common/formList.vue | 19 +- .../pages/creatProcess/qbrk/step1.vue | 10 +- .../pages/creatProcess/qbrk/step10.vue | 9 +- .../pages/creatProcess/qbrk/step11.vue | 9 +- .../pages/creatProcess/qbrk/step12.vue | 9 +- .../pages/creatProcess/qbrk/step2.vue | 5 +- .../pages/creatProcess/qbrk/step3.vue | 8 +- .../pages/creatProcess/qbrk/step4.vue | 5 +- .../pages/creatProcess/qbrk/step5.vue | 4 +- .../pages/creatProcess/qbrk/step6.vue | 59 +- .../pages/creatProcess/qbrk/step7.vue | 74 +- .../pages/creatProcess/qbrk/step8.vue | 10 +- .../pages/creatProcess/qbrk/step9.vue | 9 +- .../pages/creatProcess/qbrk/stepC3.vue | 4 +- .../pages/creatProcess/qbrk/stepDetail.vue | 268 +- .../processCenter/pages/newProcess/index.vue | 21 + .../tabComponents/processCenter/index.vue | 168 + .../tabComponents/taskDraft/index.vue | 87 +- src/router/index.js | 156 +- 40 files changed, 45059 insertions(+), 364 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk-product/common/formList.vue create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk-product/step14.vue create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue diff --git a/src/pages/processCenter/pages/components/ProcessMixin.vue b/src/pages/processCenter/pages/components/ProcessMixin.vue index c675cb441..2f3eace54 100644 --- a/src/pages/processCenter/pages/components/ProcessMixin.vue +++ b/src/pages/processCenter/pages/components/ProcessMixin.vue @@ -25,6 +25,10 @@ export default { label: "企标制修订-技术标准", value: "buss1" }, + { + label: "企标制修订-产品标准", + value: "buss2" + }, { label: "标准征求意见流程", value: "3" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue new file mode 100644 index 000000000..97c3b1122 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue @@ -0,0 +1,675 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formList.vue new file mode 100644 index 000000000..c80d45cdd --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formList.vue @@ -0,0 +1,418 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue new file mode 100644 index 000000000..fc1f6205e --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -0,0 +1,2765 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue new file mode 100644 index 000000000..56b62e5dc --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue @@ -0,0 +1,2462 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue new file mode 100644 index 000000000..00ce5e7d1 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue @@ -0,0 +1,2462 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue new file mode 100644 index 000000000..804c28069 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue @@ -0,0 +1,2462 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue new file mode 100644 index 000000000..0a16da727 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -0,0 +1,2613 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step14.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step14.vue new file mode 100644 index 000000000..8a1fbf833 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step14.vue @@ -0,0 +1,2613 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue new file mode 100644 index 000000000..707f8770b --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue @@ -0,0 +1,2514 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue new file mode 100644 index 000000000..19e362079 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue @@ -0,0 +1,2630 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue new file mode 100644 index 000000000..f73db12da --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue @@ -0,0 +1,2462 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue new file mode 100644 index 000000000..24b5c7ff7 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue @@ -0,0 +1,2562 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue new file mode 100644 index 000000000..5c93b1bb8 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue @@ -0,0 +1,2635 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue new file mode 100644 index 000000000..ed0546294 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue @@ -0,0 +1,2616 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue new file mode 100644 index 000000000..a7b591e0e --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue @@ -0,0 +1,2462 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue new file mode 100644 index 000000000..b4e677629 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue @@ -0,0 +1,2462 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue new file mode 100644 index 000000000..a8d12be8a --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue @@ -0,0 +1,2622 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue new file mode 100644 index 000000000..edcad9083 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue @@ -0,0 +1,2635 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue new file mode 100644 index 000000000..0a465070e --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue @@ -0,0 +1,2413 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue index 051c89510..97c3b1122 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue @@ -634,7 +634,7 @@ export default { this.energyKindOptions = res.data.ENERGYTYPES this.standGeneraOptions = res.data.BUSSBIGCLASS this.standSubclassOptions = res.data.BUSSFINECLASS - this.standSortOptions = res.data.STANDCLASSIFY // 标准类别 + this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 this.standNatureOptions = res.data.SARPROPERTY // 标准性质 this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态 this.standSystemOptions = res.data.TXLBBUSS // 标准体系 diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue index 96436cb40..1e7c39d8f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue @@ -253,6 +253,19 @@ + + + +
+ + {{value.name}} +
+
+ - - +
+
+
+
@@ -292,6 +305,10 @@ export default { type: Array, required: true }, + summaryFileList: { + type: Array, + required: true + }, disabledState: { type: Boolean, default: false @@ -387,7 +404,7 @@ export default { this.energyKindOptions = res.data.ENERGYTYPES this.standGeneraOptions = res.data.BUSSBIGCLASS this.standSubclassOptions = res.data.BUSSFINECLASS - this.standSortOptions = res.data.STANDCLASSIFY // 标准类别 + this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 this.standNatureOptions = res.data.SARPROPERTY // 标准性质 this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态 this.standSystemOptions = res.data.TXLBBUSS // 标准体系 diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index cc416a6fa..97879e923 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -543,12 +543,12 @@ - + -

标准法规部高级经理审核

+

标准法规部高级经理

- +
@@ -656,7 +656,7 @@ @@ -2631,7 +2631,7 @@ this.energyKindOptions = res.data.ENERGYTYPES this.standGeneraOptions = res.data.BUSSBIGCLASS this.standSubclassOptions = res.data.BUSSFINECLASS - this.standSortOptions = res.data.STANDCLASSIFY // 标准类别 + this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 this.standNatureOptions = res.data.SARPROPERTY // 标准性质 this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态 this.standSystemOptions = res.data.TXLBBUSS // 标准体系 diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue index 9e20fee47..a36f16b39 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue @@ -25,6 +25,7 @@ :BZSMBUSSFileList = "BZSMBUSSFileList" :QTWJBUSSFileList = "QTWJBUSSFileList" :GLWJBUSSFileList = "GLWJBUSSFileList" + :summaryFileList = "summaryFileList" :disabledState = "disabledState" :verifySarStandard = "verifySarStandard" :opinionsShow = "true" @@ -270,7 +271,7 @@ @@ -664,6 +665,7 @@ LSBBBUSSFileList: [], QTWJBUSSFileList: [], GLWJBUSSFileList: [], + summaryFileList: [], caFileList: [], FBGBJBDFileList: [], xgdFileList: [], @@ -799,6 +801,8 @@ modelData:[], modelDataNameVerify:[], modelDataZrUserVerify:[], + summaryFile:'', + summaryFileName:'', // 基础信息 country:[], // 基础信息 @@ -2298,6 +2302,7 @@ this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName); this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName); this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName); + this.summaryFileList=this.assemble(processForm.summaryFile,processForm.summaryFileName); } }).catch(e => { }) @@ -2348,7 +2353,7 @@ this.energyKindOptions = res.data.ENERGYTYPES this.standGeneraOptions = res.data.BUSSBIGCLASS this.standSubclassOptions = res.data.BUSSFINECLASS - this.standSortOptions = res.data.STANDCLASSIFY // 标准类别 + this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 this.standNatureOptions = res.data.SARPROPERTY // 标准性质 this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态 this.standSystemOptions = res.data.TXLBBUSS // 标准体系 diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue index c0cde6008..7cf70dd8a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue @@ -25,6 +25,7 @@ :BZSMBUSSFileList = "BZSMBUSSFileList" :QTWJBUSSFileList = "QTWJBUSSFileList" :GLWJBUSSFileList = "GLWJBUSSFileList" + :summaryFileList = "summaryFileList" :disabledState = "disabledState" :verifySarStandard = "verifySarStandard" :opinionsShow = "true" @@ -270,7 +271,7 @@ @@ -664,6 +665,7 @@ LSBBBUSSFileList: [], QTWJBUSSFileList: [], GLWJBUSSFileList: [], + summaryFileList: [], caFileList: [], FBGBJBDFileList: [], xgdFileList: [], @@ -799,6 +801,8 @@ modelData:[], modelDataNameVerify:[], modelDataZrUserVerify:[], + summaryFile:'', + summaryFileName:'', country:[], // 基础信息 standSort: '', @@ -2297,6 +2301,7 @@ this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName); this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName); this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName); + this.summaryFileList=this.assemble(processForm.summaryFile,processForm.summaryFileName); } }).catch(e => { }) @@ -2347,7 +2352,7 @@ this.energyKindOptions = res.data.ENERGYTYPES this.standGeneraOptions = res.data.BUSSBIGCLASS this.standSubclassOptions = res.data.BUSSFINECLASS - this.standSortOptions = res.data.STANDCLASSIFY // 标准类别 + this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 this.standNatureOptions = res.data.SARPROPERTY // 标准性质 this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态 this.standSystemOptions = res.data.TXLBBUSS // 标准体系 diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue index 3f616d7c9..a6518cd31 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue @@ -25,6 +25,7 @@ :BZSMBUSSFileList = "BZSMBUSSFileList" :QTWJBUSSFileList = "QTWJBUSSFileList" :GLWJBUSSFileList = "GLWJBUSSFileList" + :summaryFileList = "summaryFileList" :disabledState = "disabledState" :verifySarStandard = "verifySarStandard" :opinionsShow = "true" @@ -264,7 +265,7 @@ @@ -648,6 +649,7 @@ LSBBBUSSFileList: [], QTWJBUSSFileList: [], GLWJBUSSFileList: [], + summaryFileList: [], caFileList: [], FBGBJBDFileList: [], xgdFileList: [], @@ -783,6 +785,8 @@ modelData:[], modelDataNameVerify:[], modelDataZrUserVerify:[], + summaryFile:'', + summaryFileName:'', country:[], // 基础信息 standSort: '', @@ -2284,6 +2288,7 @@ this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName); this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName); this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName); + this.summaryFileList=this.assemble(processForm.summaryFile,processForm.summaryFileName); } }).catch(e => { }) @@ -2348,7 +2353,7 @@ this.energyKindOptions = res.data.ENERGYTYPES this.standGeneraOptions = res.data.BUSSBIGCLASS this.standSubclassOptions = res.data.BUSSFINECLASS - this.standSortOptions = res.data.STANDCLASSIFY // 标准类别 + this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 this.standNatureOptions = res.data.SARPROPERTY // 标准性质 this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态 this.standSystemOptions = res.data.TXLBBUSS // 标准体系 diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue index e8f514c27..e982921b6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue @@ -44,6 +44,7 @@ @@ -2406,7 +2407,7 @@ this.energyKindOptions = res.data.ENERGYTYPES this.standGeneraOptions = res.data.BUSSBIGCLASS this.standSubclassOptions = res.data.BUSSFINECLASS - this.standSortOptions = res.data.STANDCLASSIFY // 标准类别 + this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 this.standNatureOptions = res.data.SARPROPERTY // 标准性质 this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态 this.standSystemOptions = res.data.TXLBBUSS // 标准体系 diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue index a1868bfcd..9e3343ac1 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue @@ -39,11 +39,11 @@