From 45b5ba6795f926aee20f2686349bfbff7500b5bd Mon Sep 17 00:00:00 2001
From: zhoumingfa <daxiongren@foxmail.com>
Date: Fri, 28 Mar 2025 21:21:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=89=8D=E7=AB=AF=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E9=A2=84=E8=A7=88=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/dict-preview/index.vue        | 16 +++++++---------
 .../src/views/business/erp/goods/goods-list.vue  |  4 +---
 .../employee/components/employee-list/index.vue  |  2 +-
 .../src/components/dict-preview/index.vue        | 16 +++++++---------
 .../src/views/business/erp/goods/goods-list.vue  |  3 +--
 .../employee/components/employee-list/index.vue  |  2 +-
 6 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/smart-admin-web-javascript/src/components/dict-preview/index.vue b/smart-admin-web-javascript/src/components/dict-preview/index.vue
index 30762b22..64204910 100644
--- a/smart-admin-web-javascript/src/components/dict-preview/index.vue
+++ b/smart-admin-web-javascript/src/components/dict-preview/index.vue
@@ -1,11 +1,6 @@
 <template>
   <div>
-    <template v-for="(item, index) in options">
-      <template v-if="values.includes(item.valueCode)">
-        {{ item.valueName }}
-        <span> </span>
-      </template>
-    </template>
+    <span>{{ dictValueName }}</span>
   </div>
 </template>
 
@@ -21,8 +16,11 @@
     // 当前的值
     value: [Number, String, Array],
   });
-  const values = computed(() => {
-    if (props.value === null || typeof props.value === 'undefined' || props.value === '') return [];
-    return Array.isArray(props.value) ? props.value.map((item) => item.valueCode) : props.value.split(',');
+  const dictValueName = computed(() => {
+    if (props.value === null || typeof props.value === 'undefined' || props.value === '') return '';
+    const valueCodeList = Array.isArray(props.value) ? props.value.map((item) => item.valueCode) : props.value.split(',');
+    const valueNameList = props.options.filter((item) => valueCodeList.includes(item.valueCode)).map((item) => item.valueName);
+
+    return valueNameList.join('，');
   });
 </script>
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 39f793b1..15b01a1f 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
@@ -120,7 +120,7 @@
           {{ text }}
         </template>
         <template v-if="column.dataIndex === 'place'">
-          <DictPreview :options="descList.GOODS_PLACE" :value="text" />
+          <DictPreview :options="descList['GOODS_PLACE']" :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';
@@ -236,7 +235,6 @@
       title: '商品状态',
       dataIndex: 'goodsStatus',
       resizable: true,
-      sorter: true,
       filterOptions: {
         type: 'enum-select',
         enumName: 'GOODS_STATUS_ENUM',
diff --git a/smart-admin-web-javascript/src/views/system/employee/components/employee-list/index.vue b/smart-admin-web-javascript/src/views/system/employee/components/employee-list/index.vue
index 75a6099a..e0cbedde 100644
--- a/smart-admin-web-javascript/src/views/system/employee/components/employee-list/index.vue
+++ b/smart-admin-web-javascript/src/views/system/employee/components/employee-list/index.vue
@@ -56,7 +56,7 @@
       row-key="employeeId"
       bordered
     >
-      <template #bodyCell="{ text, record, index, column }">
+      <template #bodyCell="{ text, record, column }">
         <template v-if="column.dataIndex === 'administratorFlag'">
           <a-tag color="error" v-if="text">超管</a-tag>
         </template>
diff --git a/smart-admin-web-typescript/src/components/dict-preview/index.vue b/smart-admin-web-typescript/src/components/dict-preview/index.vue
index 30762b22..64204910 100644
--- a/smart-admin-web-typescript/src/components/dict-preview/index.vue
+++ b/smart-admin-web-typescript/src/components/dict-preview/index.vue
@@ -1,11 +1,6 @@
 <template>
   <div>
-    <template v-for="(item, index) in options">
-      <template v-if="values.includes(item.valueCode)">
-        {{ item.valueName }}
-        <span> </span>
-      </template>
-    </template>
+    <span>{{ dictValueName }}</span>
   </div>
 </template>
 
@@ -21,8 +16,11 @@
     // 当前的值
     value: [Number, String, Array],
   });
-  const values = computed(() => {
-    if (props.value === null || typeof props.value === 'undefined' || props.value === '') return [];
-    return Array.isArray(props.value) ? props.value.map((item) => item.valueCode) : props.value.split(',');
+  const dictValueName = computed(() => {
+    if (props.value === null || typeof props.value === 'undefined' || props.value === '') return '';
+    const valueCodeList = Array.isArray(props.value) ? props.value.map((item) => item.valueCode) : props.value.split(',');
+    const valueNameList = props.options.filter((item) => valueCodeList.includes(item.valueCode)).map((item) => item.valueName);
+
+    return valueNameList.join('，');
   });
 </script>
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 cf77e3c6..41edc886 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'">
-          <DictPreview :options="descList.GOODS_PLACE" :value="text" />
+          <DictPreview :options="descList['GOODS_PLACE']" :value="text" />
         </template>
         <template v-if="column.dataIndex === 'remark'">
           <span>{{ text ? text : '' }}</span>
@@ -234,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/system/employee/components/employee-list/index.vue b/smart-admin-web-typescript/src/views/system/employee/components/employee-list/index.vue
index de940b10..54c17a1c 100644
--- a/smart-admin-web-typescript/src/views/system/employee/components/employee-list/index.vue
+++ b/smart-admin-web-typescript/src/views/system/employee/components/employee-list/index.vue
@@ -56,7 +56,7 @@
       row-key="employeeId"
       bordered
     >
-      <template #bodyCell="{ text, record, index, column }">
+      <template #bodyCell="{ text, record, column }">
         <template v-if="column.dataIndex === 'administratorFlag'">
           <a-tag color="error" v-if="text">超管</a-tag>
         </template>