From df24be04d9eef85c9796578fe6e9888aee3f291f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Wed, 27 Mar 2024 13:51:00 +0800
Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../item/itemAccounts/itemAccounts.data.ts    | 191 ++++++++++++------
 1 file changed, 126 insertions(+), 65 deletions(-)

diff --git a/src/views/eam/item/itemAccounts/itemAccounts.data.ts b/src/views/eam/item/itemAccounts/itemAccounts.data.ts
index 51c2cdd..3e49af6 100644
--- a/src/views/eam/item/itemAccounts/itemAccounts.data.ts
+++ b/src/views/eam/item/itemAccounts/itemAccounts.data.ts
@@ -21,7 +21,7 @@ export const ItemAccounts = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '备件名称',
-    field: 'itemDO.name',
+    field: 'name',
     sort: 'custom',
     table: {
       width: 110
@@ -78,21 +78,21 @@ export const ItemAccounts = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  
   {
     label: '规格',
-    field: 'itemDO.specifications',
+    field: 'specifications',
     sort: 'custom',
   },
   {
-    label: '是否存储',
-    field: 'itemDO.isConstant',
+    label: '是否常储',
+    field: 'isConstant',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    isSearch: false,
     isTable: true,
     sort: 'custom',
     table: {
-      width: 110
+      width: 110,
     },
     tableForm: {
       type: 'Select',
@@ -109,57 +109,84 @@ export const ItemAccounts = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '是否存储',
-    field: 'itemDO.isRadeIn',
-    dictType: DICT_TYPE.TRUE_FALSE,
+    label: '科目',
+    field: 'subject',
+    sort: 'custom',
+    dictType: DICT_TYPE.ITEM_SUBJECT,
     dictClass: 'string',
+    isSearch: false,
     isTable: true,
-    sort: 'custom',
-    table: {
-      width: 110
-    },
     tableForm: {
-      type: 'Select',
-      inactiveValue: 'FALSE',
-      disabled: true
-    },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
-      }
+      type: 'Select'
     }
   },
+  
   {
-    label: '科目',
-    field: 'itemDO.subject',
+    label: '科目代码',
+    field: 'subjectCode',
     sort: 'custom',
+    isTable: true,
   },
   {
     label: '单位',
-    field: 'itemDO.uom',
+    field: 'uom',
     sort: 'custom',
     dictType: DICT_TYPE.UOM,
     dictClass: 'string',
+    isSearch: false,
+    isTable: true,
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '类别',
+    field: 'category',
+    sort: 'custom',
+    dictType: DICT_TYPE.ITEM_CATEGORY,
+    dictClass: 'string',
+    isSearch: false,
     isTable: true,
-    table: {
-      width: 150
-    },
     tableForm: {
       type: 'Select'
     }
   },
   {
-    label: '单价',
-    field: 'itemDO.singlePrice',
+    label: '备件分类',
+    field: 'classification',
     sort: 'custom',
+    dictType: DICT_TYPE.CLASSIFICATION,
+    dictClass: 'string',
+    isSearch: false,
+    isTable: true,
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '区域',
+    field: 'region',
+    sort: 'custom',
+    dictType: DICT_TYPE.ITEM_REGION,
+    dictClass: 'string',
+    isSearch: false,
+    isTable: true,
+    tableForm: {
+      type: 'Select'
+    }
   },
+  // {
+  //   label: '单价',
+  //   field: 'singlePrice',
+  //   sort: 'custom',
+  // },
   {
-    label: '重点采购',
-    field: 'itemDO.reprocurement',
+    label: '重采购点',
+    field: 'reprocurement',
     sort: 'custom',
+    table: {
+      width: 110,
+    },
     form: {
       component: 'InputNumber',
       value: 0
@@ -167,8 +194,11 @@ export const ItemAccounts = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '安全库存',
-    field: 'itemDO.safetyStock',
+    field: 'safetyStock',
     sort: 'custom',
+    table: {
+      width: 110,
+    },
     form: {
       component: 'InputNumber',
       value: 0
@@ -176,44 +206,75 @@ export const ItemAccounts = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '成本中心',
-    field: 'itemDO.cost',
+    field: 'cost',
     sort: 'custom',
+    table: {
+      width: 110,
+    },
   },
   {
     label: '采购员',
-    field: 'itemDO.purchaser',
+    field: 'purchaser',
     sort: 'custom',
+    table: {
+      width: 100,
+    },
   },
   {
     label: '财务',
-    field: 'itemDO.financer',
-    sort: 'custom',
-  },
- // {
- //    label: '是否以旧换新',
- //    field: 'itemDO.isRadeIn',
- //    dictType: DICT_TYPE.TRUE_FALSE,
- //    dictClass: 'string',
- //    isSearch: false,
- //    isTable: true,
- //    sort: 'custom',
- //    table: {
- //      width: 150
- //    },
- //    tableForm: {
- //      type: 'Select',
- //      inactiveValue: 'FALSE',
- //      disabled: true
- //    },
- //    form: {
- //      component: 'Switch',
- //      value: 'TRUE',
- //      componentProps: {
- //        inactiveValue: 'FALSE',
- //        activeValue: 'TRUE'
- //      }
- //    }
- //  },
+    field: 'financer',
+    sort: 'custom',
+  },
+  {
+    label: '是否以旧换新',
+    field: 'isRadeIn',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: false,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 140
+    },
+    tableForm: {
+      type: 'Select',
+      inactiveValue: 'FALSE',
+      disabled: true
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '是否框架协议',
+    field: 'isFramework',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: false,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 140
+    },
+    tableForm: {
+      type: 'Select',
+      inactiveValue: 'FALSE',
+      disabled: true
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
   {
     label: '是否可用',
     field: 'available',