From db34dcd7911caf17ad694ccac9175c178ae5bf39 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Wed, 1 Sep 2021 16:45:21 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=A4=9A=E4=B8=AA?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=88=96=E6=B8=85=E5=8D=95=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E4=BF=AE=E5=A4=8Dref=E7=9B=B8=E5=90=8C?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/xmpg2/step1.vue | 6 +++--- .../pages/creatProcess/xmqdqr/step1-1.vue | 12 ++++++------ .../pages/creatProcess/xmqdqr/step1.vue | 12 ++++++------ 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue index 78963c902..bff12a826 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue @@ -305,7 +305,7 @@ :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" @selection-change="selectListChange" - ref="selection" + ref="listSelection" > 1) { - this.$refs.selection.clearSelection() - this.$refs.selection.toggleRowSelection(data.pop()) + this.$refs.listSelection.clearSelection() + this.$refs.listSelection.toggleRowSelection(data.pop()) } this.multipleSelection = data diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue index 3c394b217..70a72333c 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue @@ -179,7 +179,7 @@ :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" @selection-change="selectProjectChange" - ref="selection" + ref="projectSelection" > 1) { - this.$refs.selection.clearSelection() - this.$refs.selection.toggleRowSelection(data.pop()) + this.$refs.listSelection.clearSelection() + this.$refs.listSelection.toggleRowSelection(data.pop()) } this.multipleSelection = data @@ -605,8 +605,8 @@ export default { selectProjectChange(data) { // 单选 if (data.length > 1) { - this.$refs.selection.clearSelection() - this.$refs.selection.toggleRowSelection(data.pop()) + this.$refs.projectSelection.clearSelection() + this.$refs.projectSelection.toggleRowSelection(data.pop()) } this.multipleSelection = data diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue index 84e45ea32..72d440094 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue @@ -178,7 +178,7 @@ :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" @selection-change="selectProjectChange" - ref="selection" + ref="projectSelection" > 1) { - this.$refs.selection.clearSelection() - this.$refs.selection.toggleRowSelection(data.pop()) + this.$refs.listSelection.clearSelection() + this.$refs.listSelection.toggleRowSelection(data.pop()) } this.multipleSelection = data @@ -604,8 +604,8 @@ export default { selectProjectChange(data) { // 单选 if (data.length > 1) { - this.$refs.selection.clearSelection() - this.$refs.selection.toggleRowSelection(data.pop()) + this.$refs.projectSelection.clearSelection() + this.$refs.projectSelection.toggleRowSelection(data.pop()) } this.multipleSelection = data From 46afe87fea90ae1629acfa410e5650398fd33de8 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Thu, 2 Sep 2021 13:55:50 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=90=88=E8=A7=84=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C=20?= =?UTF-8?q?=E6=8A=80=E6=9C=AF=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C=20?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=20=E5=88=86=E9=A1=B5=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E5=8A=9F=E8=83=BDbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/technologyInvolveProject.vue | 11 ++++++++--- .../regulatoryRepository/partCodeApply/index.vue | 9 +++++++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue index 10d2c6945..b6edd4b70 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue @@ -138,7 +138,7 @@ class="common-button-primary" size="mini" v-btn-permission="'0bdf3aecef5161bb66256ebcbbd4bdaa'" - @click="querySarProStateZero">查询 + @click="querySarProStateZeroBtn">查询 + class="common-button-primary" @click="getTableByPageBtn"> 查询 @@ -203,6 +203,11 @@ export default { }) } }, + // 查询之后跳回第一页 + getTableByPageBtn(){ + this.pageNo = 1 + this.getTableByPage() + }, // 查询零部件table列表 getTableByPage() { this.tableLoading.loadData = true @@ -231,7 +236,7 @@ export default { //零件分类号 partCategoryCode: "" } - this.getTableByPage() + this.getTableByPageBtn() }, // 分页事件 pageChange(page) { From cbf2ebab7fa5174ce83bc97e4c7e83f839b286d8 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Thu, 2 Sep 2021 15:09:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=B8=AD=E5=BF=83=20?= =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95=E5=8F=91=E5=B8=83/?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=B5=81=E7=A8=8B=20=E7=AC=AC=E4=B8=80?= =?UTF-8?q?=E6=AD=A5=20=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=EF=BC=88+?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index a391d8d4e..f8f02eaf0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -563,7 +563,7 @@ class="common-button-primary" size="small" v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'" - @click="getStandData"> + @click="getStandDataBtn"> 查询 @@ -998,6 +998,10 @@ export default { }; this.getStandData(); }, + getStandDataBtn(){ + this.pageNo =1; + this.getStandData(); + }, //查询项目下的标准 getStandData() { this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {