Merge branch 'feature/JiraTML-148/cxr' of http://119.78.67.12/git/root/ops_2024_vue into hd

src/views/super/regionalSpotManage/index.vue

@@ -22,6 +22,7 @@
         v-model:current="page"
         simple
         :total="total"
+        @change="pageChange"
       >
         <template #itemRender="{ type, originalElement }">
           <a-button size="small" v-if="type === 'prev'">上一页</a-button>
@@ -384,6 +385,7 @@
               if (res.success) {
                 peopleData.value = res.data.filter((item) => item.type == 1);
                 rootData.value = res.data.filter((item) => item.type == 0);
+                getTableDate();
               } else {
                 peopleData.value = [];
                 rootData.value = [];
@@ -397,7 +399,12 @@
       },
     });
   };
-
+  //分页
+  const pageChange = (pageNo: any, pageSize: any) => {
+    console.log(pageNo, pageSize);
+    page.value = pageNo;
+    getTableDate();
+  };
   //过滤搜索
   const filterOption = (input: string, option: any) => {
     return option.key.toLowerCase().indexOf(input.toLowerCase()) >= 0;

src/views/super/supplierInfoManage/供货商信息管理.vue

@@ -26,7 +26,9 @@
           <a-select-option value="0">未开通</a-select-option>
         </a-select>
       </a-form-item>
-
+      <a-form-item>
+        <a-button type="primary" @click="onReSet">重置</a-button>
+      </a-form-item>
       <a-form-item>
         <a-button type="primary" @click="onSearch">搜索</a-button>
       </a-form-item>
@@ -1191,6 +1193,11 @@
       getList();
     });
   };
+  const onReSet = () => {
+    searchText.value = '';
+    isVip.value = '';
+    isScOpen.value = '';
+  };
 </script>
 
 <style lang="scss" scoped></style>