BUG修改

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

@@ -100,7 +100,7 @@ export const DeviceMaintenance = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '保养类型',
+    label: '保养周期',
     field: 'executionCycle',
     dictType: DICT_TYPE.EXECUTION_CYCLE,
     dictClass: 'string',
@@ -110,6 +110,32 @@ export const DeviceMaintenance = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'Select'
     },
   },
+  
+  {
+    label: '人数',
+    field: 'peopleNum',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 150,
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '保养所需时间（h）',
+    field: 'maintenanceTime',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 150,
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  
   {
     label: '是否可用',
     field: 'available',
@@ -144,4 +170,4 @@ export const DeviceMaintenance = useCrudSchemas(reactive<CrudSchema[]>([
       fixed: 'right'
     }
   }
-]))
+]))

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

@@ -2,10 +2,10 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 
 // 表单校验
 export const ItemRules = reactive({
-  number: [required],
+   name: [
-  name: [required],
+      { required: true, message: '请输入备件名称', trigger: 'blur' }, 
-  uom: [required],
+      { max: 50, message: '不得超过50个字符', trigger: 'blur' }
-  concurrencyStamp: [required],
+    ],
 })
 
 export const Item = useCrudSchemas(reactive<CrudSchema[]>([
@@ -188,6 +188,11 @@ export const Item = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '描述',
+    field: 'describes',
+    sort: 'custom',
+  },
   {
     label: '操作',
     field: 'action',

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

@@ -5,10 +5,14 @@ import { LocationArea } from '../locationArea/locationArea.data'
 
 // 表单校验
 export const LocationRules = reactive({
-  number: [required],
+  name: [
-  name: [required],
+    { required: true, message: '请输入库位名称', trigger: 'blur' }, 
-  areaNumber: [required],
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
-  concurrencyStamp: [required],
+  ],
+  areaNumber: [
+    { required: true, message: '请选择库区编号', trigger: 'blur' }, 
+  ],
+  
 })
 
 export const Location = useCrudSchemas(reactive<CrudSchema[]>([
@@ -58,7 +62,7 @@ export const Location = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.LOCATION_AREA_TYPE,
     dictClass: 'string',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
     form: {
       component: 'Select'
     },
@@ -68,7 +72,7 @@ export const Location = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'isInAccount',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     isTable: true,
     sort: 'custom',
     table: {
@@ -93,7 +97,7 @@ export const Location = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     isTable: true,
     sort: 'custom',
     table: {
@@ -130,4 +134,4 @@ export const Location = useCrudSchemas(reactive<CrudSchema[]>([
       fixed: 'right'
     }
   }
-]))
+]))

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

@@ -3,9 +3,10 @@ import { dateFormatter } from '@/utils/formatTime'
 
 // 表单校验
 export const LocationAreaRules = reactive({
-  number: [required],
+  name: [
-  name: [required],
+    { required: true, message: '请输入库区名称', trigger: 'blur' }, 
-  concurrencyStamp: [required],
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
 })
 
 export const LocationArea = useCrudSchemas(reactive<CrudSchema[]>([

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

@@ -2,8 +2,10 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 
 // 表单校验
 export const SupplierRules = reactive({
-  number: [required],
+ name: [
-  name: [required],
+   { required: true, message: '请输入供应商名称', trigger: 'blur' }, 
+   { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+ ],
 })
 
 export const Supplier = useCrudSchemas(reactive<CrudSchema[]>([
@@ -28,7 +30,7 @@ export const Supplier = useCrudSchemas(reactive<CrudSchema[]>([
     label: '简称',
     field: 'shortName',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '联系人',
@@ -39,14 +41,14 @@ export const Supplier = useCrudSchemas(reactive<CrudSchema[]>([
     label: '联系电话',
     field: 'phone',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '状态',
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     isTable: true,
     sort: 'custom',
     table: {
@@ -80,4 +82,4 @@ export const Supplier = useCrudSchemas(reactive<CrudSchema[]>([
       fixed: 'right'
     }
   }
-]))
+]))

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

@@ -88,7 +88,6 @@ export const ItemAccounts = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'itemDO.isConstant',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
     isTable: true,
     sort: 'custom',
     table: {
@@ -119,7 +118,6 @@ export const ItemAccounts = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     dictType: DICT_TYPE.UOM,
     dictClass: 'string',
-    isSearch: true,
     isTable: true,
     table: {
       width: 150
@@ -171,7 +169,6 @@ export const ItemAccounts = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'itemDO.isRadeIn',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
     isTable: true,
     sort: 'custom',
     table: {

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

@@ -16,30 +16,125 @@ export const ItemOrderMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
     isSearch: true,
     table: {
-      width: 180,
+      width: 150,
       fixed: 'left'
     },
   },
   {
-    label: '申领人',
+    label: '日期',
-    field: 'applyId',
+    field: 'date',
     sort: 'custom',
-    isForm: false,
+    formatter: dateFormatter,
-    isSearch: false,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
   },
   {
-    label: '审批人',
+    label: '电话',
-    field: 'approveId',
+    field: 'phone',
     sort: 'custom',
-    isForm: false,
-    isSearch: false,
   },
   {
-    label: '出库人',
+    label: '传真',
-    field: 'outId',
+    field: 'fax',
     sort: 'custom',
-    isForm: false,
+  },
+  {
+    label: '采购员',
+    field: 'purchaser',
+    sort: 'custom',
+  },
+  {
+    label: '供应商编号',
+    field: 'supplierNumber',
+    sort: 'custom',
+  },
+  {
+    label: '供应商名称',
+    field: 'supplierName',
+    sort: 'custom',
+  },
+  {
+    label: '供应商地址',
+    field: 'supplierAddress',
+    sort: 'custom',
+  },
+  {
+    label: '发货至',
+    field: 'shipTo',
+    sort: 'custom',
+  },
+  {
+    label: '开票至',
+    field: 'invoiceTo',
+    sort: 'custom',
+  },
+  {
+    label: '联系人',
+    field: 'contacts',
+    sort: 'custom',
+  },
+  {
+    label: '联系电话',
+    field: 'contactsPhone',
+    sort: 'custom',
+  },
+  {
+    label: '付款方式',
+    field: 'paymentType',
+    sort: 'custom',
+    form: {
+      component: 'Select'
+    },
+  },
+  {
+    label: '注册地',
+    field: 'registLocation',
+    sort: 'custom',
+  },
+  {
+    label: '开户行',
+    field: 'bank',
+    sort: 'custom',
+  },
+  {
+    label: '账号',
+    field: 'account',
+    sort: 'custom',
+  },
+  {
+    label: '税号',
+    field: 'dutyParagraph',
+    sort: 'custom',
+  },
+ {
+    label: '是否关闭',
+    field: 'available',
+    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: 'FALSE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
   },
   {
     label: '状态',
@@ -51,6 +146,12 @@ export const ItemOrderMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: true,
     tableForm: {
       type: 'Select'
+    },
+    form: {
+      value: 'INCOMPLETE',
+     componentProps: {
+       disabled: true,
+     }
     }
   },
   {