From ac4341ea6b66ae02427d39d35f41d42d78b2eb2e Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 14 二月 2025 10:08:32 +0800
Subject: [PATCH] #

---
 zy-asrs-admin/src/views/strategy/waitPakinRule/index.vue |  128 ++++++++++++++++++++++--------------------
 1 files changed, 67 insertions(+), 61 deletions(-)

diff --git a/zy-asrs-admin/src/views/strategy/waitPakinRule/index.vue b/zy-asrs-admin/src/views/strategy/waitPakinRule/index.vue
index 3a82672..f8b6ef5 100644
--- a/zy-asrs-admin/src/views/strategy/waitPakinRule/index.vue
+++ b/zy-asrs-admin/src/views/strategy/waitPakinRule/index.vue
@@ -17,6 +17,11 @@
 const searchInput = ref("")
 const editChild = ref(null)
 
+const state = reactive({
+  selectedRowKeys: [],
+  loading: false,
+});
+
 let tableData = ref([]);
 getPage();
 
@@ -26,62 +31,62 @@
 } = useTableSearch();
 
 const columns = [
-        {
-            title: formatMessage('db.strategy_wait_pakin_rule.pallet_order', '鎵樼洏璁㈠崟'),
-            dataIndex: 'palletOrder$',
-            width: 140,
-            ellipsis: true,
-            ...getColumnSearchProps('palletOrder$'),
-        },
-        {
-            title: formatMessage('db.strategy_wait_pakin_rule.pallet_mixed', '鏄惁娣疯浇'),
-            dataIndex: 'palletMixed$',
-            width: 140,
-            ellipsis: true,
-            ...getColumnSearchProps('palletMixed$'),
-        },
-        {
-            title: formatMessage('db.strategy_wait_pakin_rule.status', '鐘舵��'),
-            dataIndex: 'status$',
-            width: 140,
-            ellipsis: true,
-            ...getColumnSearchProps('status$'),
-        },
-        {
-            title: formatMessage('db.strategy_wait_pakin_rule.create_time', '娣诲姞鏃堕棿'),
-            dataIndex: 'createTime$',
-            width: 140,
-            ellipsis: true,
-            ...getColumnSearchProps('createTime$'),
-        },
-        {
-            title: formatMessage('db.strategy_wait_pakin_rule.create_by', '娣诲姞浜哄憳'),
-            dataIndex: 'createBy$',
-            width: 140,
-            ellipsis: true,
-            ...getColumnSearchProps('createBy$'),
-        },
-        {
-            title: formatMessage('db.strategy_wait_pakin_rule.update_time', '淇敼鏃堕棿'),
-            dataIndex: 'updateTime$',
-            width: 140,
-            ellipsis: true,
-            ...getColumnSearchProps('updateTime$'),
-        },
-        {
-            title: formatMessage('db.strategy_wait_pakin_rule.update_by', '淇敼浜哄憳'),
-            dataIndex: 'updateBy$',
-            width: 140,
-            ellipsis: true,
-            ...getColumnSearchProps('updateBy$'),
-        },
-        {
-            title: formatMessage('db.strategy_wait_pakin_rule.memo', '澶囨敞'),
-            dataIndex: 'memo',
-            width: 140,
-            ellipsis: true,
-            ...getColumnSearchProps('memo'),
-        },
+  {
+    title: formatMessage('db.strategy_wait_pakin_rule.pallet_order', '鎵樼洏璁㈠崟'),
+    dataIndex: 'palletOrder$',
+    width: 140,
+    ellipsis: true,
+    ...getColumnSearchProps('palletOrder$'),
+  },
+  {
+    title: formatMessage('db.strategy_wait_pakin_rule.pallet_mixed', '鏄惁娣疯浇'),
+    dataIndex: 'palletMixed$',
+    width: 140,
+    ellipsis: true,
+    ...getColumnSearchProps('palletMixed$'),
+  },
+  {
+    title: formatMessage('db.strategy_wait_pakin_rule.status', '鐘舵��'),
+    dataIndex: 'status$',
+    width: 140,
+    ellipsis: true,
+    ...getColumnSearchProps('status$'),
+  },
+  {
+    title: formatMessage('db.strategy_wait_pakin_rule.create_time', '娣诲姞鏃堕棿'),
+    dataIndex: 'createTime$',
+    width: 140,
+    ellipsis: true,
+    ...getColumnSearchProps('createTime$'),
+  },
+  {
+    title: formatMessage('db.strategy_wait_pakin_rule.create_by', '娣诲姞浜哄憳'),
+    dataIndex: 'createBy$',
+    width: 140,
+    ellipsis: true,
+    ...getColumnSearchProps('createBy$'),
+  },
+  {
+    title: formatMessage('db.strategy_wait_pakin_rule.update_time', '淇敼鏃堕棿'),
+    dataIndex: 'updateTime$',
+    width: 140,
+    ellipsis: true,
+    ...getColumnSearchProps('updateTime$'),
+  },
+  {
+    title: formatMessage('db.strategy_wait_pakin_rule.update_by', '淇敼浜哄憳'),
+    dataIndex: 'updateBy$',
+    width: 140,
+    ellipsis: true,
+    ...getColumnSearchProps('updateBy$'),
+  },
+  {
+    title: formatMessage('db.strategy_wait_pakin_rule.memo', '澶囨敞'),
+    dataIndex: 'memo',
+    width: 140,
+    ellipsis: true,
+    ...getColumnSearchProps('memo'),
+  },
 
   {
     title: formatMessage('common.operation', '鎿嶄綔'),
@@ -93,10 +98,7 @@
   },
 ];
 
-const state = reactive({
-  selectedRowKeys: [],
-  loading: false,
-});
+
 const hasSelected = computed(() => state.selectedRowKeys.length > 0);
 const start = () => {
   state.loading = true;
@@ -112,6 +114,7 @@
 };
 
 function getPage() {
+  state.loading = true;
   post('/api/waitPakinRule/page', {
     current: currentPage,
     pageSize: pageSize,
@@ -121,6 +124,8 @@
     if (result.code == 200) {
       let data = result.data;
       tableData.value = data;
+
+      state.loading = false;
     } else if (result.code === 401) {
       message.error(result.msg);
       logout()
@@ -206,7 +211,8 @@
     <a-table :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }"
       :data-source="tableData.records" :defaultExpandAllRows="false" :key="TABLE_KEY" rowKey="id"
       :pagination="{ total: tableData.total, onChange: onPageChange }"
-      :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="columns" @resizeColumn="handleResizeColumn">
+      :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="columns" @resizeColumn="handleResizeColumn"
+      :loading="state.loading">
       <template #bodyCell="{ column, text, record }">
         <template v-if="column.dataIndex === 'oper'">
           <div style="display: flex;justify-content: space-evenly;">

--
Gitblit v1.9.1