From 2aaaaf363312bb28f486866eca051632e68e6fe0 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 13 Jan 2022 00:07:49 +0800 Subject: [PATCH] feat: There is no way the, --- .../qbrk-product/common/formEditList.vue | 252 ++++++++++-------- .../qbrk-product/common/formList.vue | 12 +- .../pages/creatProcess/qbrk-product/step1.vue | 35 ++- .../creatProcess/qbrk-product/step10.vue | 10 +- .../creatProcess/qbrk-product/step11.vue | 11 +- .../creatProcess/qbrk-product/step12.vue | 10 +- .../creatProcess/qbrk-product/step13.vue | 236 +++++++++++----- .../pages/creatProcess/qbrk-product/step2.vue | 19 ++ .../pages/creatProcess/qbrk-product/step3.vue | 29 +- .../pages/creatProcess/qbrk-product/step4.vue | 6 + .../pages/creatProcess/qbrk-product/step5.vue | 6 + .../pages/creatProcess/qbrk-product/step6.vue | 30 ++- .../pages/creatProcess/qbrk-product/step7.vue | 71 +---- .../pages/creatProcess/qbrk-product/step8.vue | 11 +- .../pages/creatProcess/qbrk-product/step9.vue | 11 +- .../creatProcess/qbrk-product/stepC3.vue | 46 +++- .../creatProcess/qbrk-product/stepC6.vue | 183 +++++++++---- .../creatProcess/qbrk/common/formEditList.vue | 7 +- 18 files changed, 661 insertions(+), 324 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue index eb41d0d72..145cbb7c7 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue @@ -7,7 +7,7 @@ - + - @@ -29,6 +29,13 @@ clearable > + + + @@ -93,6 +100,16 @@ clearable > + + + + + @@ -172,16 +189,16 @@ - +
-
+
{{ item.name }} @@ -194,7 +211,7 @@ class="common-button-primary" size="mini" style="margin-left: 10px; margin-top: 11px; float: right;" - @click="fileUpload('BZSMBUSS')"> + @click="fileUpload('XGD')">
@@ -341,70 +358,6 @@ @click="selectLaws('DTQBBHBUSS'),config.attrName = '代替企标编号'" >{{'手动查找'}} - - - {{'手动查找'}} - - - - {{'手动查找'}} - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -607,6 +624,10 @@ type: Array, required: false }, + XGDFileListSub: { + type: Array, + required: false + }, madelSubListSub: { type: Array, required: false @@ -638,6 +659,11 @@ }, data () { return { + opinionsStand:[ + {value: '1',label: '制定'}, + {value: '2',label: '修订'}, + {value: '3',label: '修改'}, + ], fileId:'', dialogVisible: false, config: { @@ -673,6 +699,7 @@ QTWJBUSSFileList: [], GLWJBUSSFileList: [], summaryFileList: [], + XGDFileList: [], madelSubList: [], countryOptions:[],//国家地区 standSortOptions: [], // 标准类别 @@ -798,11 +825,13 @@ case 'madelSub': this.fileList=this.madelSubList break; + case 'XGD': + this.fileList=this.XGDFileList + break; default : ; } this.fileMadel = true; - console.log(this.madelSubList) - this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.BZSMBUSSFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.fileMadel,this.fileList,fileType,this.madelSubList); + this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.XGDFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.fileMadel,this.fileList,fileType,this.madelSubList); }, filePreview(){ this.$preview(this.fileId) @@ -822,7 +851,7 @@ } if (type === 'down') { if (attId) { - window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId + window.open('/api/att/attFile/downloadFileForSar?fileId=' + attId) } else { this.$message.warning('文件不存在,下载失败') } @@ -859,45 +888,44 @@ }, mounted () { this.form = this.formSub, - console.log(this.form) this.FBGBUSSFileList= this.FBGBUSSFileListSub, - this.BZSMBUSSFileList= this.BZSMBUSSFileListSub, - this.LSBBBUSSFileList= this.LSBBBUSSFileListSub, - this.QTWJBUSSFileList= this.QTWJBUSSFileListSub, - this.GLWJBUSSFileList= this.GLWJBUSSFileListSub, - this.summaryFileList= this.summaryFileListSub, - this.madelSubList= this.madelSubListSub, - this.$http.get('sys/dictype/getDicTypeListCode', '', { - _this: this - }, res => { - this.countryOptions = res.data.COUNTRY - this.applyCountryOptions = res.data.COUNTRY - this.regionOptions = res.data.REGION // 区域 - this.standStateOptions = res.data.BUSSSTATE - this.energyKindOptions = res.data.ENERGYTYPES - this.standGeneraOptions = res.data.BUSSBIGCLASS - this.standSubclassOptions = res.data.BUSSFINECLASS - this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 - this.standNatureOptions = res.data.SARPROPERTY // 标准性质 - this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态 - this.standSystemOptions = res.data.TXLBBUSS // 标准体系 - this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型 - this.categoryOptions = res.data.NYLXCLASS // 能源类型 - this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 - this.cysdOptions = res.data.WSCYSD // 我司参与深度 - this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 - this.txlbOptions = res.data.TXLBCLASS // 体系类别 - this.qcdwOptions = res.data.QCDW // 起草单位 - this.qcrOptions = res.data.QCRBUSS // 起草人 - this.nylxOptions = res.data.NYLXCLASS // 能源类型 - this.syrzOptions = res.data.SYRZCLASS // 适用认证 - this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 - this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 - this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 - this.gkglbmOptions=res.data.GKGLBM;//归口管理部门 - this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度 - this.setMap(this.standStateOptions) - }) + this.XGDFileList= this.XGDFileListSub, + this.LSBBBUSSFileList= this.LSBBBUSSFileListSub, + this.QTWJBUSSFileList= this.QTWJBUSSFileListSub, + this.GLWJBUSSFileList= this.GLWJBUSSFileListSub, + this.summaryFileList= this.summaryFileListSub, + this.madelSubList= this.madelSubListSub, + this.$http.get('sys/dictype/getDicTypeListCode', '', { + _this: this + }, res => { + this.countryOptions = res.data.COUNTRY + this.applyCountryOptions = res.data.COUNTRY + this.regionOptions = res.data.REGION // 区域 + this.standStateOptions = res.data.BUSSSTATE + this.energyKindOptions = res.data.ENERGYTYPES + this.standGeneraOptions = res.data.BUSSBIGCLASS + this.standSubclassOptions = res.data.BUSSFINECLASS + this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 + this.standNatureOptions = res.data.SARPROPERTY // 标准性质 + this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态 + this.standSystemOptions = res.data.TXLBBUSS // 标准体系 + this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型 + this.categoryOptions = res.data.NYLXCLASS // 能源类型 + this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 + this.cysdOptions = res.data.WSCYSD // 我司参与深度 + this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 + this.txlbOptions = res.data.TXLBCLASS // 体系类别 + this.qcdwOptions = res.data.QCDW // 起草单位 + this.qcrOptions = res.data.QCRBUSS // 起草人 + this.nylxOptions = res.data.NYLXCLASS // 能源类型 + this.syrzOptions = res.data.SYRZCLASS // 适用认证 + this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 + this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 + this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 + this.gkglbmOptions=res.data.GKGLBM;//归口管理部门 + this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度 + this.setMap(this.standStateOptions) + }) this.busVsFunc() this.modelFunc() }, @@ -905,7 +933,7 @@ form: { handler: function (val) { if(val){ - this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.BZSMBUSSFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.fileMadel,this.fileList,'',this.madelSubList); + this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.XGDFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.fileMadel,this.fileList,'',this.madelSubList); } }, deep: true //对象的深度验证 diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formList.vue index 4dbc3dcfa..07bf4ab8e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formList.vue @@ -22,6 +22,10 @@ clearable > + + + @@ -119,8 +123,8 @@ - -
+ +
{{ item.name }} @@ -444,6 +448,10 @@ type: Array, required: true }, + XGDFileList: { + type: Array, + required: true + }, QTWJBUSSFileList: { type: Array, required: true diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue index 77f990e9e..782f2523c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -42,6 +42,13 @@ clearable > + + + @@ -179,16 +186,16 @@ - +
-
{{ item.name }}
+
{{ item.name }}
+ @click="fileUpload('XGD')">
@@ -1097,6 +1104,7 @@ fileList: [], FBGBUSSFileList: [], BZSMBUSSFileList: [], + XGDFileList: [], LSBBBUSSFileList: [], QTWJBUSSFileList: [], GLWJBUSSFileList: [], @@ -1233,6 +1241,9 @@ modelData:[], modelDataNameVerify:[], modelDataZrUserVerify:[], + BARQ: '', + XGD: '', + XGDName: '', // 基础信息 country:[], // 基础信息 @@ -1770,6 +1781,7 @@ this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName); this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName); this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName); + this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName); this.roleForm = mes.roleForm this.commentText = mes.commentText }) @@ -1797,6 +1809,9 @@ // 基础信息 standCode: '', standYear: '', + BARQ: '', + XGD: '', + XGDName: '', textStatusBuss: '', issueTime: '', putTime: '', @@ -2415,6 +2430,9 @@ case 'GLWJBUSS': this.GLWJBUSSFileList = fileList break; + case 'XGD' : + this.XGDFileList = fileList + break; default : ; } this.$message({ @@ -2446,6 +2464,9 @@ case 'GLWJBUSS': this.fileList=this.GLWJBUSSFileList break; + case 'XGD': + this.fileList=this.XGDFileList + break; default : ; } this.fileMadel = true; @@ -2469,6 +2490,9 @@ case 'GLWJBUSS': this.GLWJBUSSFileList = fileList break; + case 'XGD': + this.XGDFileList = fileList + break; default : ; } }, @@ -2567,6 +2591,9 @@ this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.response.data.id).join(",") this.form.GLWJBUSSName=this.GLWJBUSSFileList.map(item => item.name).join(",") + this.form.XGD=this.XGDFileList.map(item => item.response.data.id).join(",") + this.form.XGDName=this.XGDFileList.map(item => item.name).join(",") + }, // 删除方法 deletedId(data, ids) { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue index 6d042d53c..1b080cef1 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue @@ -26,7 +26,9 @@ :QTWJBUSSFileList = "QTWJBUSSFileList" :GLWJBUSSFileList = "GLWJBUSSFileList" :disabledState = "disabledState" - :verifySarStandard = "verifySarStandard"> + :verifySarStandard = "verifySarStandard" + :opinionsShow = "true" + >
@@ -656,7 +658,7 @@ GLWJBUSSFileList: [], caFileList: [], FBGBJBDFileList: [], - xgdFileList: [], + XGDFileList: [], ZCWBLAWSFileList: [], GCWBLAWSFileList: [], JDWJLAWSFileList: [], @@ -789,6 +791,9 @@ modelData:[], modelDataNameVerify:[], modelDataZrUserVerify:[], + BARQ: '', + XGD: '', + XGDName: '', // 基础信息 country:[], // 基础信息 @@ -2304,6 +2309,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.XGDFileList=this.assemble(processForm.XGD,processForm.XGDName); } }).catch(e => { }) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue index a850d1ef6..334ae3dac 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue @@ -25,8 +25,11 @@ :BZSMBUSSFileList = "BZSMBUSSFileList" :QTWJBUSSFileList = "QTWJBUSSFileList" :GLWJBUSSFileList = "GLWJBUSSFileList" + :XGDFileList = "XGDFileList" :disabledState = "disabledState" - :verifySarStandard = "verifySarStandard"> + :verifySarStandard = "verifySarStandard" + :opinionsShow = "true" + >
@@ -656,7 +659,7 @@ GLWJBUSSFileList: [], caFileList: [], FBGBJBDFileList: [], - xgdFileList: [], + XGDFileList: [], ZCWBLAWSFileList: [], GCWBLAWSFileList: [], JDWJLAWSFileList: [], @@ -789,6 +792,9 @@ modelData:[], modelDataNameVerify:[], modelDataZrUserVerify:[], + BARQ: '', + XGD: '', + XGDName: '', // 基础信息 country:[], // 基础信息 @@ -2304,6 +2310,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.XGDFileList=this.assemble(processForm.XGD,processForm.XGDName); } }).catch(e => { }) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue index 39ab3e71e..ca36a7fff 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue @@ -26,7 +26,9 @@ :QTWJBUSSFileList = "QTWJBUSSFileList" :GLWJBUSSFileList = "GLWJBUSSFileList" :disabledState = "disabledState" - :verifySarStandard = "verifySarStandard"> + :verifySarStandard = "verifySarStandard" + :opinionsShow = "true" + >
@@ -656,7 +658,7 @@ GLWJBUSSFileList: [], caFileList: [], FBGBJBDFileList: [], - xgdFileList: [], + XGDFileList: [], ZCWBLAWSFileList: [], GCWBLAWSFileList: [], JDWJLAWSFileList: [], @@ -789,6 +791,9 @@ modelData:[], modelDataNameVerify:[], modelDataZrUserVerify:[], + BARQ: '', + XGD: '', + XGDName: '', // 基础信息 country:[], // 基础信息 @@ -2304,6 +2309,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.XGDFileList=this.assemble(processForm.XGD,processForm.XGDName); } }).catch(e => { }) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue index 43a7b4d9a..51c863827 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -26,8 +26,7 @@ :BZSMBUSSFileListSub = "BZSMBUSSFileList" :QTWJBUSSFileListSub = "QTWJBUSSFileList" :GLWJBUSSFileListSub = "GLWJBUSSFileList" - :summaryFileListSub = "summaryFileList" - :madelSubListSub = "madelSubList" + :XGDFileListSub = "XGDFileList" :disabledState = "disabledState" :verifySarStandard = "verifySarStandard" :fileMadelSub = "fileMadel" @@ -672,10 +671,10 @@ QTWJBUSSFileList: [], GLWJBUSSFileList: [], summaryFileList: [], + XGDFileList: [], madelSubList: [], caFileList: [], FBGBJBDFileList: [], - xgdFileList: [], ZCWBLAWSFileList: [], GCWBLAWSFileList: [], JDWJLAWSFileList: [], @@ -808,6 +807,7 @@ countryArr:'', commentCycleDate:'', form: { + standStatus:'', // 标准状态 planId:'', planStatus:'', reviseStatus:'', @@ -819,6 +819,9 @@ summaryFileName:'', madelSub:'', madelSubName:'', + BARQ: '', + XGD: '', + XGDName: '', country:[], // 基础信息 standSort: '', @@ -977,6 +980,9 @@ textStatusBuss: [ { required: true, message: '请选择文本状态', trigger: 'change' } ], + standStatus: [ + { required: true, message: '请选择标准状态', trigger: 'change' } + ], issueTime: [ { required: false, message: '请选择企标发布日期', trigger: 'change'} ], @@ -1065,6 +1071,14 @@ } } }, + 'form.standStatus': { + handler (val) { + if (val !== '' && val !== null && typeof (val) !== 'undefined') { + console.log(val) + this.getStandInfoByReviseStatus() + } + } + }, filterText(val) { this.$refs.tree.filter(val); }, @@ -1137,7 +1151,7 @@ this.form = form this.FBGBUSSFileList = list1 this.LSBBBUSSFileList = list2 - this.BZSMBUSSFileList = list3 + this.XGDFileList = list3 this.QTWJBUSSFileList = list4 this.GLWJBUSSFileList = list5 this.madelSubList = list6 @@ -1348,14 +1362,14 @@ let mes = JSON.parse(res.mes) mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) this.form = mes.form + this.getStandInfoByReviseStatus() this.footFileList=this.assemble(this.form.footFile,this.form.footFileName); this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName); this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName); this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName); this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName); this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName); - this.summaryFileList=this.assemble(this.form.summaryFile,this.form.summaryFileName); - this.madelSubList=this.assemble(this.form.madelSub,this.form.madelSubName); + this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName); this.roleForm = mes.roleForm this.commentText = mes.commentText this.formKey++ @@ -1381,6 +1395,9 @@ standEnName: data.standEnName ? data.standEnName : '', // 英文名称 standName: data.standName ? data.standName : '', // 中文名称 signFlag: data.signFlag ? data.signFlag : '1', // 是否需要会签 + BARQ: '', + XGD: '', + XGDName: '', // 基础信息 standCode: '', standYear: '', @@ -1826,27 +1843,55 @@ type: 'warning' }) } - if (this.selectedListRep.length + textArr.length > 20) { + if (this.selectedListRep.length + textArr.length > 1) { return this.$message({ - message: '标准最多选择20项', + message: '标准最多选择1项', type: 'warning' }) } - this.selectedListRep.map((item) => { - let texts = '' - if (item.standYear != null && item.standYear !== '') { - texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear - } else { - texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber - } - textArr.push(texts) - textArr = [...new Set(textArr)] - this.replaceLawsNumModel = false - }) + let textArr2 = [] + if(this.selectedListRep.length === 1){ + this.selectedListRep.map((item) => { + let texts = '' + if (item.standYear != null && item.standYear !== '') { + texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear + } else { + texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber + } + // 标准状态 修改 更新当前标准 + if(this.form.standStatus === '3'){ + this.form.standSort = item.standSort + this.form.standNumber = item.standNumber + this.form.standYear = item.standYear + this.form.standCode = texts + this.form.id = item.id + } + textArr2.push(item.standNumber) + textArr.push(texts) + textArr = [...new Set(textArr)] + textArr2 = [...new Set(textArr2)] + this.replaceLawsNumModel = false + }) + }else { + this.selectedListRep.map((item) => { + let texts = '' + if (item.standYear != null && item.standYear !== '') { + texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear + } else { + texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber + } + textArr2.push(item.standNumber) + textArr.push(texts) + textArr = [...new Set(textArr)] + textArr2 = [...new Set(textArr2)] + this.replaceLawsNumModel = false + }) + } // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',') // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖 - if(this.replaceLawType === 'dtbjh'){ - this.form.dtbjh = this.form.dtbjh ? this.form.dtbjh + ',' + textArr.join(',') : textArr.join(',') + if(this.replaceLawType === 'DTQBBHBUSS'){ + this.form.DTQBBHBUSS = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',') + this.form.standNum = this.form.standNum ? this.form.standNum + ',' + textArr2.join(',') : textArr2.join(',') }else if(this.replaceLawType === 'yybj'){ this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',') }else if(this.replaceLawType === 'cbbh'){ @@ -2024,6 +2069,10 @@ this.madelSubList = this.madelSubList.filter ( item => item.response === undefined); this.madelSubList.push(fileObj) break; + case 'XGD': + this.XGDFileList = this.XGDFileList.filter ( item => item.response === undefined); + this.XGDFileList.push(fileObj) + break; default : ; } this.formKey++ @@ -2066,6 +2115,9 @@ case 'madelSub': this.fileList=this.madelSubList break; + case 'XGD': + this.fileList=this.XGDFileList + break; default : ; } this.fileMadel = true; @@ -2094,6 +2146,9 @@ case 'madelSub': this.madelSubList = fileList break; + case 'XGD': + this.XGDFileList = fileList + break; default : ; } }, @@ -2235,11 +2290,8 @@ this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.id).join(",") this.form.GLWJBUSSName=this.GLWJBUSSFileList.map(item => item.name).join(",") - this.form.summaryFile=this.summaryFileList.map(item => item.id).join(",") - this.form.summaryFileName=this.summaryFileList.map(item => item.name).join(",") - - this.form.madelSub=this.madelSubList.map(item => item.id).join(",") - this.form.madelSubName=this.madelSubList.map(item => item.name).join(",") + this.form.XGD=this.XGDFileList.map(item => item.id).join(",") + this.form.XGDName=this.XGDFileList.map(item => item.name).join(",") }, // 删除方法 @@ -2327,39 +2379,47 @@ // } else if (val === '') { // this.form.country = [] // } + if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) { + this.$message.warning("请选择一条代替企标编号") + return + } this.fileInfoHandle() - this.$refs['formTongGuo'].validate((valid) => { - if (valid) { - this.isSubmit = true - this.form.commentText = this.formTongGuo.commentText - this.form.approvalOpinion = this.formTongGuo.approvalOpinion - this.form.topId = this.pId - const json = JSON.stringify(this.form); - this.$http.post('lawss/activiti/completeTask', { - taskIds: this.taskIds, - userId : this.userId, - json: json - }, { - _this: this - }, res => { - if (res.success) { - // this.$message.success(res.message) - // 流程提交之后，应该流转至待办任务页面 - this.isSubmit = false - this.processCreateBuss(json) - // if(this.formTongGuo.approvalOpinion === '1'){ - // this.$message.warning("驳回成功") - // this.isSubmit = false - // // 流程提交之后，应该流转至待办任务页面 - // this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) - // }else{ - // this.processCreateLaws(json) - // } - }else { - this.$message.success(res.message) - } - }) - }}) + this.$refs['form'].validate((valid) => { + if (valid) { + this.$refs['formTongGuo'].validate((valid) => { + if (valid) { + this.isSubmit = true + this.form.commentText = this.formTongGuo.commentText + this.form.approvalOpinion = this.formTongGuo.approvalOpinion + this.form.topId = this.pId + const json = JSON.stringify(this.form); + this.$http.post('lawss/activiti/completeTask', { + taskIds: this.taskIds, + userId : this.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + // this.$message.success(res.message) + // 流程提交之后，应该流转至待办任务页面 + this.isSubmit = false + this.processCreateBuss(json) + // if(this.formTongGuo.approvalOpinion === '1'){ + // this.$message.warning("驳回成功") + // this.isSubmit = false + // // 流程提交之后，应该流转至待办任务页面 + // this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + // }else{ + // this.processCreateLaws(json) + // } + }else { + this.$message.success(res.message) + } + }) + }}) + } + }) }, /** * @description: 流程入库 @@ -2421,7 +2481,6 @@ this.form.prcName = this.prcName this.form.issueTime = this.dateFormatter() this.form['id'] = item.id - this.getStandInfoByReviseStatus() this.formKey++ }) }, @@ -2450,15 +2509,13 @@ dateArr[1] = processForm.commentCycleEnd this.commentCycleDate = dateArr } - this.getFormFieldList(processForm) this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName); this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName); 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); - this.madelSubList=this.assemble(processForm.madelSub,processForm.madelSubName); + this.XGDFileList=this.assemble(processForm.XGD,processForm.XGDName); this.formKey++ } }).catch(e => { @@ -2489,11 +2546,47 @@ getStandInfoByReviseStatus() { let date = new Date(); let year = date.getFullYear(); - if(this.form.reviseStatus === '2'){ - this.form.standSn = this.form.standNum - this.form.standNumber = this.form.standNum - this.form.standYear = this.regDate(year) - this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + if(this.form.standStatus === '2'){ + this.FBGBUSSFileList = [] + this.LSBBBUSSFileList = [] + this.form.FBGBUSS = sessionStorage.getItem("FBGBUSSBF") + this.form.FBGBUSSName = sessionStorage.getItem("FBGBUSSNameBF") + this.form.LSBBBUSS = sessionStorage.getItem("LSBBBUSSBF") + this.form.LSBBBUSSName = sessionStorage.getItem("LSBBBUSSNameBF") + this.FBGBUSSFileList=this.assemble(sessionStorage.getItem("FBGBUSSBF"),sessionStorage.getItem("FBGBUSSNameBF")); + this.LSBBBUSSFileList=this.assemble(sessionStorage.getItem("LSBBBUSSBF"),sessionStorage.getItem("LSBBBUSSNameBF")); + this.formKey++ + if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) { + this.$message.warning("请选择一条代替企标编号") + return + } + if(this.form.DTQBBHBUSS !== undefined && this.form.DTQBBHBUSS !== null){ + this.form.standSn = this.form.standNum + this.form.standNumber = this.form.standNum + this.form.standYear = this.regDate(year) + this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + } + this.formKey++ + }else if(this.form.standStatus === '3' ){ + sessionStorage.removeItem("FBGBUSSBF") + sessionStorage.removeItem("FBGBUSSNameBF") + sessionStorage.removeItem("LSBBBUSSBF") + sessionStorage.removeItem("LSBBBUSSNameBF") + sessionStorage.setItem("FBGBUSSBF",this.form.FBGBUSS) + sessionStorage.setItem("FBGBUSSNameBF",this.form.FBGBUSSName) + sessionStorage.setItem("LSBBBUSSBF",this.form.LSBBBUSS) + sessionStorage.setItem("LSBBBUSSNameBF",this.form.LSBBBUSSName) + this.LSBBBUSSFileList=this.LSBBBUSSFileList.concat(this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName)) + this.form.LSBBBUSS = this.form.FBGBUSS + this.form.LSBBBUSSName = this.form.FBGBUSSName + this.FBGBUSSFileList= [] + this.FBGBUSS = "" + this.FBGBUSSName = "" + this.formKey++ + if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) { + this.$message.warning("请选择一条代替企标编号") + return + } }else { this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_'+this.form.reviseStatus}, { _this: this @@ -2504,6 +2597,15 @@ this.form.standNumber = standSn this.form.standYear = year // 待带入立项标准 this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + this.FBGBUSSFileList = [] + this.LSBBBUSSFileList = [] + this.form.FBGBUSS = sessionStorage.getItem("FBGBUSSBF") + this.form.FBGBUSSName = sessionStorage.getItem("FBGBUSSNameBF") + this.form.LSBBBUSS = sessionStorage.getItem("LSBBBUSSBF") + this.form.LSBBBUSSName = sessionStorage.getItem("LSBBBUSSNameBF") + this.FBGBUSSFileList=this.assemble(sessionStorage.getItem("FBGBUSSBF"),sessionStorage.getItem("FBGBUSSNameBF")); + this.LSBBBUSSFileList=this.assemble(sessionStorage.getItem("LSBBBUSSBF"),sessionStorage.getItem("LSBBBUSSNameBF")); + this.formKey++ }, e => { }) } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue index d42202666..c40eb8105 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue @@ -23,6 +23,7 @@ :FBGBUSSFileList = "FBGBUSSFileList" :LSBBBUSSFileList = "LSBBBUSSFileList" :BZSMBUSSFileList = "BZSMBUSSFileList" + :XGDFileList = "XGDFileList" :QTWJBUSSFileList = "QTWJBUSSFileList" :GLWJBUSSFileList = "GLWJBUSSFileList" :disabledState = "disabledState" @@ -654,6 +655,7 @@ LSBBBUSSFileList: [], QTWJBUSSFileList: [], GLWJBUSSFileList: [], + XGDFileList: [], caFileList: [], FBGBJBDFileList: [], xgdFileList: [], @@ -792,6 +794,9 @@ modelDataZrUserVerify:[], footFile:'', footFileName:'', + BARQ: '', + XGD: '', + XGDName: '', // 基础信息 country:[], // 基础信息 @@ -1239,6 +1244,7 @@ this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName); this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName); this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName); + this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName); this.roleForm = mes.roleForm this.commentText = mes.commentText }) @@ -1872,6 +1878,9 @@ this.footFileList = fileList this.uploadFileStatus = this.footFileList !== undefined ? (this.footFileList.length <= 0) : true break; + case 'XGD': + this.XGDFileList = fileList + break; default : ; } this.$message({ @@ -1910,6 +1919,9 @@ case 'footFile': this.fileList=this.footFileList break; + case 'XGD': + this.fileList=this.XGDFileList + break; default : ; } this.fileMadel = true; @@ -1933,6 +1945,9 @@ case 'GLWJBUSS': this.GLWJBUSSFileList = fileList break; + case 'XGD': + this.XGDFileList = fileList + break; case 'footFile': this.footFileList = fileList this.uploadFileStatus = this.footFileList !== undefined ? (this.footFileList.length <= 0) : true @@ -2132,6 +2147,9 @@ this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.response.data.id).join(",") this.form.GLWJBUSSName=this.GLWJBUSSFileList.map(item => item.name).join(",") + this.form.XGD=this.XGDileList.map(item => item.response.data.id).join(",") + this.form.XGDName=this.XGDileList.map(item => item.name).join(",") + }, // 删除方法 deletedId(data, ids) { @@ -2353,6 +2371,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.XGDileList=this.assemble(processForm.XGD,processForm.XGDName); this.uploadFileStatus = this.footFileList !== undefined ? (this.footFileList.length <= 0) : true } }).catch(e => { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue index c41c7c798..abed1f0c3 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue @@ -26,6 +26,7 @@ :BZSMBUSSFileListSub = "BZSMBUSSFileList" :QTWJBUSSFileListSub = "QTWJBUSSFileList" :GLWJBUSSFileListSub = "GLWJBUSSFileList" + :XGDFileListSub = "XGDFileList" :disabledState = "disabledState" :verifySarStandard = "verifySarStandard" :fileMadelSub = "fileMadel" @@ -715,9 +716,9 @@ LSBBBUSSFileList: [], QTWJBUSSFileList: [], GLWJBUSSFileList: [], + XGDFileList: [], caFileList: [], FBGBJBDFileList: [], - xgdFileList: [], ZCWBLAWSFileList: [], GCWBLAWSFileList: [], JDWJLAWSFileList: [], @@ -856,6 +857,9 @@ modelDataZrUserVerify:[], footFile:'', footFileName:'', + BARQ: '', + XGD: '', + XGDName: '', // 基础信息 country:[], // 基础信息 @@ -1129,11 +1133,11 @@ this.replaceLawType = replaceLawType this.getReplaceLawsNumRow() }, - formCancel (form, list1,list2,list3,list4,list5,fileMadel,fileList,fileType) { + formCancel (form, list1,list2,list3,list4,list5,fileMadel,fileList,fileType,list6) { this.form = form this.FBGBUSSFileList = list1 this.LSBBBUSSFileList = list2 - this.BZSMBUSSFileList = list3 + this.XGDFileList = list3 this.QTWJBUSSFileList = list4 this.GLWJBUSSFileList = list5 if(fileMadel){ @@ -1360,6 +1364,7 @@ this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName); this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName); this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName); + this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName); this.roleForm = mes.roleForm this.commentText = mes.commentText this.formKey++ @@ -1385,6 +1390,9 @@ standEnName: data.standEnName ? data.standEnName : '', // 英文名称 standName: data.standName ? data.standName : '', // 中文名称 signFlag: data.signFlag ? data.signFlag : '1', // 是否需要会签 + BARQ: '', + XGD: '', + XGDName: '', // 基础信息 standCode: '', standYear: '', @@ -2028,6 +2036,10 @@ this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined); this.GLWJBUSSFileList.push(fileObj) break; + case 'XGD': + this.XGDFileList = this.XGDFileList.filter ( item => item.response === undefined); + this.XGDFileList.push(fileObj) + break; default : ; } this.formKey++ @@ -2064,6 +2076,9 @@ case 'GLWJBUSS': this.fileList=this.GLWJBUSSFileList break; + case 'XGD': + this.fileList=this.XGDFileList + break; default : ; } this.fileMadel = true; @@ -2088,6 +2103,9 @@ case 'GLWJBUSS': this.GLWJBUSSFileList = fileList break; + case 'XGD': + this.XGDFileList = fileList + break; default : ; } this.formKey++ @@ -2279,6 +2297,9 @@ this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.id).join(",") this.form.GLWJBUSSName=this.GLWJBUSSFileList.map(item => item.name).join(",") + this.form.XGD=this.XGDFileList.map(item => item.id).join(",") + this.form.XGDName=this.XGDFileList.map(item => item.name).join(",") + }, // 删除方法 deletedId(data, ids) { @@ -2487,9 +2508,9 @@ this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName); this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName); this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName); - console.log(this.LSBBBUSSFileList) this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName); this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName); + this.XGDFileList=this.assemble(processForm.XGD,processForm.XGDName); this.formKey++ } }).catch(e => { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue index b626ad27e..64a7b6a6b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue @@ -23,6 +23,7 @@ :FBGBUSSFileList = "FBGBUSSFileList" :LSBBBUSSFileList = "LSBBBUSSFileList" :BZSMBUSSFileList = "BZSMBUSSFileList" + :XGDFileList = "XGDFileList" :QTWJBUSSFileList = "QTWJBUSSFileList" :GLWJBUSSFileList = "GLWJBUSSFileList" :disabledState = "disabledState" @@ -651,6 +652,7 @@ fileList: [], FBGBUSSFileList: [], BZSMBUSSFileList: [], + XGDFileList: [], LSBBBUSSFileList: [], QTWJBUSSFileList: [], GLWJBUSSFileList: [], @@ -796,6 +798,9 @@ standCode: '', standYear: '', standName: '', + BARQ: '', + XGD: '', + XGDName: '', standEnName: '', textStatusBuss: '', issueTime: '', @@ -2304,6 +2309,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.XGDFileList=this.assemble(processForm.XGD,processForm.XGDName); } }).catch(e => { }) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue index 5804be5bb..9eb9167e8 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue @@ -24,6 +24,7 @@ :FBGBUSSFileList = "FBGBUSSFileList" :LSBBBUSSFileList = "LSBBBUSSFileList" :BZSMBUSSFileList = "BZSMBUSSFileList" + :XGDFileList = "XGDFileList" :QTWJBUSSFileList = "QTWJBUSSFileList" :GLWJBUSSFileList = "GLWJBUSSFileList" :disabledState = "disabledState" @@ -748,6 +749,7 @@ summaryList: [], FBGBUSSFileList: [], BZSMBUSSFileList: [], + XGDFileList: [], LSBBBUSSFileList: [], QTWJBUSSFileList: [], GLWJBUSSFileList: [], @@ -890,6 +892,9 @@ modelData:[], modelDataNameVerify:[], modelDataZrUserVerify:[], + BARQ: '', + XGD: '', + XGDName: '', // 基础信息 country:[], // 基础信息 @@ -2591,6 +2596,7 @@ this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName); this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName); this.summaryList=this.assemble(processForm.summary,processForm.summaryName); + this.XGDFileList=this.assemble(processForm.XGD,processForm.XGDName); } }).catch(e => { }) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue index 9c8c06545..3ebbf042d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue @@ -26,6 +26,7 @@ :BZSMBUSSFileListSub = "BZSMBUSSFileList" :QTWJBUSSFileListSub = "QTWJBUSSFileList" :GLWJBUSSFileListSub = "GLWJBUSSFileList" + :XGDFileListSub = "XGDFileList" :disabledState = "disabledState" :verifySarStandard = "verifySarStandard" :fileMadelSub = "fileMadel" @@ -785,9 +786,9 @@ LSBBBUSSFileList: [], QTWJBUSSFileList: [], GLWJBUSSFileList: [], + XGDFileList: [], caFileList: [], FBGBJBDFileList: [], - xgdFileList: [], ZCWBLAWSFileList: [], GCWBLAWSFileList: [], JDWJLAWSFileList: [], @@ -927,6 +928,9 @@ opinionsAdopted:'', // 汇总意见是否采纳 footFile:'', footFileName:'', + BARQ: '', + XGD: '', + XGDName: '', // 基础信息 country:[], // 基础信息 @@ -1091,7 +1095,8 @@ userType:'', // 选择用户ID判断 opinionsAdoptedOptions:[ {value: '1',label: '采纳'}, - {value: '2',label: '不采纳'}, + {value: '2',label: '部分采纳'}, + {value: '3',label: '不采纳'}, ], countryOptions:[],//国家地区 standSortOptions: [], // 标准类别 @@ -1223,7 +1228,7 @@ this.form = form this.FBGBUSSFileList = list1 this.LSBBBUSSFileList = list2 - this.BZSMBUSSFileList = list3 + this.XGDFileList = list3 this.QTWJBUSSFileList = list4 this.GLWJBUSSFileList = list5 if(fileMadel){ @@ -1450,6 +1455,7 @@ this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName); this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName); this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName); + this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName); this.roleForm = mes.roleForm this.commentText = mes.commentText this.formKey++ @@ -1475,6 +1481,9 @@ standEnName: data.standEnName ? data.standEnName : '', // 英文名称 standName: data.standName ? data.standName : '', // 中文名称 signFlag: data.signFlag ? data.signFlag : '1', // 是否需要会签 + BARQ: '', + XGD: '', + XGDName: '', // 基础信息 standCode: '', standYear: '', @@ -2118,6 +2127,10 @@ this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined); this.GLWJBUSSFileList.push(fileObj) break; + case 'XGD': + this.XGDFileList = this.XGDFileList.filter ( item => item.response === undefined); + this.XGDFileList.push(fileObj) + break; default : ; } this.formKey++ @@ -2154,6 +2167,9 @@ case 'GLWJBUSS': this.fileList=this.GLWJBUSSFileList break; + case 'XGDFileList': + this.fileList=this.XGDFileList + break; default : ; } this.fileMadel = true; @@ -2178,6 +2194,9 @@ case 'GLWJBUSS': this.GLWJBUSSFileList = fileList break; + case 'XGD': + this.XGDFileList = fileList + break; default : ; } this.formKey++ @@ -2353,7 +2372,6 @@ fileInfoHandle(){ //拼接文件名和id 提交到流程Activity - console.log(this.FBGBUSSFileList) this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.id).join(",") this.form.FBGBUSSName=this.FBGBUSSFileList.map(item => item.name).join(",") @@ -2369,6 +2387,9 @@ this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.id).join(",") this.form.GLWJBUSSName=this.GLWJBUSSFileList.map(item => item.name).join(",") + this.form.XGD=this.XGDFileList.map(item => item.id).join(",") + this.form.XGDName=this.XGDFileList.map(item => item.name).join(",") + }, // 删除方法 deletedId(data, ids) { @@ -2579,6 +2600,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.XGDFileList=this.assemble(processForm.XGD,processForm.XGDName); this.formKey++ } }).catch(e => { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue index 54bcc37df..ec35e00d2 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue @@ -25,6 +25,7 @@ :LSBBBUSSFileList = "LSBBBUSSFileList" :BZSMBUSSFileList = "BZSMBUSSFileList" :QTWJBUSSFileList = "QTWJBUSSFileList" + :XGDFileList = "XGDFileList" :GLWJBUSSFileList = "GLWJBUSSFileList" :disabledState = "disabledState" :verifySarStandard = "verifySarStandard" @@ -675,9 +676,9 @@ LSBBBUSSFileList: [], QTWJBUSSFileList: [], GLWJBUSSFileList: [], + XGDFileList: [], caFileList: [], FBGBJBDFileList: [], - xgdFileList: [], ZCWBLAWSFileList: [], GCWBLAWSFileList: [], JDWJLAWSFileList: [], @@ -811,71 +812,11 @@ modelData:[], modelDataNameVerify:[], modelDataZrUserVerify:[], + BARQ: '', + XGD: '', + XGDName: '', // 基础信息 country:[], - textStatus: '', // 文本状态 - standInData: '0', // 标准类型 - standNumber: '', // 标准编号 - standNature: '', // 标准性质 - signFlag: '1', // 是否需要会签 - standSystem: '',// 标准体系 - standSystemName: '',// 标准体系名称 - gxhbq: '', // 标签 - // 实施日期 - ssrq: '', // 实施日期(标准文本) - xcxssrq: '', // 新车型实施日期(标准文本) - zccssrq: '', // 在产车实施日期(标准文本) - ssrqgj: '', // 实施日期(国际) - xcxssrqgj: '', // 新车型实施日期(国际) - zccssrqgj: '', // 在产车实施日期(国际) - // 文本信息 - ca: '', // 草案 - FBGBJBD: '', // 发布稿 - xgd: '', // 修改单 - bpg: '', // 报批稿 - ssg: '', // 送审稿 - zqyjg: '', // 征求意见稿 - jdwj: '', // 解读文件 - zbjbd: '', // 增补件 - kwj: '', // 勘 误件 - caName: '', // 草案 - fbgbjbdName: '', // 发布稿 - xgdName: '', // 修改单 - bpgName: '', // 报批稿 - ssgName: '', // 送审稿 - zqyjgName: '', // 征求意见稿 - jdwjName: '', // 解读文件 - zbjbdName: '', // 增补件 - kwjName: '', // 勘误件 - glwjName: '', // 关联文件 - // 适用范围 - txlb: '', // 体系类别 - gkdw: '', // 归口管理部门 - qcdw: [], // 起草单位 - wssmr: [], // 我司署名人 - cysd: '', // 我司参与深度 - cllx: [], // 适用车型 - nylx: [],// 能源类型 - sycpx: [],// 适用产品线 - syrz: [], // 适用认证 - zrbm: [], // 责任部门 - zrgcs: [], // 责任工程师 - cycvppsbm: '', // 关联模块--乘用车VPPS编码 - cycvppscn: '', // 关联模块--乘用车vpps中文名称 - kccvppsbm: '', // 关联模块--卡车VPPS编码 - kccvppscn: '', // 关联模块--卡车vpps中文名称 - dybxh: '', // 模块结构单元变型号 - dymc: '', // 模块结构单元名称 - // 关联信息 - dtbjh: '', // 代替标准号 - cbbh: '', // 采标编号 - cbcd: '', // 采标程度 - yybj: '', // 引用标准 - bfbdtbzh: '', // 部分代替标准号 - byybj: '', // 被引用标准 - glwj: '', // 关联文件 - xglc: '', // 相关流程 - chjl: '', // 参会记录 // 基础信息 standSort: '', standCode: '', @@ -1407,6 +1348,7 @@ this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName); this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName); this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName); + this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName); this.roleForm = mes.roleForm this.commentText = mes.commentText }) @@ -2492,6 +2434,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.XGDFileList=this.assemble(processForm.XGD,processForm.XGDName); } }).catch(e => { }) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue index 3981fc135..82203ec5a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue @@ -25,8 +25,11 @@ :BZSMBUSSFileList = "BZSMBUSSFileList" :QTWJBUSSFileList = "QTWJBUSSFileList" :GLWJBUSSFileList = "GLWJBUSSFileList" + :XGDFileList = "XGDFileList" :disabledState = "disabledState" - :verifySarStandard = "verifySarStandard"> + :verifySarStandard = "verifySarStandard" + :opinionsShow = "true" + >
@@ -654,9 +657,9 @@ LSBBBUSSFileList: [], QTWJBUSSFileList: [], GLWJBUSSFileList: [], + XGDFileList: [], caFileList: [], FBGBJBDFileList: [], - xgdFileList: [], ZCWBLAWSFileList: [], GCWBLAWSFileList: [], JDWJLAWSFileList: [], @@ -789,6 +792,9 @@ modelData:[], modelDataNameVerify:[], modelDataZrUserVerify:[], + BARQ: '', + XGD: '', + XGDName: '', // 基础信息 country:[], // 基础信息 @@ -2304,6 +2310,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.XGDFileList=this.assemble(processForm.XGD,processForm.XGDName); } }).catch(e => { }) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue index 494f38bce..e99b37e15 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue @@ -25,8 +25,11 @@ :BZSMBUSSFileList = "BZSMBUSSFileList" :QTWJBUSSFileList = "QTWJBUSSFileList" :GLWJBUSSFileList = "GLWJBUSSFileList" + :XGDFileList = "XGDFileList" :disabledState = "disabledState" - :verifySarStandard = "verifySarStandard"> + :verifySarStandard = "verifySarStandard" + :opinionsShow = "true" + >
@@ -654,9 +657,9 @@ LSBBBUSSFileList: [], QTWJBUSSFileList: [], GLWJBUSSFileList: [], + XGDFileList: [], caFileList: [], FBGBJBDFileList: [], - xgdFileList: [], ZCWBLAWSFileList: [], GCWBLAWSFileList: [], JDWJLAWSFileList: [], @@ -789,6 +792,9 @@ modelData:[], modelDataNameVerify:[], modelDataZrUserVerify:[], + BARQ: '', + XGD: '', + XGDName: '', // 基础信息 country:[], // 基础信息 @@ -2304,6 +2310,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.XGDFileList=this.assemble(processForm.XGD,processForm.XGDName); } }).catch(e => { }) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue index 8b9b3e2bb..f32974cd6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue @@ -26,6 +26,7 @@ :BZSMBUSSFileListSub = "BZSMBUSSFileList" :QTWJBUSSFileListSub = "QTWJBUSSFileList" :GLWJBUSSFileListSub = "GLWJBUSSFileList" + :XGDFileListSub = "XGDFileList" :disabledState = "disabledState" :verifySarStandard = "verifySarStandard" :fileMadelSub = "fileMadel" @@ -600,6 +601,7 @@ 0){ + const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",") + const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",") + this.form.QCDWID = institutionIdList + this.form.QCDW = institutionNameList + } }, checkedRole (data) { if (this.type === 0) { @@ -1352,6 +1365,7 @@ this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName); this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName); this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName); + this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName); this.roleForm = mes.roleForm this.commentText = mes.commentText this.formKey++ @@ -1377,6 +1391,9 @@ standEnName: data.standEnName ? data.standEnName : '', // 英文名称 standName: data.standName ? data.standName : '', // 中文名称 signFlag: data.signFlag ? data.signFlag : '1', // 是否需要会签 + BARQ: '', + XGD: '', + XGDName: '', // 基础信息 standCode: '', standYear: '', @@ -1922,11 +1939,11 @@ var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined && item.raw === undefined); - if(this.fileType === 'FBGBUSS' && this.FBGBUSSFileList && this.FBGBUSSFileList.length === 1){ - this.$message.error('文件限制只可上传一个') - return false - } + // this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined && item.raw === undefined); + // if(this.fileType === 'FBGBUSS' && this.FBGBUSSFileList && this.FBGBUSSFileList.length === 1){ + // this.$message.error('文件限制只可上传一个') + // return false + // } if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { return true } else { @@ -2020,6 +2037,10 @@ this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined); this.GLWJBUSSFileList.push(fileObj) break; + case 'XGD': + this.XGDFileList = this.XGDFileList.filter ( item => item.response === undefined); + this.XGDFileList.push(fileObj) + break; default : ; } this.formKey++ @@ -2056,6 +2077,9 @@ case 'GLWJBUSS': this.fileList=this.GLWJBUSSFileList break; + case 'XGD': + this.fileList=this.XGDFileList + break; default : ; } this.fileMadel = true; @@ -2080,6 +2104,9 @@ case 'GLWJBUSS': this.GLWJBUSSFileList = fileList break; + case 'XGD': + this.XGDFileList = fileList + break; default : ; } this.formKey++ @@ -2271,6 +2298,9 @@ this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.id).join(",") this.form.GLWJBUSSName=this.GLWJBUSSFileList.map(item => item.name).join(",") + this.form.XGD=this.XGDFileList.map(item => item.id).join(",") + this.form.XGDName=this.XGDFileList.map(item => item.name).join(",") + }, // 删除方法 deletedId(data, ids) { @@ -2479,9 +2509,9 @@ this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName); this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName); this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName); - console.log(this.LSBBBUSSFileList) this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName); this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName); + this.XGDFileList=this.assemble(processForm.XGD,processForm.XGDName); this.formKey++ } }).catch(e => { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue index 6a16ef192..2100bc043 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue @@ -26,6 +26,7 @@ :BZSMBUSSFileListSub = "BZSMBUSSFileList" :QTWJBUSSFileListSub = "QTWJBUSSFileList" :GLWJBUSSFileListSub = "GLWJBUSSFileList" + :XGDFileListSub = "XGDFileList" :disabledState = "disabledState" :verifySarStandard = "verifySarStandard" :fileMadelSub = "fileMadel" @@ -34,6 +35,10 @@ @formSelectLawsCancel = "formSelectLawsCancel" @formChoiceZRRListCancel = "formChoiceZRRListCancel" @formChoiceQCDW = "formChoiceQCDW" + @formChoiceZRR1 = "formChoiceZRR1" + @formChoiceZRR2 = "formChoiceZRR2" + @formChoiceZRR3 = "formChoiceZRR3" + @formChoiceZRR4 = "formChoiceZRR4" /> @@ -46,67 +51,112 @@ style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:auto;border-bottom: 1px solid #EBEEF5;" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" - @selection-change="handleSelectionChange" row-key="id" :data="form.infoList" border default-expand-all> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + @@ -621,6 +671,7 @@ 0){ + const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",") + const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",") + this.form.QCDWID = institutionIdList + this.form.QCDW = institutionNameList + } }, checkedRole (data) { if (this.type === 0) { @@ -1381,6 +1454,7 @@ this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName); this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName); this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName); + this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName); this.roleForm = mes.roleForm this.commentText = mes.commentText this.formKey++ @@ -1406,6 +1480,9 @@ standEnName: data.standEnName ? data.standEnName : '', // 英文名称 standName: data.standName ? data.standName : '', // 中文名称 signFlag: data.signFlag ? data.signFlag : '1', // 是否需要会签 + BARQ: '', + XGD: '', + XGDName: '', // 基础信息 standCode: '', standYear: '', @@ -1951,11 +2028,11 @@ var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined && item.raw === undefined); - if(this.fileType === 'FBGBUSS' && this.FBGBUSSFileList && this.FBGBUSSFileList.length === 1){ - this.$message.error('文件限制只可上传一个') - return false - } + // this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined && item.raw === undefined); + // if(this.fileType === 'FBGBUSS' && this.FBGBUSSFileList && this.FBGBUSSFileList.length === 1){ + // this.$message.error('文件限制只可上传一个') + // return false + // } if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { return true } else { @@ -2049,6 +2126,10 @@ this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined); this.GLWJBUSSFileList.push(fileObj) break; + case 'XGD': + this.XGDFileList = this.XGDFileList.filter ( item => item.response === undefined); + this.XGDFileList.push(fileObj) + break; default : ; } this.formKey++ @@ -2085,6 +2166,9 @@ case 'GLWJBUSS': this.fileList=this.GLWJBUSSFileList break; + case 'XGDFileList': + this.fileList=this.XGDFileList + break; default : ; } this.fileMadel = true; @@ -2109,6 +2193,9 @@ case 'GLWJBUSS': this.GLWJBUSSFileList = fileList break; + case 'XGD': + this.XGDFileList = fileList + break; default : ; } this.formKey++ @@ -2284,7 +2371,6 @@ fileInfoHandle(){ //拼接文件名和id 提交到流程Activity - console.log(this.FBGBUSSFileList) this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.id).join(",") this.form.FBGBUSSName=this.FBGBUSSFileList.map(item => item.name).join(",") @@ -2300,6 +2386,9 @@ this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.id).join(",") this.form.GLWJBUSSName=this.GLWJBUSSFileList.map(item => item.name).join(",") + this.form.XGD=this.XGDFileList.map(item => item.id).join(",") + this.form.XGDName=this.XGDFileList.map(item => item.name).join(",") + }, // 删除方法 deletedId(data, ids) { @@ -2508,9 +2597,9 @@ this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName); this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName); this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName); - console.log(this.LSBBBUSSFileList) this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName); this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName); + this.XGDFileList=this.assemble(processForm.XGD,processForm.XGDName); this.formKey++ } }).catch(e => { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue index 585acfb85..ed9c5730a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue @@ -327,7 +327,10 @@
- +