From 44800de10765b3f322fe3b801a8256001237b010 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Tue, 5 Jul 2022 10:12:39 +0800 Subject: [PATCH 1/6] feat: There is no way the, --- .../pages/creatProcess/qbrk-product/step1.vue | 8 ++++---- .../pages/creatProcess/qbrk-product/step3.vue | 8 ++++---- .../pages/creatProcess/qbrk-product/step6.vue | 8 ++++---- .../pages/creatProcess/qbrk-product/stepC3.vue | 8 ++++---- .../pages/creatProcess/qbrk-product/stepC6.vue | 8 ++++---- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue index f455f8e07..71046c1a9 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -1622,10 +1622,10 @@ this.XGDFileList=[]; this.$refs['form'].resetFields() this.form.standStatus = '1' - if(this.form.standStatus === '1'){ - this.isSubmit = true - this.saveLoading = true - } + // if(this.form.standStatus === '1'){ + // this.isSubmit = true + // this.saveLoading = true + // } // this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1',standSort:this.form.standSort}, { // _this: this // }, res => { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue index 734a8bd92..5da69cd94 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue @@ -1145,10 +1145,10 @@ this.formKey++ }else if(this.form.standStatus === '1' ){ this.form.id = "" - if(type === '1'){ - this.isSubmit = true - this.saveLoading = true - } + // if(type === '1'){ + // this.isSubmit = true + // this.saveLoading = true + // } this.formKey++ // this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1'}, { // _this: this diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue index 8223f6587..09cfd4259 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue @@ -1223,10 +1223,10 @@ this.formKey++ }else if(this.form.standStatus === '1' ){ this.form.id = "" - if(type === '1'){ - this.isSubmit = true - this.saveLoading = true - } + // if(type === '1'){ + // this.isSubmit = true + // this.saveLoading = true + // } this.formKey++ // this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1'}, { // _this: this diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue index cb557e8e8..8cc1a431b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue @@ -1145,10 +1145,10 @@ this.formKey++ }else if(this.form.standStatus === '1' ){ this.form.id = "" - if(type === '1'){ - this.isSubmit = true - this.saveLoading = true - } + // if(type === '1'){ + // this.isSubmit = true + // this.saveLoading = true + // } this.formKey++ // this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1'}, { // _this: this diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue index 81f0ab9e9..6c6f6ede4 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue @@ -1233,10 +1233,10 @@ this.formKey++ }else if(this.form.standStatus === '1' ){ this.form.id = "" - if(type === '1'){ - this.isSubmit = true - this.saveLoading = true - } + // if(type === '1'){ + // this.isSubmit = true + // this.saveLoading = true + // } this.formKey++ // this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1'}, { // _this: this From 4c2237100f9fc49f428f6830c9ee4b51e7a17e04 Mon Sep 17 00:00:00 2001 From: zhaoxianhui <1994861028@qq.com> Date: Tue, 5 Jul 2022 10:20:53 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0-=E9=A1=B9=E7=9B=AE=EF=BC=8C=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=8F=91=E8=B5=B7=E7=95=8C=E9=9D=A2=EF=BC=8C=E5=B0=86?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BF=9D=E5=AD=98=E8=87=B3=E8=8D=89=E7=A8=BF?= =?UTF-8?q?=EF=BC=8C=E4=BB=8E=E8=8D=89=E7=A8=BF=E8=BF=9B=E5=85=A5=20?= =?UTF-8?q?=E5=88=86=E8=A7=A3=E5=8D=95=E6=9D=A5=E6=BA=90=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=8D=E5=AF=B9Bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg/step1.vue | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index 0d480d08c..2500eaffc 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -474,7 +474,12 @@ export default { saveLoading: false, fileType: '', bpnId: '', - decomposeOptions: [], //分解单来源数据 + decomposeOptions: [ + { + value: "BDR", + label: '不带入' + } + ], //分解单来源数据 //表单的数据 listForm: { projectNumber: "", //项目编号 @@ -571,16 +576,16 @@ export default { }); }, typeList(row){ - this.decomposeOptions = [] + // this.decomposeOptions = [] this.$http.get("SarStandItems/sar-stand-items/getFileType", { standId: row.standId }, {}, res => { - this.decomposeOptions.push( - { - value: 'BDR', - label: '不带入' - } - ) + // this.decomposeOptions.push( + // { + // value: "BDR", + // label: '不带入' + // } + // ) res.data.forEach(item => { this.decomposeOptions.push(item) }) From 332bdbf8389ab360f9dec14a30b32c9ff19ebece Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Tue, 5 Jul 2022 10:46:24 +0800 Subject: [PATCH 3/6] feat: There is no way the, bug #56317 --- .../processCenter/pages/creatProcess/qbrk-product/step1.vue | 1 - .../processCenter/pages/creatProcess/qbrk-product/step13.vue | 2 +- .../processCenter/pages/creatProcess/qbrk-product/step3.vue | 2 +- .../processCenter/pages/creatProcess/qbrk-product/step6.vue | 2 +- .../processCenter/pages/creatProcess/qbrk-product/stepC3.vue | 2 +- .../processCenter/pages/creatProcess/qbrk-product/stepC6.vue | 2 +- 6 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue index 71046c1a9..a231b62ae 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -1601,7 +1601,6 @@ this.FBGBUSSName = "" } this.LSBBBUSSFileList=this.LSBBBUSSFileList.concat(this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName)) - console.log(this.LSBBBUSSFileList) this.form.LSBBBUSS = this.form.FBGBUSS this.form.LSBBBUSSName = this.form.FBGBUSSName this.FBGBUSSFileList= [] diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue index 62ea27926..c796b2c89 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -2700,7 +2700,7 @@ this.formKey++ this.form.standSn = this.form.standNum this.form.standNumber = this.form.standNum - this.form.standYear = this.regDate(year) + this.form.standYear = year this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) this.formKey++ }else if(this.form.standStatus === '1' ){ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue index 5da69cd94..d41590bbb 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue @@ -1140,7 +1140,7 @@ this.formKey++ this.form.standSn = this.form.standNum this.form.standNumber = this.form.standNum - this.form.standYear = this.regDate(year) + this.form.standYear = year this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) this.formKey++ }else if(this.form.standStatus === '1' ){ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue index 09cfd4259..510af8659 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue @@ -1218,7 +1218,7 @@ this.formKey++ this.form.standSn = this.form.standNum this.form.standNumber = this.form.standNum - this.form.standYear = this.regDate(year) + this.form.standYear = this.year this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) this.formKey++ }else if(this.form.standStatus === '1' ){ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue index 8cc1a431b..769798cd3 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue @@ -1140,7 +1140,7 @@ this.formKey++ this.form.standSn = this.form.standNum this.form.standNumber = this.form.standNum - this.form.standYear = this.regDate(year) + this.form.standYear = year this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) this.formKey++ }else if(this.form.standStatus === '1' ){ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue index 6c6f6ede4..07ecfc7e9 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue @@ -1228,7 +1228,7 @@ this.formKey++ this.form.standSn = this.form.standNum this.form.standNumber = this.form.standNum - this.form.standYear = this.regDate(year) + this.form.standYear = year this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) this.formKey++ }else if(this.form.standStatus === '1' ){ From 2251eb47b7fd8811184e9d0f23a012908a7d95fd Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Tue, 5 Jul 2022 11:11:04 +0800 Subject: [PATCH 4/6] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=F0=9F=99=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk-product/step3.vue | 6 +++--- .../pages/creatProcess/qbrk-product/step6.vue | 8 ++++---- .../pages/creatProcess/qbrk-product/stepC3.vue | 6 +++--- .../pages/creatProcess/qbrk-product/stepC6.vue | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue index d41590bbb..3d682fa2b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue @@ -1005,9 +1005,9 @@ { required: true, message: '请输入企标编号', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, ], - standYear: [ - { required: true, message: '请输入标准年份'}, - ], + // standYear: [ + // { required: true, message: '请输入标准年份'}, + // ], standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue index 510af8659..363686aa1 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue @@ -1078,9 +1078,9 @@ { required: true, message: '请输入企标编号', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, ], - standYear: [ - { required: true, message: '请输入标准年份'}, - ], + // standYear: [ + // { required: true, message: '请输入标准年份'}, + // ], standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, @@ -1218,7 +1218,7 @@ this.formKey++ this.form.standSn = this.form.standNum this.form.standNumber = this.form.standNum - this.form.standYear = this.year + this.form.standYear = year this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) this.formKey++ }else if(this.form.standStatus === '1' ){ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue index 769798cd3..a70759985 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue @@ -1005,9 +1005,9 @@ { required: true, message: '请输入企标编号', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, ], - standYear: [ - { required: true, message: '请输入标准年份'}, - ], + // standYear: [ + // { required: true, message: '请输入标准年份'}, + // ], standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue index 07ecfc7e9..6075d172d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue @@ -1088,9 +1088,9 @@ { required: true, message: '请输入企标编号', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, ], - standYear: [ - { required: true, message: '请输入标准年份'}, - ], + // standYear: [ + // { required: true, message: '请输入标准年份'}, + // ], standName: [ { required: true, message: '请输入企标中文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, From 7a7d7070c4273b371e7cbde0476d47051383d995 Mon Sep 17 00:00:00 2001 From: hanshaozhuang Date: Tue, 5 Jul 2022 11:25:32 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2056037=20=E3=80=90WE?= =?UTF-8?q?LINK=E3=80=91=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82=E6=84=8F?= =?UTF-8?q?=E8=A7=81=E6=B5=81=E7=A8=8B=EF=BC=8C=E6=84=8F=E8=A7=81=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E8=8A=82=E7=82=B9=EF=BC=8C=E8=A1=A8=E6=A0=BC=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E5=AF=B9=E9=BD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/App.vue b/src/App.vue index 6f9e8d55e..0f854550a 100644 --- a/src/App.vue +++ b/src/App.vue @@ -92,7 +92,32 @@ export default { isBoolean: false } }, + created() { + let _this = this; + //窗口改变时 + window.onresize = function () { + _this.handleRefreshTable(); + }; + }, + updated() { + this.handleRefreshTable() + }, methods: { + handleRefreshTable() { + this.$nextTick(() => { + // 获取页面中已注册过ref的所有的子组件。 + let refList = this.$refs.appView.$refs; + if (refList) { + for (let i of Object.keys(refList)) { + // 根据doLayout方法判断子组件是不是el-table + if (refList[i] && refList[i].doLayout) { + // 执行doLayout方法 + refList[i].doLayout(); + } + } + } + }) + }, // 点击下拉选项事件 handleCommand(command) { // 退出登录 @@ -227,6 +252,8 @@ export default { } else { this.isBoolean = false } + //切换标签时 + this.handleRefreshTable(); } }, mounted() { From 0c86bdee23df89862c55bb5657e4d35c01b3d9a7 Mon Sep 17 00:00:00 2001 From: zhaoxianhui <1994861028@qq.com> Date: Tue, 5 Jul 2022 11:30:14 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0-=E9=A1=B9=E7=9B=AE=EF=BC=8C=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=8F=91=E8=B5=B7=E7=95=8C=E9=9D=A2=EF=BC=8C=E5=B0=86?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BF=9D=E5=AD=98=E8=87=B3=E8=8D=89=E7=A8=BF?= =?UTF-8?q?=EF=BC=8C=E4=BB=8E=E8=8D=89=E7=A8=BF=E8=BF=9B=E5=85=A5=20?= =?UTF-8?q?=E5=88=86=E8=A7=A3=E5=8D=95=E6=9D=A5=E6=BA=90=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=8D=E5=AF=B9Bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg/step1.vue | 65 ++++++++++--------- 1 file changed, 34 insertions(+), 31 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index 2500eaffc..7644a514c 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -235,6 +235,7 @@ @submit="handleSubmit" > + 数据获取中 { - // this.decomposeOptions.push( - // { - // value: "BDR", - // label: '不带入' - // } - // ) + this.decomposeOptions.push( + { + value: "BDR", + label: '不带入' + } + ) res.data.forEach(item => { this.decomposeOptions.push(item) }) @@ -951,15 +948,14 @@ export default { this.dataList = mes.form.dataList; this.roleForm = mes.roleForm; this.commentText = mes.commentText; + this.loading=false }); }, }, mounted() { + this.loading=true this.optionsChange() this.bpnId = this.$route.query.bpnId - if (this.bpnId !== undefined) { - this.getData() - } this.getProjectData(); // 查询各下拉框数据 this.$http.get("sys/dictype/getDicTypeListCode", "", { @@ -970,21 +966,28 @@ export default { }, e => { }); //查找分解单来源数据 - // this.$http.get('lawss/sarStandAttrDetails/getListData',{},{ - // _this: this - // }, res => { - // this.decomposeOptions.push( - // { - // attrField: 'BDR', - // attrName: '不带入' - // } - // ) - // res.data.forEach(item => { - // if(item.sarType === 'STAND' || item.sarType === 'INLAND_STAND' || item.sarType === 'FOREIGN_STAND'){ - // this.decomposeOptions.push(item) - // } - // }) - // }) + this.$http.get('lawss/sarStandAttrDetails/getListData',{},{ + _this: this + }, res => { + this.decomposeOptions.push( + { + value: 'BDR', + label: '不带入' + } + ) + res.data.forEach(item => { + if(item.sarType === 'STAND' || item.sarType === 'INLAND_STAND' || item.sarType === 'FOREIGN_STAND'){ + let itemTemp={ + value:item.attrField, + label:item.attrName + } + this.decomposeOptions.push(itemTemp) + } + }) + if (this.bpnId !== undefined) { + this.getData() + } + }) } };