diff --git a/src/pages/localTool/standCalendar/index.vue b/src/pages/localTool/standCalendar/index.vue index 8006a15cc..24e890362 100644 --- a/src/pages/localTool/standCalendar/index.vue +++ b/src/pages/localTool/standCalendar/index.vue @@ -103,10 +103,10 @@
@@ -241,9 +241,9 @@ @@ -339,6 +339,7 @@ export default { // 议题选中时储存数组 deleteTable: [], loading: false, + dialogTitle: '' } }, mounted() { @@ -619,10 +620,19 @@ export default { fillFile: this.fillFile = [] } this.editMeetForm.attend.push(list) + this.dialogTitle = '新增人员信息' + this.add_partDialog(list) }, + add_partDialog(row) { + // 用来储存取消时原来的数据,防止取消时修改 + localStorage.setItem('obj', JSON.stringify(row)) + this.editForm = row + this.editFlag = true + }, // 编辑按钮 edit_partForm(row) { + this.dialogTitle = '编辑人员信息' // 用来储存取消时原来的数据,防止取消时修改 localStorage.setItem('obj', JSON.stringify(row)) this.editForm = row @@ -679,13 +689,26 @@ export default { this.editFlag = false }, falseDrawerTab() { - let Item = JSON.parse(localStorage.getItem('obj')) - this.editForm.fillPeopleId = Item.fillPeopleId - this.editForm.fillPeople = Item.fillPeople - this.editForm.fillUnit = Item.fillUnit - this.editForm.fillDept = Item.fillDept - this.editForm.fillTel = Item.fillTel - this.editForm.fillMail = Item.fillMail + if (this.dialogTitle = '新增人员信息') { + let Items = JSON.parse(localStorage.getItem('objs')) + this.editMeetForm.attend = Items.attend + this.editMeetForm.content = Items.content + this.editMeetForm.date = Items.date + this.editMeetForm.files = Items.files + this.editMeetForm.id = Items.id + this.editMeetForm.partPeople = Items.partPeople + this.editMeetForm.place = Items.place + this.editMeetForm.title = Items.title + this.editMeetForm.type = Items.type + } else { + let Item = JSON.parse(localStorage.getItem('obj')) + this.editForm.fillPeopleId = Item.fillPeopleId + this.editForm.fillPeople = Item.fillPeople + this.editForm.fillUnit = Item.fillUnit + this.editForm.fillDept = Item.fillDept + this.editForm.fillTel = Item.fillTel + this.editForm.fillMail = Item.fillMail + } this.editFlag = false }, 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/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue index 328d95fdd..90f200642 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue @@ -116,7 +116,7 @@ @@ -342,9 +342,11 @@ export default { }, /** 选择入会人员 */ - choiceRole(type,title,id) { + choiceRole() { this.nodeList = [] - this.nodeList.push(id) + if (this.rh_pageData.comityOpRoleId.length > 0) { + this.nodeList = this.rh_pageData.comityOpRoleId.split(',') + } this.roleShowflag = true }, drawerCheck(data) { diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue index 5ccfc4e93..d7556c1ce 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue @@ -295,7 +295,7 @@
@@ -478,6 +478,7 @@ export default { acceptShow: false, roleShowflag: false, nodeList: [], + isTitle: '' } }, computed: { @@ -539,6 +540,8 @@ export default { fillFile: this.fillFile = [] } this.rh_pageData.myPartRole.push(list) + this.isTitle = '新增人员信息' + this.add_partDialog(list) }, fillFile_up(row) { @@ -625,8 +628,17 @@ export default { handleClose() { this.upDialog = false }, + add_partDialog(row) { + // 用来储存取消时原来的数据,防止取消时修改 + localStorage.setItem('obj', JSON.stringify(row)) + this.fileListData = row + this.reData = this.fileListData.fillFile + this.editForm = row + this.editFlag = true + }, // 编辑按钮 edit_partForm(row) { + this.isTitle = '编辑人员信息' // 用来储存取消时原来的数据,防止取消时修改 localStorage.setItem('obj', JSON.stringify(row)) this.fileListData = row @@ -639,15 +651,19 @@ export default { this.editFlag = false }, falseDrawer() { - let Item = JSON.parse(localStorage.getItem('obj')) - this.editForm.fillPeopleId = Item.fillPeopleId - this.editForm.fillPeople = Item.fillPeople - this.editForm.fillUnit = Item.fillUnit - this.editForm.fillDept = Item.fillDept - this.editForm.fillPost = Item.fillPost - this.editForm.fillTel = Item.fillTel - this.editForm.fillMail = Item.fillMail - this.editForm.fillFile = Item.fillFile + if (this.isTitle === '新增人员信息') { + this.getData() + } else { + let Item = JSON.parse(localStorage.getItem('obj')) + this.editForm.fillPeopleId = Item.fillPeopleId + this.editForm.fillPeople = Item.fillPeople + this.editForm.fillUnit = Item.fillUnit + this.editForm.fillDept = Item.fillDept + this.editForm.fillPost = Item.fillPost + this.editForm.fillTel = Item.fillTel + this.editForm.fillMail = Item.fillMail + this.editForm.fillFile = Item.fillFile + } this.editFlag = false }, // 编辑框选人 diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue index bde8597c7..d056e26d5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue @@ -112,7 +112,7 @@ @@ -303,9 +303,11 @@ export default { }, /** 选择入会人员 */ - choiceRole(type,title,id) { + choiceRole() { this.nodeList = [] - this.nodeList.push(id) + if (this.ch_pageData.meetingInRoleId.length > 0) { + this.nodeList = this.ch_pageData.meetingInRoleId.split(',') + } this.roleShowflag = true }, drawerCheck(data) { diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue index f1a972017..583a25fe0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue @@ -257,7 +257,7 @@ - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + +

{{ item.name }} + :key="item.id" @click.stop="clickButtonToUpload2(item.id)"> {{ item.name }} @@ -382,14 +382,13 @@ export default { } }, downloadFileByWater(attId, fileSuffix) { - let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1); - if (fileExtension !== "pdf" && fileExtension !== "PDF") { - this.$message.error("水印下载仅支持PDF,pdf格式文件"); + if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') { + this.$message.error('水印下载仅支持PDF,pdf格式文件') } else { - if (attId != null && attId !== "") { - window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId; + if (attId != null && attId !== '') { + window.location.href = '/api/att/attFile/downloadFileForSarWaterMark?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId } else { - this.$message.error("请选择要下载的文件"); + this.$message.error('请选择要下载的文件') } } }, diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue index 8dfd0b84c..7128517c9 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue @@ -111,7 +111,7 @@ width="260px" >

