From 89a5fedfe041ebacb2d81ecae1023b206cd3f353 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期四, 24 四月 2025 09:10:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'

---
 eims-ui/apps/web-antd/src/views/eims/equ/data.tsx |  117 +++++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 87 insertions(+), 30 deletions(-)

diff --git a/eims-ui/apps/web-antd/src/views/eims/equ/data.tsx b/eims-ui/apps/web-antd/src/views/eims/equ/data.tsx
index 47e65ee..f973b4a 100644
--- a/eims-ui/apps/web-antd/src/views/eims/equ/data.tsx
+++ b/eims-ui/apps/web-antd/src/views/eims/equ/data.tsx
@@ -3,10 +3,9 @@
 import { DictEnum } from '@vben/constants';
 import { getPopupContainer } from '@vben/utils';
 
-import { Tag } from 'ant-design-vue';
-
 import { type FormSchemaGetter, z } from '#/adapter/form';
 import { getDictOptions } from '#/utils/dict';
+import { renderDict } from '#/utils/render';
 
 export const querySchema: FormSchemaGetter = () => [
   {
@@ -39,7 +38,7 @@
   {
     title: '璁惧鍚嶇О',
     field: 'equName',
-    minWidth: 100,
+    minWidth: 140,
     fixed: 'left',
     slots: { default: 'equName' }
   },
@@ -50,26 +49,10 @@
     sortable: true,
     slots: {
       default: ({ row }) => {
-        const statu = row.status;
-        switch (statu) {
-          case '0': {
-            return <Tag color="cyan">璇曠敤</Tag>;
-          }
-          case '1': {
-            return <Tag color="green">鍏ュ浐</Tag>;
-          }
-          case '2': {
-            return <Tag color="orange">杩佺Щ</Tag>;
-          }
-          case '3': {
-            return <Tag color="red">鎶ュ簾</Tag>;
-          }
-          case null: {
-            return '';
-          }
-          // No default
+        if (row.status === null || row.status === '') {
+          return '';
         }
-        return '';
+        return renderDict(row.status, DictEnum.SYS_EQU_STATUS);
       }
     },
     minWidth: 80,
@@ -79,11 +62,11 @@
     title: '璧勪骇缂栧彿',
     field: 'assetNo',
     sortable: true,
-    minWidth: 100,
+    minWidth: 140,
     fixed: 'left'
   },
   {
-    title: '璁惧缂栧彿',
+    title: '璁惧缂栫爜',
     field: 'equCode',
     sortable: true,
     minWidth: 100
@@ -91,6 +74,31 @@
   {
     title: '璁惧绫诲瀷',
     field: 'equTypeName',
+    minWidth: 100
+  },
+  {
+    title: '閿�鍞晢',
+    field: 'seller',
+    minWidth: 100
+  },
+  {
+    title: '鍗曚綅',
+    field: 'unit',
+    minWidth: 60
+  },
+  {
+    title: '閲囪喘浜�',
+    field: 'purchaseUser',
+    minWidth: 100
+  },
+  {
+    title: '缁忔墜浜�',
+    field: 'handleUser',
+    minWidth: 100
+  },
+  {
+    title: '璧勬枡',
+    field: 'profile',
     minWidth: 100
   },
   {
@@ -162,13 +170,21 @@
   {
     title: '瀵煎叆鐘舵��',
     field: 'importStatus',
-    slots: { default: 'importStatus' },
+    slots: {
+      default: ({ row }) => {
+        return row.importStatus === null || row.importStatus === '' ? '' : renderDict(row.importStatus, DictEnum.EQU_IMPORT_STATU);
+      }
+    },
     minWidth: 100
   },
   {
     title: '鐩樼偣鏍囧織',
     field: 'inventoryFlag',
-    slots: { default: 'inventoryFlag' },
+    slots: {
+      default: ({ row }) => {
+        return row.inventoryFlag === null || row.inventoryFlag === '' ? '' : renderDict(row.inventoryFlag, DictEnum.EIMS_INVENTORY_STATU);
+      }
+    },
     minWidth: 100
   },
   {
@@ -229,6 +245,42 @@
     label: '璧勪骇缂栧彿'
   },
   {
+    component: 'Select',
+    componentProps: {
+      options: getDictOptions(DictEnum.EIMS_EQU_UNIT)
+    },
+    fieldName: 'unit',
+    label: '鍗曚綅'
+  },
+  {
+    component: 'Input',
+    fieldName: 'purchaseUserName',
+    label: '閲囪喘浜�'
+  },
+  {
+    component: 'Input',
+    fieldName: 'purchaseUser',
+    label: '閲囪喘浜�',
+    dependencies: {
+      show: () => false,
+      triggerFields: ['']
+    }
+  },
+  {
+    component: 'Input',
+    fieldName: 'handleUserName',
+    label: '缁忔墜浜�'
+  },
+  {
+    component: 'Input',
+    fieldName: 'handleUser',
+    label: '缁忔墜浜�',
+    dependencies: {
+      show: () => false,
+      triggerFields: ['']
+    }
+  },
+  {
     component: 'Input',
     fieldName: 'modelNo',
     label: '鍨嬪彿'
@@ -237,6 +289,11 @@
     component: 'Input',
     fieldName: 'madeIn',
     label: '鍒堕�犲晢'
+  },
+  {
+    component: 'Input',
+    fieldName: 'seller',
+    label: '閿�鍞晢'
   },
   {
     component: 'Input',
@@ -266,7 +323,7 @@
       options: getDictOptions(DictEnum.SYS_EQU_STATUS),
       optionType: 'button'
     },
-    defaultValue: '0',
+    defaultValue: '5',
     fieldName: 'status',
     label: '鐘舵��'
   },
@@ -355,7 +412,7 @@
     component: 'RadioGroup',
     componentProps: {
       buttonStyle: 'solid',
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+      options: getDictOptions(DictEnum.EQU_IMPORT_STATU),
       optionType: 'button'
     },
     defaultValue: '0',
@@ -373,12 +430,12 @@
     component: 'RadioGroup',
     componentProps: {
       buttonStyle: 'solid',
-      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+      options: getDictOptions(DictEnum.EIMS_INVENTORY_STATU),
       optionType: 'button'
     },
     defaultValue: '0',
     fieldName: 'inventoryFlag',
-    formItemClass: 'col-span-2 lg:col-span-1',
+    formItemClass: 'col-span-2',
     label: '鐩樼偣鏍囧織'
   },
   {

--
Gitblit v1.9.3