diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index c79a9f4a8..f21e9e5c1 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -2384,6 +2384,9 @@ export default { case 'glwj': this.glwjFileList = fileList break; + case 'zbjbd': + this.zbjbdFileList = fileList + break; default : } // console.log("caNmae",this.form.caName); diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue index 202082132..ba033a478 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -82,7 +82,7 @@ - + { const obj = res.data @@ -2062,11 +2061,11 @@ this.QTWJBUSSFileList=[] this.GLWJBUSSFileList=[] this.XGDFileList=[] + let standStatus = this.form.standStatus const json = Object.assign(bringData, bringData.attrInfoMap); this.form = JSON.parse(JSON.stringify(json)) this.form.prcNum = this.prcNum this.form.prcName = this.prcName - this.form.standStatus = "3" this.form.QCRBUSSID = '' this.form.standNum ='' this.form.planId='' @@ -2089,7 +2088,21 @@ this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName); this.standardDrawer = false this.verifySarStandard = true - this.getStandInfoByReviseStatus('dr') + if(standStatus && standStatus === '2'){ + let date = new Date(); + let year = date.getFullYear(); + this.form.standStatus = "2" + this.form.standNum = this.form.standNumber + 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.getStandInfoByReviseStatus() + }else { + this.form.standStatus = "3" + this.getStandInfoByReviseStatus('dr') + } + console.log(this.form) this.$forceUpdate() } // 遍历对象初始化文件信息 @@ -2208,7 +2221,11 @@ }, getDomesticStandardTable () { this.loadSarStandard = true - this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.standardSearchForm, {}, res => { + console.log(this.standardSearchForm) + this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.standardSearchForm, { + _this: this, + loading: 'replaceLoading' + }, res => { this.loadSarStandard = false if (res.ok) { this.tableData.standardData = res.data.list @@ -2514,13 +2531,6 @@ this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',') }else if(this.replaceLawType === 'BDTQBBHBUSS'){ this.form.BDTQBBHBUSS = this.filterSetData(textArr.join(',')) - this.form.standNum = this.filterSetData(textArr2.join(',')) - if(this.form.BDTQBBHBUSS !== undefined && this.form.BDTQBBHBUSS !== 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 ) - } }else { this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',') } @@ -2927,12 +2937,8 @@ // test this.isSubmit = false this.saveLoading = false - if((this.form.standStatus === '2') && (this.form.BDTQBBHBUSS === undefined || this.form.BDTQBBHBUSS === '')) { - this.$message.warning("请选择一条被代替企标编号") - return - } - if((this.form.standStatus === '3') && (this.standardCheckedList === undefined ||this.standardCheckedList.length === 0)) { + if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.standardCheckedList === undefined ||this.standardCheckedList.length === 0)) { this.$message.warning("请选择一条企标标准") return } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue index 3563153bd..cd5cdad18 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -1085,13 +1085,6 @@ } } }, - 'form.standSort': { - handler (val) { - if (val !== '' && val !== null && typeof (val) !== 'undefined') { - this.getStandInfoByReviseStatus("") - } - } - }, filterText(val) { this.$refs.tree.filter(val); }, @@ -2459,6 +2452,8 @@ this.form.commentText = this.formTongGuo.commentText this.form.approvalOpinion = this.formTongGuo.approvalOpinion this.form.topId = this.pId + this.form.reviseStatus = 'buss2_'+this.form.standStatus + this.form.textStatusBuss = '6jnqba2mby' const json = JSON.stringify(this.form); this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, @@ -2612,7 +2607,7 @@ } }, regDate(data){ - if(this.form.DTQBBHBUSS !== undefined && this.form.DTQBBHBUSS !== null && this.form.DTQBBHBUSS.indexOf(data) !== -1){ + if(this.form.standCode !== undefined && this.form.standCode !== null && this.form.standCode.indexOf(data) !== -1){ data = data + ' X' } return data @@ -2623,16 +2618,10 @@ if(this.form.standStatus === '2'){ this.form.id = "" this.formKey++ - if((this.form.standStatus === '2') && (this.form.BDTQBBHBUSS === undefined || this.form.BDTQBBHBUSS === '')) { - 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.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 === '1' ){ this.form.id = "" @@ -2640,7 +2629,7 @@ this.isSubmit = true this.saveLoading = true } - this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1'}, { + this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1',standSort:this.form.standSort}, { _this: this }, res => { const obj = res.data @@ -2649,6 +2638,7 @@ this.form.standNumber = standSn this.form.standYear = year // 待带入立项标准 this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + console.log(this.form) if(type === '1'){ this.isSubmit = false this.saveLoading = false diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue index 442b23596..d978da12a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue @@ -1137,16 +1137,10 @@ if(this.form.standStatus === '2'){ this.form.id = "" this.formKey++ - if((this.form.standStatus === '2') && (this.form.BDTQBBHBUSS === undefined || this.form.BDTQBBHBUSS === '')) { - 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.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 === '1' ){ this.form.id = "" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue index c2eb0f80c..8a5f6397d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue @@ -1216,16 +1216,10 @@ if(this.form.standStatus === '2'){ this.form.id = "" this.formKey++ - if((this.form.standStatus === '2') && (this.form.BDTQBBHBUSS === undefined || this.form.BDTQBBHBUSS === '')) { - 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.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 === '1' ){ this.form.id = "" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue index 105f9373d..cff34d637 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue @@ -1137,16 +1137,10 @@ if(this.form.standStatus === '2'){ this.form.id = "" this.formKey++ - if((this.form.standStatus === '2') && (this.form.BDTQBBHBUSS === undefined || this.form.BDTQBBHBUSS === '')) { - 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.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 === '1' ){ this.form.id = "" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue index 9d39ed11d..8fd1fb3e3 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue @@ -1226,16 +1226,10 @@ if(this.form.standStatus === '2'){ this.form.id = "" this.formKey++ - if((this.form.standStatus === '2') && (this.form.BDTQBBHBUSS === undefined || this.form.BDTQBBHBUSS === '')) { - 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.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 === '1' ){ this.form.id = "" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue index 018bb827c..1297948fb 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue @@ -2486,6 +2486,8 @@ this.form.commentText = this.formTongGuo.commentText this.form.approvalOpinion = this.formTongGuo.approvalOpinion this.form.topId = this.pId + this.form.reviseStatus = 'buss1_'+this.form.reviseStatus + this.form.textStatusBuss = '6jnqba2mby' const json = JSON.stringify(this.form); this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, @@ -2701,11 +2703,11 @@ this.form.standYear = this.regDate(year) this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) }else { - this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss1_'+this.form.reviseStatus}, { + this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss1_'+this.form.reviseStatus,standSort:this.form.standSort}, { _this: this }, res => { const obj = res.data - let standSn = (obj === null || obj.newStandSn === null) ? '001' : obj.newStandSn + let standSn = (obj === null || obj.newStandSn === null) ? '2280' : obj.newStandSn this.form.standSn = standSn this.form.standNumber = standSn this.form.standYear = this.regDate(year) // 待带入立项标准 diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 6390bcbd7..174930b93 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -420,6 +420,25 @@ + + + + @@ -1190,6 +1209,16 @@ + + + + +