{{ item.name }} + :key="item.id" @click.stop="clickButtonToUpload2(item.id)"> {{ item.name }} @@ -452,14 +452,13 @@ export default { } }, downloadFileByWater(attId, fileSuffix) { - let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1); - if (fileExtension !== "pdf" && fileExtension !== "PDF") { - this.$message.error("水印下载仅支持PDF,pdf格式文件"); + if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') { + this.$message.error('水印下载仅支持PDF,pdf格式文件') } else { - if (attId != null && attId !== "") { - window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId; + if (attId != null && attId !== '') { + window.location.href = '/api/att/attFile/downloadFileForSarWaterMark?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId } else { - this.$message.error("请选择要下载的文件"); + this.$message.error('请选择要下载的文件') } } }, @@ -468,6 +467,7 @@ export default { if(!this.commentText){ this.$message.warning('请填写审批意见') }else{ + this.isSubmit = true this.listForm.approvalOpinion = "1"; this.saveLoading = true this.listForm.commentText = this.commentText; @@ -484,6 +484,7 @@ export default { this.$router.push("/processCenter"); } this.saveLoading = false + this.isSubmit = false }); }/**/ }, diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue index de5aa2f41..9a957e8d5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue @@ -82,7 +82,7 @@ style="display: none;" clearable > - + @@ -467,8 +467,11 @@ this.form.textType = data.textType || data.form.textType this.form.modelList = data.modelList || data.form.modelList this.form.modelNameList = data.modelNameList || data.form.modelNameList - this.form.bzfgId = data.bzfgId || '' - this.form.bzfgName = data.bzfgName || '' + console.log(data); + this.form.bzfgId = data.startUser + this.form.bzfgName = data.startUserName + // this.form.bzfgId = data.bzfgId || '' + // this.form.bzfgName = data.bzfgName || '' this.json = data this.data = data.info || data.data }).catch(e => { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue index 6cf213fce..495404de8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue @@ -459,7 +459,7 @@ export default { newText: '', reason: '', id: id, - department: this.$store.getters.userInfo.upDeptName, + department: this.$store.getters.userInfo.institutionName, responUserName: this.$store.getters.userInfo.userName, responUser: this.$store.getters.userInfo.userId } 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..c927509da 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue @@ -252,6 +252,17 @@ + + +

+ + {{value.name}} +
+
+ - - +
+ +
@@ -292,6 +303,10 @@ export default { type: Array, required: true }, + summaryFileList: { + type: Array, + required: true + }, disabledState: { type: Boolean, default: false @@ -387,7 +402,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 @@