From ade82f8aa2f09c8fe8da4c8f57ea243dceeabe81 Mon Sep 17 00:00:00 2001
From: zhoumingfa <daxiongren@foxmail.com>
Date: Tue, 1 Apr 2025 20:08:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=89=8D=E7=AB=AF=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E9=83=A8=E5=88=86=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/business/erp/goods/goods-list.vue       | 10 ++++------
 .../support/code-generator/code-generator-list.vue    | 11 ++++++++++-
 .../src/views/system/menu/menu-list.vue               |  1 +
 .../src/views/business/erp/goods/goods-list.vue       |  4 +---
 .../support/code-generator/code-generator-list.vue    |  2 +-
 .../src/views/system/menu/menu-list.vue               |  1 +
 6 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/smart-admin-web-javascript/src/views/business/erp/goods/goods-list.vue b/smart-admin-web-javascript/src/views/business/erp/goods/goods-list.vue
index 7b58088c..f25d4234 100644
--- a/smart-admin-web-javascript/src/views/business/erp/goods/goods-list.vue
+++ b/smart-admin-web-javascript/src/views/business/erp/goods/goods-list.vue
@@ -25,7 +25,7 @@
       </a-form-item>
 
       <a-form-item label="产地" name="place" class="smart-query-form-item">
-        <DictSelect :dictCode="DICT_CODE_ENUM.GOODS_PLACE" v-model:value="queryForm.place" width="120px" />
+        <DictSelect :dict-code="DICT_CODE_ENUM.GOODS_PLACE" v-model:value="queryForm.place" width="120px" />
       </a-form-item>
 
       <a-form-item label="商品状态" name="goodsStatus" class="smart-query-form-item">
@@ -93,7 +93,7 @@
         </a-button>
       </div>
       <div class="smart-table-setting-block">
-        <TableOperator v-model="columns" :tableId="TABLE_ID_CONST.BUSINESS.ERP.GOODS" :refresh="queryData"/>
+        <TableOperator v-model="columns" :tableId="TABLE_ID_CONST.BUSINESS.ERP.GOODS" :refresh="queryData" />
       </div>
     </a-row>
     <!---------- 表格操作行 end ----------->
@@ -120,7 +120,7 @@
           {{ text }}
         </template>
         <template v-if="column.dataIndex === 'place'">
-          <DictLabel :dict-code="DICT_CODE_ENUM.GOODS_PLACE" :dataValue="text" />
+          <DictLabel :dict-code="DICT_CODE_ENUM.GOODS_PLACE" :data-value="text" />
         </template>
         <template v-if="column.dataIndex === 'remark'">
           <span>{{ text ? text : '' }}</span>
@@ -199,7 +199,6 @@
   import { smartSentry } from '/@/lib/smart-sentry';
   import TableOperator from '/@/components/support/table-operator/index.vue';
   import { TABLE_ID_CONST } from '/@/constants/support/table-id-const';
-  import { GOODS_STATUS_ENUM } from '/@/constants/business/erp/goods-const';
   import DictSelect from '/@/components/support/dict-select/index.vue';
   import SmartEnumSelect from '/@/components/framework/smart-enum-select/index.vue';
   import _ from 'lodash';
@@ -235,7 +234,6 @@
       title: '商品状态',
       dataIndex: 'goodsStatus',
       resizable: true,
-      sorter: true,
       filterOptions: {
         type: 'enum-select',
         enumName: 'GOODS_STATUS_ENUM',
@@ -248,7 +246,7 @@
       resizable: true,
       filterOptions: {
         type: 'dict-select',
-        dictCode: DICT_CODE_ENUM.GOODS_PLACE,
+        dictCode: DICT_CODE_ENUM.GOODS_PLACE || 'GOODS_PLACE',
       },
       width: 150,
     },
diff --git a/smart-admin-web-javascript/src/views/support/code-generator/code-generator-list.vue b/smart-admin-web-javascript/src/views/support/code-generator/code-generator-list.vue
index 1b93abf7..80e96c75 100644
--- a/smart-admin-web-javascript/src/views/support/code-generator/code-generator-list.vue
+++ b/smart-admin-web-javascript/src/views/support/code-generator/code-generator-list.vue
@@ -39,7 +39,16 @@
         <TableOperator class="smart-margin-bottom5" v-model="columns" :tableId="TABLE_ID_CONST.SUPPORT.CONFIG" :refresh="ajaxQuery" />
       </a-row>
 
