Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex

src/views/wms/issueManage/itemcodeConsumeRecord/itemcodeConsumeRecord.data.ts

@@ -1,32 +1,32 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
 
 // 表单校验
-export const ItemcodeConsumeRecordRules = reactive({
+export const ItemcodeConsumeRecordRules = reactive({})
-})
 
-export const ItemcodeConsumeRecord = useCrudSchemas(reactive<CrudSchema[]>([
+export const ItemcodeConsumeRecord = useCrudSchemas(
+  reactive<CrudSchema[]>([
     {
       label: '供应商代码',
       field: 'supplierCode',
       sort: 'custom',
-    isSearch: true,
+      isSearch: true
     },
     {
       label: '品番',
       field: 'itemCode',
       sort: 'custom',
-    isSearch: true,
+      isSearch: true
     },
     {
       label: '受入号',
       field: 'model',
-    sort: 'custom',
+      sort: 'custom'
     },
     {
       label: '数量',
       field: 'qty',
-    sort: 'custom',
+      sort: 'custom'
     },
     {
       label: '消耗时间',
@@ -39,7 +39,20 @@ export const ItemcodeConsumeRecord = useCrudSchemas(reactive<CrudSchema[]>([
           type: 'datetime',
           valueFormat: 'x'
         }
+      }
+    },
+    {
+      label: '日期',
+      field: 'deliDate',
+      sort: 'custom',
+      formatter: dateFormatter2,
+      isForm: false
     },
+    {
+      label: '便次',
+      field: 'deliNo',
+      sort: 'custom',
+      isSearch: true
     },
     {
       label: '业务类型',
@@ -47,13 +60,13 @@ export const ItemcodeConsumeRecord = useCrudSchemas(reactive<CrudSchema[]>([
       sort: 'custom',
       form: {
         component: 'SelectV2'
-                },
+      }
     },
     {
       label: '发料记录号',
       field: 'issueRecordNumber',
       sort: 'custom',
-    isSearch: true,
+      isSearch: true
     },
     {
       label: '是否生成',
@@ -65,19 +78,28 @@ export const ItemcodeConsumeRecord = useCrudSchemas(reactive<CrudSchema[]>([
       sort: 'custom',
       table: {
         width: 150
-    },
+      }
     },
     {
       label: '备注',
       field: 'remark',
       isSearch: true,
-    sort: 'custom',
+      sort: 'custom'
     },
     // {
     //   label: '是否可用默认TRUE',
     //   field: 'available',
     //   sort: 'custom',
     // },
+    {
+      label: '创建者',
+      field: 'creator',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isForm: false
+    },
     {
       label: '创建时间',
       field: 'createTime',
@@ -98,7 +120,7 @@ export const ItemcodeConsumeRecord = useCrudSchemas(reactive<CrudSchema[]>([
           valueFormat: 'x'
         }
       }
-  },
+    }
     // {
     //   label: '操作',
     //   field: 'action',
@@ -108,4 +130,5 @@ export const ItemcodeConsumeRecord = useCrudSchemas(reactive<CrudSchema[]>([
     //     fixed: 'right'
     //   }
     // }
-]))
+  ])
+)