From 7a7d7070c4273b371e7cbde0476d47051383d995 Mon Sep 17 00:00:00 2001 From: hanshaozhuang Date: Tue, 5 Jul 2022 11:25:32 +0800 Subject: [PATCH 1/4] =?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 2/4] =?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() + } + }) } }; From 7d2ab53ed79eae3982a010fa522415581dc6c912 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 5 Jul 2022 14:48:15 +0800 Subject: [PATCH 3/4] bug 55871 --- .../components/EnterpriseStandardDatabase.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index b40c6297f..7213c5115 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -3945,7 +3945,7 @@ export default { if (nowstandinfo.firstPutTime != null && nowstandinfo.firstPutTime !== '') { nowstandinfo.firstPutTime = this.$dateFormat(this.sarBussionessStandEO.firstPutTime, 'yyyy-MM-dd hh:mm:ss') } - nowstandinfo.standCode = nowstandinfo.standSort + nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear) + nowstandinfo.standCode = nowstandinfo.standSort+" "+ nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear) this.$http.postData('lawss/sarBussionessStand/updateSarBussionessStand', nowstandinfo, { _this: this, loading: 'isSubmit' From efd3c9c66528b0cd0c93d5c1c5bb45715046b165 Mon Sep 17 00:00:00 2001 From: zhaoxianhui <1994861028@qq.com> Date: Tue, 5 Jul 2022 15:13:58 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=20=E6=9C=BA=E6=9E=84=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=EF=BC=8C=E6=96=B0=E5=A2=9E/?= =?UTF-8?q?=E7=BC=96=E8=BE=91=EF=BC=8C=E5=B7=A5=E4=BD=9C=E7=BB=84=E7=BB=84?= =?UTF-8?q?=E9=95=BF=E5=92=8C=E5=B7=A5=E4=BD=9C=E7=BB=84=E7=BB=84=E5=91=98?= =?UTF-8?q?=E7=9A=84=E6=8A=BD=E5=B1=89=EF=BC=8C=E7=BC=BA=E5=B0=91=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8C=89=E9=92=AEBUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/workTree/index.vue | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/src/components/workTree/index.vue b/src/components/workTree/index.vue index d93320d38..2b905e5a4 100644 --- a/src/components/workTree/index.vue +++ b/src/components/workTree/index.vue @@ -12,14 +12,23 @@ :inline="true" @submit.native.prevent > - + - - + + + + 查询 + + + + + 清空 + + +