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,111 +1,134 @@
 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[]>([
-  {
-    label: '供应商代码',
-    field: 'supplierCode',
-    sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '品番',
-    field: 'itemCode',
-    sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '受入号',
-    field: 'model',
-    sort: 'custom',
-  },
-  {
-    label: '数量',
-    field: 'qty',
-    sort: 'custom',
-  },
-  {
-    label: '消耗时间',
-    field: 'consumeTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
+export const ItemcodeConsumeRecord = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '供应商代码',
+      field: 'supplierCode',
+      sort: 'custom',
+      isSearch: true
+    },
+    {
+      label: '品番',
+      field: 'itemCode',
+      sort: 'custom',
+      isSearch: true
+    },
+    {
+      label: '受入号',
+      field: 'model',
+      sort: 'custom'
+    },
+    {
+      label: '数量',
+      field: 'qty',
+      sort: 'custom'
+    },
+    {
+      label: '消耗时间',
+      field: 'consumeTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          valueFormat: 'x'
+        }
+      }
+    },
+    {
+      label: '日期',
+      field: 'deliDate',
+      sort: 'custom',
+      formatter: dateFormatter2,
+      isForm: false
+    },
+    {
+      label: '便次',
+      field: 'deliNo',
+      sort: 'custom',
+      isSearch: true
+    },
+    {
+      label: '业务类型',
+      field: 'businessType',
+      sort: 'custom',
+      form: {
+        component: 'SelectV2'
       }
     },
-  },
-  {
-    label: '业务类型',
-    field: 'businessType',
-    sort: 'custom',
-                form: {
-                  component: 'SelectV2'
-                },
-  },
-  {
-    label: '发料记录号',
-    field: 'issueRecordNumber',
-    sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '是否生成',
-    field: 'isGenerate',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isSearch:true,
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
+    {
+      label: '发料记录号',
+      field: 'issueRecordNumber',
+      sort: 'custom',
+      isSearch: true
+    },
+    {
+      label: '是否生成',
+      field: 'isGenerate',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isSearch: true,
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      }
     },
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    isSearch:true,
-    sort: 'custom',
-  },
-  // {
-  //   label: '是否可用默认TRUE',
-  //   field: 'available',
-  //   sort: 'custom',
-  // },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    {
+      label: '备注',
+      field: 'remark',
+      isSearch: true,
+      sort: 'custom'
     },
-    sort: 'custom',
-    table: {
-      width: 180
+    // {
+    //   label: '是否可用默认TRUE',
+    //   field: 'available',
+    //   sort: 'custom',
+    // },
+    {
+      label: '创建者',
+      field: 'creator',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isForm: false
     },
-    hiddenInMain: true,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x'
+    {
+      label: '创建时间',
+      field: 'createTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      hiddenInMain: true,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
       }
     }
-  },
-  // {
-  //   label: '操作',
-  //   field: 'action',
-  //   isForm: false,
-  //   table: {
-  //     width: 150,
-  //     fixed: 'right'
-  //   }
-  // }
-]))
+    // {
+    //   label: '操作',
+    //   field: 'action',
+    //   isForm: false,
+    //   table: {
+    //     width: 150,
+    //     fixed: 'right'
+    //   }
+    // }
+  ])
+)