From b6681269afb2d60fa848b2805be29c9f1649c01e Mon Sep 17 00:00:00 2001
From: "YEJIAXING-PC\\lenovo" <591141169@qq.com>
Date: Tue, 5 Nov 2024 14:24:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=87=E8=B4=AD=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchaseMain/purchaseMain.data.ts         | 21 +++++++++++++++++++
 .../purchaseMainWms/purchaseMain.data.ts      | 21 +++++++++++++++++++
 .../purchasePlanMain/index.vue                |  3 +++
 .../purchasePlanMain/purchasePlanMain.data.ts |  7 +++----
 4 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
index 0e616fd50..f4f225edb 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
@@ -161,6 +161,27 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '订单备注',
+    field: 'poRmks',
+    sort: 'custom',
+    isTable:true,
+    isForm:false,
+    table: {
+      width: 150
+    },
+  },
+
+  {
+    label: '管理编号',
+    field: 'poContract',
+    sort: 'custom',
+    isTable:true,
+    isForm:false,
+    table: {
+      width: 150
+    },
+  },
   {
     label: '版本',
     field: 'version',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMainWms/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMainWms/purchaseMain.data.ts
index e320c6590..e3cf86b8e 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMainWms/purchaseMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMainWms/purchaseMain.data.ts
@@ -161,6 +161,27 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '订单备注',
+    field: 'poRmks',
+    sort: 'custom',
+    isTable:true,
+    isForm:false,
+    table: {
+      width: 150
+    },
+  },
+
+  {
+    label: '管理编号',
+    field: 'poContract',
+    sort: 'custom',
+    isTable:true,
+    isForm:false,
+    table: {
+      width: 150
+    },
+  },
   {
     label: '版本',
     field: 'version',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index 8dbb10346..201131398 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -967,5 +967,8 @@ const handleSelectionPublish = async ()=>{
   onMounted(async () => {
     getList()
     importTemplateData.templateUrl = await PurchasePlanMainApi.importTemplate()
+    nextTick(()=>{
+      tableColumns.value=tableColumns.value.filter(item=>item.field!='shippedQty'&&item.field!='notReceiveQty')
+    })
   })
 </script>
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
index a4e456d4d..c549d0364 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
@@ -808,9 +808,8 @@ export const PurchasePlanDetail = useCrudSchemas(
       table: {
         width: 150
       },
-      isTableForm: false,
       isForm: false,
-      isTable: false
+      isTable: true,
     },
 
     {
@@ -821,9 +820,9 @@ export const PurchasePlanDetail = useCrudSchemas(
         width: 150
       },
       isTableForm: false,
+      sortTableDefault: 7,
       isForm: false,
-      isTable: false,
-      sortTableDefault: 7
+      isTable: true,
     },
     {
       label: '计量单位',