From e9980a449520e16588442842c89f03811f6defff Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Sat, 2 Jul 2022 22:38:29 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20#55969?= =?UTF-8?q?=20=E4=BC=81=E6=A0=87=E9=A1=BA=E5=BA=8F=E5=8F=B7=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk-product/step1.vue | 34 +++++++++--------- .../creatProcess/qbrk-product/step13.vue | 31 ++++++++++++---- .../pages/creatProcess/qbrk-product/step3.vue | 33 ++++++++--------- .../pages/creatProcess/qbrk-product/step6.vue | 35 ++++++++++--------- .../creatProcess/qbrk-product/stepC3.vue | 33 ++++++++--------- .../creatProcess/qbrk-product/stepC6.vue | 33 ++++++++--------- .../pages/creatProcess/qbrk/step13.vue | 23 ++++++++---- .../pages/creatProcess/qbrk/stepC1.vue | 2 -- 8 files changed, 126 insertions(+), 98 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue index ab0ff19ee..f455f8e07 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -1626,23 +1626,23 @@ this.isSubmit = true this.saveLoading = true } - this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1',standSort:this.form.standSort}, { - _this: this - }, res => { - const obj = res.data - let standSn = (obj === null || obj.newStandSn === null) ? '2280' : obj.newStandSn - this.form.standSn = standSn - 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 = [] - if(this.form.standStatus === '1'){ - this.isSubmit = false - this.saveLoading = false - } - }, e => { - }) + // this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1',standSort:this.form.standSort}, { + // _this: this + // }, res => { + // const obj = res.data + // let standSn = (obj === null || obj.newStandSn === null) ? '2280' : obj.newStandSn + // this.form.standSn = standSn + // 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 = [] + // if(this.form.standStatus === '1'){ + // this.isSubmit = false + // this.saveLoading = false + // } + // }, e => { + // }) } }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue index 0e9745896..c68bfcd8e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -1050,6 +1050,13 @@ } }, watch:{ + 'form.standSort': { + handler (val) { + if (val !== '' && val !== null && typeof (val) !== 'undefined') { + this.getStandInfoByReviseStatus() + } + } + }, 'form.issueTime': { handler: function() { if(this.form.issueTime !== undefined && this.form.issueTime !== null && this.form.issueTime !== ''){ @@ -1063,7 +1070,7 @@ if (month.length == 1) { month = "0" + month; } - if (day.length == 1) { + if (day.length === 1) { day = "0" + day; } const FSRQBUSS = year + "-" + month + "-" + day; @@ -2608,13 +2615,23 @@ pId: this.pId }).then(res => { if (res) { - const processForm = JSON.parse(res.mesg) - if (processForm.form === undefined) { - this.getFormFieldList(processForm) - } else { - //表单文件处理 - this.getTaskId(processForm) + if(res.nowTaskInfo && res.nowTaskInfo === '发布') { + const processForm = JSON.parse(res.mesg) + if (processForm.form === undefined) { + this.getFormFieldList(processForm) + } else { + //表单文件处理 + this.getTaskId(processForm) + } + }else { + this.$alert('当前任务'+(res.nowTaskInfo ?res.nowTaskInfo:"")+'不是发布节点,禁止跨路由访问当前页面', '', { + confirmButtonText: '确定', + callback: action => { + this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + } + }); } + } }).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 afa08139b..734a8bd92 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue @@ -1149,22 +1149,23 @@ this.isSubmit = true this.saveLoading = true } - this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1'}, { - _this: this - }, res => { - const obj = res.data - let standSn = (obj === null || obj.newStandSn === null) ? '2280' : obj.newStandSn - this.form.standSn = standSn - this.form.standNumber = standSn - this.form.standYear = year // 待带入立项标准 - this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) - if(type === '1'){ - this.isSubmit = false - this.saveLoading = false - } - this.formKey++ - }, e => { - }) + this.formKey++ + // this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1'}, { + // _this: this + // }, res => { + // const obj = res.data + // let standSn = (obj === null || obj.newStandSn === null) ? '2280' : obj.newStandSn + // this.form.standSn = standSn + // this.form.standNumber = standSn + // this.form.standYear = year // 待带入立项标准 + // this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + // if(type === '1'){ + // this.isSubmit = false + // this.saveLoading = false + // } + // this.formKey++ + // }, e => { + // }) } }, checkedRoleTransfer (data) { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue index 6d08b7c77..8223f6587 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue @@ -1169,7 +1169,7 @@ let year = date.getFullYear()+5; let month =(date.getMonth() + 1).toString(); let day = (date.getDate()).toString(); - if (month.length == 1) { + if (month.length === 1) { month = "0" + month; } if (day.length == 1) { @@ -1227,22 +1227,23 @@ this.isSubmit = true this.saveLoading = true } - this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1'}, { - _this: this - }, res => { - const obj = res.data - let standSn = (obj === null || obj.newStandSn === null) ? '2280' : obj.newStandSn - this.form.standSn = standSn - this.form.standNumber = standSn - this.form.standYear = year // 待带入立项标准 - this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) - if(type === '1'){ - this.isSubmit = false - this.saveLoading = false - } - this.formKey++ - }, e => { - }) + this.formKey++ + // this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1'}, { + // _this: this + // }, res => { + // const obj = res.data + // let standSn = (obj === null || obj.newStandSn === null) ? '2280' : obj.newStandSn + // this.form.standSn = standSn + // this.form.standNumber = standSn + // this.form.standYear = year // 待带入立项标准 + // this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + // if(type === '1'){ + // this.isSubmit = false + // this.saveLoading = false + // } + // this.formKey++ + // }, e => { + // }) } }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue index 12889b35d..cb557e8e8 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue @@ -1149,22 +1149,23 @@ this.isSubmit = true this.saveLoading = true } - this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1'}, { - _this: this - }, res => { - const obj = res.data - let standSn = (obj === null || obj.newStandSn === null) ? '2280' : obj.newStandSn - this.form.standSn = standSn - this.form.standNumber = standSn - this.form.standYear = year // 待带入立项标准 - this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) - if(type === '1'){ - this.isSubmit = false - this.saveLoading = false - } - this.formKey++ - }, e => { - }) + this.formKey++ + // this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1'}, { + // _this: this + // }, res => { + // const obj = res.data + // let standSn = (obj === null || obj.newStandSn === null) ? '2280' : obj.newStandSn + // this.form.standSn = standSn + // this.form.standNumber = standSn + // this.form.standYear = year // 待带入立项标准 + // this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + // if(type === '1'){ + // this.isSubmit = false + // this.saveLoading = false + // } + // this.formKey++ + // }, e => { + // }) } }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue index 037674c80..81f0ab9e9 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue @@ -1237,22 +1237,23 @@ this.isSubmit = true this.saveLoading = true } - this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1'}, { - _this: this - }, res => { - const obj = res.data - let standSn = (obj === null || obj.newStandSn === null) ? '2280' : obj.newStandSn - this.form.standSn = standSn - this.form.standNumber = standSn - this.form.standYear = year // 待带入立项标准 - this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) - if(type === '1'){ - this.isSubmit = false - this.saveLoading = false - } - this.formKey++ - }, e => { - }) + this.formKey++ + // this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1'}, { + // _this: this + // }, res => { + // const obj = res.data + // let standSn = (obj === null || obj.newStandSn === null) ? '2280' : obj.newStandSn + // this.form.standSn = standSn + // this.form.standNumber = standSn + // this.form.standYear = year // 待带入立项标准 + // this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + // if(type === '1'){ + // this.isSubmit = false + // this.saveLoading = false + // } + // this.formKey++ + // }, e => { + // }) } }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue index b3ad5f10f..1bd81afde 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue @@ -1957,7 +1957,7 @@ if(this.replaceLawType === 'DTQBBHBUSS'){ let arr1 = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',') this.form.DTQBBHBUSS = this.filterSetData(arr1) - this.getStandInfoByReviseStatus() + // this.getStandInfoByReviseStatus() }else if(this.replaceLawType === 'CYBZ'){ let arr1 = this.form.CYBZ ? this.form.CYBZ + ',' +textArr.join(',') : textArr.join(',') this.form.CYBZ = this.filterSetData(arr1) @@ -2672,12 +2672,21 @@ pId: this.pId }).then(res => { if (res) { - const processForm = JSON.parse(res.mesg) - if (processForm.form === undefined) { - this.getFormFieldList(processForm) - } else { - //表单文件处理 - this.getTaskId(processForm) + if(res.nowTaskInfo && res.nowTaskInfo === '发布'){ + const processForm = JSON.parse(res.mesg) + if (processForm.form === undefined) { + this.getFormFieldList(processForm) + } else { + //表单文件处理 + this.getTaskId(processForm) + } + }else { + this.$alert('当前任务'+(res.nowTaskInfo ?res.nowTaskInfo:"")+'不是发布节点,禁止跨路由访问当前页面', '', { + confirmButtonText: '确定', + callback: action => { + this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + } + }); } } }).catch(e => { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue index f81cc7ba9..4779f4cc8 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue @@ -1702,7 +1702,6 @@ this.form.evaluationData = [] this.pid = this.form.topId this.evaluationHisListRep() - this.getStandInfoByReviseStatus() this.evaluationHisListRepSum() this.footFileList=this.assemble(this.form.footFile,this.form.footFileName); this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName); @@ -2825,7 +2824,6 @@ this.form['id'] = item.id this.form.evaluationData = [] this.evaluationHisListRep() - this.getStandInfoByReviseStatus() this.evaluationHisListRepSum() this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS']) this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])