From 7abe970c51f2e4547d6aadac56d39e9969a7e55a Mon Sep 17 00:00:00 2001
From: zhaoyiran <yiran_zhao6@163.com>
Date: Mon, 18 Nov 2024 11:16:31 +0800
Subject: [PATCH] =?UTF-8?q?YT-1015=E3=80=81YT-1016=E3=80=81YT-1018?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../labelManage/purchasePackage/index.vue     | 14 ++++-
 .../purchasePackage/purchasePackage.data.ts   | 59 +++++++++++++++++--
 2 files changed, 66 insertions(+), 7 deletions(-)

diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue
index a888d8fbe..96d5f49b4 100644
--- a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue
@@ -125,9 +125,9 @@ const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row
           }
         })
       }
-    if (formField == 'supplierCode') {
-      setV['supplierName'] = val[0]['name']
-    }
+    // if (formField == 'supplierCode') {
+    //   setV['supplierName'] = val[0]['name']
+    // }
     if (formField == 'asnNumber') {
       setV['purchaseOrderRemarks'] = val[0]['remark']
     }
@@ -137,6 +137,13 @@ const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row
     }
     if (formField == 'packUnit') {
       setV['packQty'] = val[0]['packQty']
+    }
+    if (formField == 'productionLine') {
+      setV['productionLine'] = val[0]['productionLineCode']
+    }
+    if (formField == 'supplierCode') {
+      setV['supplierCode'] = val[0]['supplierCode']
+      setV['supplierName'] = val[0]['supplierName']
     }
       basicFormRef.setValues(setV)
   })
@@ -267,6 +274,7 @@ const openForm = (type: string, row?: number) => {
   if (type == 'create') {
     nextTick(() => {
       basicFormRef.value.formRef.formModel.batch = formatTime(new Date(), 'yyyyMMdd')
+      basicFormRef.value.formRef.formModel.deliveryDate = new Date().getTime()
     })
   }
 }
diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts
index e35cc5bcd..838b2edb9 100644
--- a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts
+++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts
@@ -12,6 +12,16 @@ import * as SupplierdeliverRecordMainApi from "@/api/wms/supplierdeliverRecordMa
 import * as ItemPackageApi from "@/api/wms/itempackage";
 import {Itempackaging} from "@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data";
 import {validatePositiveNumber} from "@/utils/validator";
+import {
+  Productionlineitem
+} from "@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data";
+import {getProductionlineitemPage} from "@/api/wms/productionlineitem";
+import * as ProductionlineitemApi from "@/api/wms/productionlineitem";
+import {
+  Supplieritem
+} from "@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data";
+import {getSupplieritemPage} from "@/api/wms/supplieritem";
+import * as SupplieritemApi from "@/api/wms/supplieritem";
 
 // 表单校验
 export const PackageRules = reactive({
@@ -389,6 +399,31 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        enterSearch: true,
+        disabled: true,
+        isSearchList: true,
+        searchListPlaceholder: '请选择生产线区分',
+        searchField: 'packUnit',
+        searchTitle: '生产线',
+        searchAllSchemas: Productionlineitem.allSchemas,
+        searchPage: ProductionlineitemApi.getProductionlineitemPage,
+        searchCondition: [
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请选择物料代码',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+        ]
+      }
+    }
   },
   {
     label: '物料状态',
@@ -420,15 +455,22 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
         searchListPlaceholder: '请选择供应商代码',
         searchField: 'code',
         searchTitle: '供应商信息',
-        searchAllSchemas: Supplier.allSchemas,
-        searchPage: SupplierApi.getSupplierPage,
-        searchCondition: [{
+        searchAllSchemas: Supplieritem.allSchemas,
+        searchPage: SupplieritemApi.getSupplieritemPage,
+        searchCondition: [
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请选择物料代码',
+            isMainValue: true
+          },
+          {
           key: 'available',
           value: 'TRUE',
           isMainValue: false
         }],
         verificationParams: [{
-          key: 'code',
+          key: 'supplierCode',
           action: '==',
           value: '',
           isMainValue: false,
@@ -603,6 +645,15 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
 ]))
 
 //表单校验