From 94b8517e04962d6f38353cef6285b212527b5880 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 11 Dec 2024 16:48:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasePlanMain/purchasePlanMain.data.ts | 140 +++++++++++-------
 1 file changed, 84 insertions(+), 56 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
index c3dd44e4d..846bd43f2 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
@@ -268,7 +268,7 @@ export const PurchasePlanMain = useCrudSchemas(
         width: 150
       },
       isTable: false,
-      isForm: false
+      isForm: false,
     },
     {
       label: '仓库代码',
@@ -278,7 +278,7 @@ export const PurchasePlanMain = useCrudSchemas(
         width: 150
       },
       isTable: false,
-      isForm: false
+      isForm: false,
     },
     {
       label: '月台代码',
@@ -288,7 +288,7 @@ export const PurchasePlanMain = useCrudSchemas(
         width: 150
       },
       isForm: false,
-      isTable: false
+      isTable: false,
     },
     {
       label: '业务类型',
@@ -304,7 +304,7 @@ export const PurchasePlanMain = useCrudSchemas(
         componentProps: {
           disabled: true
         }
-      }
+      },
     },
     {
       label: '班次',
@@ -312,7 +312,6 @@ export const PurchasePlanMain = useCrudSchemas(
       sort: 'custom',
       isTable: false,
       isForm: false,
-      sortTableDefault: 14,
       table: {
         width: 150
       },
@@ -644,8 +643,7 @@ export const PurchasePlanDetail = useCrudSchemas(
       table: {
         width: 150
       },
-      sortTableDefault: 12,
-      hiddenInMain: true,
+      sortTableDefault: 16,
       form: {
         // labelMessage: '信息提示说明！！！',
         componentProps: {
@@ -703,6 +701,7 @@ export const PurchasePlanDetail = useCrudSchemas(
         width: 150
       },
       sortSearchDefault: 5,
+      sortTableDefault: 17,
       isSearch: true,
       form: {
         componentProps: {
@@ -745,9 +744,10 @@ export const PurchasePlanDetail = useCrudSchemas(
       table: {
         width: 150
       },
+      sortTableDefault: 18,
       isTableForm: false,
       isForm: false,
-      isTable: false,
+      isTable: true,
       isDetail:false
     },
     {
@@ -758,6 +758,7 @@ export const PurchasePlanDetail = useCrudSchemas(
       dictClass: 'string',
       isTable: true,
       sortSearchDefault: 10,
+      sortTableDefault: 19,
       hiddenInMain: true,
       table: {
         width: 150
@@ -772,11 +773,31 @@ export const PurchasePlanDetail = useCrudSchemas(
         disabled: true
       }
     },
+    {
+      label: '默认收货库区',
+      field: 'defaultAreaCode',
+      table: {
+        width: 150
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      tableForm: {
+        disabled: true
+      },
+      isTableForm: true,
+      isForm: true,
+      isTable: true,
+      hiddenInMain: true,
+    },
     {
       label: '受入号',
       field: 'receivedNumber',
       sort: 'custom',
       sortSearchDefault: 7,
+      sortTableDefault: 20,
       table: {
         width: 150
       },
@@ -793,11 +814,30 @@ export const PurchasePlanDetail = useCrudSchemas(
         disabled: true
       }
     },
+    {
+      label: '订单数量',
+      field: 'orderQty',
+      sort: 'custom',
+      sortSearchDefault: 8,
+      sortTableDefault:23,
+      table: {
+        width: 150
+      },
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
+      tableForm: {
+        disabled: true
+      }
+    },
     {
       label: '计划采购数量',
       field: 'planQty',
       sort: 'custom',
       sortSearchDefault: 9,
+      sortTableDefault: 21,
       table: {
         width: 150
       },
@@ -813,34 +853,33 @@ export const PurchasePlanDetail = useCrudSchemas(
         }
       }
     },
-
     {
-      label: '计划采购计量单位',
-      field: 'uom',
+      label: '采购标包数量',
+      field: 'purchaseStdQty',
       sort: 'custom',
-      dictType: DICT_TYPE.UOM,
-      dictClass: 'string',
-      isTable: false,
-      sortSearchDefault: 10,
-      hiddenInMain: true,
+      sortSearchDefault: 8,
+      sortTableDefault:24,
+      isForm: false,
+      isSearch: false,
+      isTableForm: true,
       table: {
         width: 150
       },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      },
       tableForm: {
-        type: 'Select',
-        disabled: true
+        disabled:true
       }
     },
     {
-      label: '订单数量',
-      field: 'orderQty',
+      label: '计划采购计量单位',
+      field: 'uom',
       sort: 'custom',
-      sortSearchDefault: 8,
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string',
+      isTable: false,
+      isTableForm: false,
+      sortSearchDefault: 10,
+      sortTableDefault:22,
+      hiddenInMain: true,
       table: {
         width: 150
       },
@@ -850,35 +889,42 @@ export const PurchasePlanDetail = useCrudSchemas(
         }
       },
       tableForm: {
+        type: 'Select',
         disabled: true
       }
     },
-    {
-      label: '采购标包数量',
-      field: 'purchaseStdQty',
-      sort: 'custom',
-      sortSearchDefault: 8,
-      isForm: false,
-      isSearch: false,
-      isTableForm: false,
-    },
+   
     {
       label: '采购计量单位',
       field: 'purchaseStdUom',
       dictType: DICT_TYPE.UOM,
       sort: 'custom',
       sortSearchDefault: 9,
+      sortTableDefault:25,
       isForm: false,
       isSearch: false,
-      isTableForm: false,
+      isTableForm: true,
+      table: {
+        width: 150
+      },
+      tableForm: {
+        disabled: true
+      }
     },
     {
       label: '转换率',
       field: 'conventRate',
       sort: 'custom',
       sortSearchDefault: 9,
+      sortTableDefault: 26,
       isForm: false,
       isSearch: false,
+      table: {
+        width: 150
+      },
+      tableForm: {
+        disabled: true
+      }
     },
     {
       label: '已发货数量',
@@ -920,25 +966,7 @@ export const PurchasePlanDetail = useCrudSchemas(
       isTable: true,
       hiddenInMain: true,
     },
-    {
-      label: '默认收货库区',
-      field: 'defaultAreaCode',
-      table: {
-        width: 150
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
-      },
-      tableForm: {
-        disabled: true
-      },
-      isTableForm: true,
-      isForm: true,
-      isTable: true,
-      hiddenInMain: true,
-    },
+   
     {
       label: '库区描述',
       field: 'areaDescription',
@@ -953,7 +981,7 @@ export const PurchasePlanDetail = useCrudSchemas(
       tableForm: {
         disabled: true
       },
-      isTableForm: true,
+      isTableForm: false,
       isForm: true,
       isTable: false,
       hiddenInMain: true,