From 4e647590efeee63e09997e75a5e65dad68a8da11 Mon Sep 17 00:00:00 2001
From: "YEJIAXING-PC\\lenovo" <591141169@qq.com>
Date: Fri, 1 Nov 2024 16:47:07 +0800
Subject: [PATCH] =?UTF-8?q?WMS=E7=9A=84=E9=87=87=E8=B4=AD=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E8=A6=81=E5=92=8CSCP=E4=B8=80=E8=87=B4=20=20=20YT-560?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchaseMainWms/purchaseMain.data.ts      | 136 ++++++++++--------
 1 file changed, 76 insertions(+), 60 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMainWms/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMainWms/purchaseMain.data.ts
index 25ce89d60..e320c6590 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMainWms/purchaseMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMainWms/purchaseMain.data.ts
@@ -56,7 +56,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-   {
+  {
     label: '订单类型',
     field: 'type',
     dictType: DICT_TYPE.PURCHASE_ORDER_TYPE,
@@ -69,19 +69,14 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料类型',
-    field: 'itemTypeList',
-    dictType: DICT_TYPE.ITEM_TYPE,
-    dictClass: 'string',
-    isTable: false,
-    isForm: false,
+    label: '行类型',
+    field: 'poLineType',
+    isTable: true,
     isSearch: true,
     sort: 'custom',
-    search: {
-      componentProps: {
-        multiple: true,//多选
-      }
-    }
+    table: {
+      width: 150
+    },
   },
   {
     label: '状态',
@@ -291,7 +286,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '创建时间',
     field: 'createTime',
-    isTable:true,
+    isTable:false,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -554,6 +549,26 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
       precision: 6
     },
   },
+  {
+    label: '默认收货库区',
+    field: 'defaultAreaCode',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    isTable: true,
+  },
+  {
+    label: '库区描述',
+    field: 'areaDescription',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    isTable: true,
+  },
   // {
   //   label: 'ERP库位',
   //   field: 'erpLocationCode',
@@ -821,16 +836,6 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
       min: 0
     }
   },
-  {
-    label: '创建者',
-    field: 'creator',
-    isTableForm: false,
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isForm: false,
-  },
   {
     label: '创建时间',
     field: 'createTime',
@@ -843,7 +848,7 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    hiddenInMain:true,
+    hiddenInMain:false,
     isForm: false,
     form: {
       component: 'DatePicker',
@@ -856,48 +861,58 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '最后更新者',
-    field: 'updater',
-    isTableForm: false,
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isForm: false,
-    // form: {
-    //   component: 'DatePicker',
-    //   componentProps: {
-    //     style: {width:'100%'},
-    //     type: 'datetime',
-    //     dateFormat: 'YYYY-MM-DD HH:mm:ss',
-    //     valueFormat: 'x',
-    //   }
-    // }
-  },
-  {
-    label: '最后更新时间',
-    field: 'updateTime',
+    label: '创建者',
+    field: 'creator',
     isTableForm: false,
-    isTable: true,
-    hiddenInMain:true,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
     table: {
       width: 150
     },
+    hiddenInMain:false,
     isForm: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    }
   },
+  // {
+  //   label: '最后更新时间',
+  //   field: 'updateTime',
+  //   isTableForm: false,
+  //   isTable: true,
+  //   hiddenInMain:false,
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   table: {
+  //     width: 150
+  //   },
+  //   isForm: false,
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       style: {width:'100%'},
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   }
+  // },
+  // {
+  //   label: '最后更新者',
+  //   field: 'updater',
+  //   isTableForm: false,
+  //   table: {
+  //     width: 150
+  //   },
+  //   hiddenInMain:false,
+  //   isForm: false,
+  //   // form: {
+  //   //   component: 'DatePicker',
+  //   //   componentProps: {
+  //   //     style: {width:'100%'},
+  //   //     type: 'datetime',
+  //   //     dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //   //     valueFormat: 'x',
+  //   //   }
+  //   // }
+  // },
   {
     label: '备注',
     hiddenInMain:true,
@@ -912,6 +927,7 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'action',
     isDetail: false,
     isForm: false ,
+    isTable: false ,
     table: {
       width: 150,
       fixed: 'right'