From 001e266d2d6170e8a9bb563ea7a2e84b14187214 Mon Sep 17 00:00:00 2001
From: yaojn <everast@aliyun.com>
Date: Tue, 23 Jan 2024 11:42:00 +0800
Subject: [PATCH] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=B1=BB=E5=9E=8B=E7=AE=A1=E7=90=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD=E4=B8=8D=E7=94=9F?=
 =?UTF-8?q?=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../channeltype/channeltype-manage.vue        | 22 +++++++------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/views/pages/process/channeltype/channeltype-manage.vue b/src/views/pages/process/channeltype/channeltype-manage.vue
index 2b2e622c..3b6298b5 100644
--- a/src/views/pages/process/channeltype/channeltype-manage.vue
+++ b/src/views/pages/process/channeltype/channeltype-manage.vue
@@ -76,15 +76,11 @@ export default {
       },
       searchParam: {
         keyword: null,
-        isActive: null,
-        currentPage: 1,
-        pageSize: 20,
-        timestamp: null
+        isActive: null
       },
       isActiveSelectSetting: {
         name: 'isActive',
         search: true,
-        value: '',
         label: this.$t('page.status'),
         valueName: 'value',
         textName: 'text',
@@ -94,9 +90,7 @@ export default {
           { value: 0, text: this.$t('page.disable') }
         ],
         onChange: (value) => {
-          Object.assign(this.searchParam, {
-            isActive: value === '' ? null : value
-          });
+          this.searchParam.isActive = value;
           this.changeCurrent();
         }
       },
@@ -119,9 +113,9 @@ export default {
     searchData() {
       this.loadingShow = true;
       let params = {
-        currentPage: this.searchParam.currentPage,
-        pageSize: this.searchParam.pageSize,
-        timestamp: new Date().getTime()
+        ...this.searchParam,
+        currentPage: this.tableData.currentPage || 1, 
+        pageSize: this.tableData.pageSize || 20
       };
       this.$api.process.channeltype
         .search(params)
@@ -134,12 +128,12 @@ export default {
         });
     },
     changeCurrent(currentPage = 1) {
-      this.searchParam.currentPage = currentPage;
+      this.tableData.currentPage = currentPage;
       this.searchData();
     },
     changePageSize(pageSize) {
-      this.searchParam.currentPage = 1;
-      this.searchParam.pageSize = pageSize;
+      this.tableData.currentPage = 1;
+      this.tableData.pageSize = pageSize;
       this.searchData();
     },
     addChannelType() {
-- 
Gitee