-      <a-table size="small" :loading="tableLoading" bordered :dataSource="tableData" :columns="columns" rowKey="configId" :pagination="false">
+      <a-table
+        size="small"
+        :scroll="{ x: 1000 }"
+        :loading="tableLoading"
+        bordered
+        :dataSource="tableData"
+        :columns="columns"
+        rowKey="configId"
+        :pagination="false"
+      >
         <template #bodyCell="{ record, index, column }">
           <template v-if="column.dataIndex === 'seq'">
             {{ index + 1 }}
diff --git a/smart-admin-web-javascript/src/views/system/menu/menu-list.vue b/smart-admin-web-javascript/src/views/system/menu/menu-list.vue
index 5f1a6da9..9fc15cd7 100644
--- a/smart-admin-web-javascript/src/views/system/menu/menu-list.vue
+++ b/smart-admin-web-javascript/src/views/system/menu/menu-list.vue
@@ -88,6 +88,7 @@
       <a-table
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         size="small"
+        :scroll="{ x: 1000 }"
         :defaultExpandAllRows="true"
         :dataSource="tableData"
         bordered
diff --git a/smart-admin-web-typescript/src/views/business/erp/goods/goods-list.vue b/smart-admin-web-typescript/src/views/business/erp/goods/goods-list.vue
index 39780fb0..d902a68a 100644
--- a/smart-admin-web-typescript/src/views/business/erp/goods/goods-list.vue
+++ b/smart-admin-web-typescript/src/views/business/erp/goods/goods-list.vue
@@ -120,7 +120,7 @@
           {{ text }}
         </template>
         <template v-if="column.dataIndex === 'place'">
-          <DictLabel :dict-code="DICT_CODE_ENUM.GOODS_PLACE" :dataValue="text" />
+          <DictLabel :dict-code="DICT_CODE_ENUM.GOODS_PLACE" :data-value="text" />
         </template>
         <template v-if="column.dataIndex === 'remark'">
           <span>{{ text ? text : '' }}</span>
@@ -199,7 +199,6 @@
   import { smartSentry } from '/@/lib/smart-sentry';
   import TableOperator from '/@/components/support/table-operator/index.vue';
   import { TABLE_ID_CONST } from '/@/constants/support/table-id-const';
-  import { GOODS_STATUS_ENUM } from '/@/constants/business/erp/goods-const';
   import DictSelect from '/@/components/support/dict-select/index.vue';
   import SmartEnumSelect from '/@/components/framework/smart-enum-select/index.vue';
   import _ from 'lodash';
@@ -235,7 +234,6 @@
       title: '商品状态',
       dataIndex: 'goodsStatus',
       resizable: true,
-      sorter: true,
       filterOptions: {
         type: 'enum-select',
         enumName: 'GOODS_STATUS_ENUM',
diff --git a/smart-admin-web-typescript/src/views/support/code-generator/code-generator-list.vue b/smart-admin-web-typescript/src/views/support/code-generator/code-generator-list.vue
index 9b99085c..2d842036 100644
--- a/smart-admin-web-typescript/src/views/support/code-generator/code-generator-list.vue
+++ b/smart-admin-web-typescript/src/views/support/code-generator/code-generator-list.vue
@@ -39,7 +39,7 @@
         <TableOperator class="smart-margin-bottom5" v-model="columns" :tableId="TABLE_ID_CONST.SUPPORT.CONFIG" :refresh="ajaxQuery" />
       </a-row>
 
-      <a-table size="small" :loading="tableLoading" bordered :dataSource="tableData" :columns="columns" rowKey="configId" :pagination="false">
+      <a-table size="small" :scroll="{ x: 1000 }" :loading="tableLoading" bordered :dataSource="tableData" :columns="columns" rowKey="configId" :pagination="false">
         <template #bodyCell="{ record, index, column }">
           <template v-if="column.dataIndex === 'seq'">
             {{ index + 1 }}
diff --git a/smart-admin-web-typescript/src/views/system/menu/menu-list.vue b/smart-admin-web-typescript/src/views/system/menu/menu-list.vue
index cf596fbb..bbbe14b3 100644
--- a/smart-admin-web-typescript/src/views/system/menu/menu-list.vue
+++ b/smart-admin-web-typescript/src/views/system/menu/menu-list.vue
@@ -88,6 +88,7 @@
       <a-table
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         size="small"
+        :scroll="{ x: 1000 }"
         :defaultExpandAllRows="true"
         :dataSource="tableData"
         bordered