BUG修改

src/views/eam/basic/deviceItem/deviceItem.data.ts

@@ -9,38 +9,42 @@ export const DeviceItemRules = reactive({
 
 export const DeviceItem = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '备件代码',
+    label: '备件编号',
     field: 'itemNumber',
     sort: 'custom',
     isSearch: true,
   },
   {
-    label: '设备代码',
+    label: '设备编号',
     field: 'deviceNumber',
     sort: 'custom',
     isSearch: true,
   },
-  {
+ 
-    label: '地点ID',
-    field: 'siteId',
-    sort: 'custom',
-    isSearch: true,
-  },
   {
     label: '是否可用',
     field: 'available',
-    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
     isSearch: true,
-  },
+    isTable: true,
-  {
-    label: '并发乐观锁',
-    field: 'concurrencyStamp',
     sort: 'custom',
-    isSearch: true,
+    table: {
-    form: {
+      width: 150
-      component: 'InputNumber',
-      value: 0
     },
+    tableForm: {
+      type: 'Select',
+      inactiveValue: 'FALSE',
+      disabled: true
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
   },
   {
     label: '操作',

src/views/eam/basic/deviceMoldItems/deviceMoldItems.data.ts

@@ -24,7 +24,7 @@ export const DeviceMoldItems = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
   },
   {
-    label: '类型设备、模具枚举',
+    label: '类型',
     field: 'type',
     sort: 'custom',
     isSearch: true,
@@ -33,7 +33,7 @@ export const DeviceMoldItems = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '项类型枚举维修、保养、巡检点检',
+    label: '项类型',
     field: 'status',
     sort: 'custom',
     isSearch: true,
@@ -41,31 +41,30 @@ export const DeviceMoldItems = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'Select'
     },
   },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isForm: false,
-  },
-  {
-    label: '地点ID',
-    field: 'siteId',
-    sort: 'custom',
-  },
   {
     label: '是否可用',
     field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
     sort: 'custom',
-  },
+    table: {
-  {
+      width: 150
-    label: '并发乐观锁',
+    },
-    field: 'concurrencyStamp',
+    tableForm: {
-    sort: 'custom',
+      type: 'Select',
-    form: {
+      inactiveValue: 'FALSE',
-      component: 'InputNumber',
+      disabled: true
-      value: 0
     },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
   },
   {
     label: '操作',

src/views/eam/basic/factoryArea/factoryArea.data.ts

@@ -10,7 +10,7 @@ export const FactoryAreaRules = reactive({
 
 export const FactoryArea = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '编号唯一标识',
+    label: '厂区编号',
     field: 'number',
     sort: 'custom',
     isSearch: true,
@@ -22,18 +22,12 @@ export const FactoryArea = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
   },
   {
-    label: '描述',
+    label: '是否可用',
-    field: 'description',
+    field: 'available',
     sort: 'custom',
     isSearch: true,
-    form: {
-      component: 'Editor',
-      componentProps: {
-        valueHtml: '',
-        height: 200
-      }
-    },
   },
+
   {
     label: '负责人',
     field: 'leader',
@@ -47,25 +41,11 @@ export const FactoryArea = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
   },
   {
-    label: '地点ID',
+    label: '描述',
-    field: 'siteId',
+    field: 'description',
-    sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '是否可用',
-    field: 'available',
-    sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '并发乐观锁',
-    field: 'concurrencyStamp',
     sort: 'custom',
-    isSearch: true,
+    table: {
-    form: {
+      width: 150
-      component: 'InputNumber',
-      value: 0
     },
   },
   {

src/views/eam/basic/item/item.data.ts

@@ -10,7 +10,7 @@ export const ItemRules = reactive({
 
 export const Item = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '编号唯一标识',
+    label: '备件编号',
     field: 'number',
     sort: 'custom',
     isSearch: true,
@@ -32,17 +32,17 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
   },
   {
-    label: '是否存储TRUE/FALSE',
+    label: '是否存储',
     field: 'isConstant',
     sort: 'custom',
   },
   {
-    label: '科目代码枚举工具、易耗品、备品备件、机物料',
+    label: '科目代码',
     field: 'subject',
     sort: 'custom',
   },
   {
-    label: '枚举分类 A、B、C',
+    label: '枚举',
     field: 'classification',
     sort: 'custom',
   },
@@ -89,34 +89,36 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'financer',
     sort: 'custom',
   },
+ 
   {
-    label: '是否框架协议TRUE/FALSE',
+    label: '是否以旧换新',
-    field: 'isFramework',
-    sort: 'custom',
-  },
-  {
-    label: '是否以旧换新TRUE/FALSE',
     field: 'isRadeIn',
     sort: 'custom',
   },
-  {
-    label: '地点ID',
-    field: 'siteId',
-    sort: 'custom',
-  },
   {
     label: '是否可用',
     field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
     sort: 'custom',
-  },
+    table: {
-  {
+      width: 150
-    label: '并发乐观锁',
+    },
-    field: 'concurrencyStamp',
+    tableForm: {
-    sort: 'custom',
+      type: 'Select',
-    form: {
+      inactiveValue: 'FALSE',
-      component: 'InputNumber',
+      disabled: true
-      value: 0
     },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
   },
   {
     label: '操作',

src/views/eam/basic/location/location.data.ts

@@ -10,7 +10,7 @@ export const LocationRules = reactive({
 
 export const Location = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '编号唯一标识',
+    label: '库位编号',
     field: 'number',
     sort: 'custom',
     isSearch: true,
@@ -21,19 +21,11 @@ export const Location = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
   },
-  {
+
-    label: '描述',
+
-    field: 'description',
+
-    sort: 'custom',
+
-    isSearch: true,
+
-    form: {
-      component: 'Editor',
-      componentProps: {
-        valueHtml: '',
-        height: 200
-      }
-    },
-  },
   {
     label: '库区编号',
     field: 'areaNumber',
@@ -50,29 +42,43 @@ export const Location = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '是否账内账外默认TRUE账内FALSE账外',
+    label: '是否账内账外',
     field: 'isInAccount',
     sort: 'custom',
     isSearch: true,
   },
-  {
+
-    label: '地点ID',
-    field: 'siteId',
-    sort: 'custom',
-  },
   {
     label: '是否可用',
     field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
     sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      inactiveValue: 'FALSE',
+      disabled: true
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
   },
   {
-    label: '并发乐观锁',
+    label: '描述',
-    field: 'concurrencyStamp',
+    field: 'description',
     sort: 'custom',
-    isSearch: true,
+    table: {
-    form: {
+      width: 150
-      component: 'InputNumber',
-      value: 0
     },
   },
   {

src/views/eam/basic/locationArea/locationArea.data.ts

@@ -10,7 +10,7 @@ export const LocationAreaRules = reactive({
 
 export const LocationArea = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '编号',
+    label: '库区编号',
     field: 'number',
     sort: 'custom',
     isSearch: true,
@@ -21,18 +21,7 @@ export const LocationArea = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
   },
-  {
+  
-    label: '描述',
-    field: 'description',
-    sort: 'custom',
-    form: {
-      component: 'Editor',
-      componentProps: {
-        valueHtml: '',
-        height: 200
-      }
-    },
-  },
   {
     label: '类型',
     field: 'type',
@@ -42,32 +31,41 @@ export const LocationArea = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'Select'
     },
   },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isForm: false,
-  },
-  {
-    label: '地点ID',
-    field: 'siteId',
-    sort: 'custom',
-  },
   {
     label: '是否可用',
     field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
     sort: 'custom',
-  },
+    table: {
-  {
+      width: 150
-    label: '并发乐观锁',
+    },
-    field: 'concurrencyStamp',
+    tableForm: {
-    sort: 'custom',
+      type: 'Select',
-    form: {
+      inactiveValue: 'FALSE',
-      component: 'InputNumber',
+      disabled: true
-      value: 0
     },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
   },
+  
+   {
+      label: '描述',
+      field: 'description',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+    },
+
   {
     label: '操作',
     field: 'action',

src/views/eam/basic/supplier/supplier.data.ts

@@ -8,7 +8,7 @@ export const SupplierRules = reactive({
 
 export const Supplier = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '编号唯一标识',
+    label: '供应商编号',
     field: 'number',
     sort: 'custom',
     isSearch: true,
@@ -64,22 +64,36 @@ export const Supplier = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'contacts',
     sort: 'custom',
   },
-  {
+ {
-    label: '是否可用',
+   label: '是否可用',
-    field: 'available',
+   field: 'available',
-    sort: 'custom',
+   dictType: DICT_TYPE.TRUE_FALSE,
-  },
+   dictClass: 'string',
+   isSearch: true,
+   isTable: true,
+   sort: 'custom',
+   table: {
+     width: 150
+   },
+   tableForm: {
+     type: 'Select',
+     inactiveValue: 'FALSE',
+     disabled: true
+   },
+   form: {
+     component: 'Switch',
+     value: 'TRUE',
+     componentProps: {
+       inactiveValue: 'FALSE',
+       activeValue: 'TRUE'
+     }
+   }
+ },
   {
     label: '备注',
     field: 'remark',
     sort: 'custom',
   },
-  {
-    label: '地点ID',
-    field: 'siteId',
-    sort: 'custom',
-    isSearch: true,
-  },
   {
     label: '操作',
     field: 'action',

src/views/eam/fixedAssets/fixedAssets.data.ts

@@ -14,7 +14,7 @@ export const FixedAssetsRules = reactive({
 
 export const FixedAssets = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '编号唯一标识',
+    label: '资产编号',
     field: 'number',
     sort: 'custom',
     isSearch: true,
@@ -101,12 +101,31 @@ export const FixedAssets = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
   },
-  {
+ {
-    label: '是否可用',
+   label: '是否可用',
-    field: 'available',
+   field: 'available',
-    sort: 'custom',
+   dictType: DICT_TYPE.TRUE_FALSE,
-    isSearch: true,
+   dictClass: 'string',
-  },
+   isSearch: true,
+   isTable: true,
+   sort: 'custom',
+   table: {
+     width: 150
+   },
+   tableForm: {
+     type: 'Select',
+     inactiveValue: 'FALSE',
+     disabled: true
+   },
+   form: {
+     component: 'Switch',
+     value: 'TRUE',
+     componentProps: {
+       inactiveValue: 'FALSE',
+       activeValue: 'TRUE'
+     }
+   }
+ },
 
   {
     label: '操作',