From 332bdbf8389ab360f9dec14a30b32c9ff19ebece Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Tue, 5 Jul 2022 10:46:24 +0800 Subject: [PATCH 1/3] 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 2/3] =?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 3/3] =?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() {