From f084a0dd096d87f9344a4dc0c7dfc6c16f612757 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Sun, 18 Feb 2024 14:23:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8C=85=E8=A3=85=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=94=A8=E6=88=B7=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverRequestMain/index.vue      |   6 +
 .../supplierdeliverRequestMain.data.ts        | 124 +++++++++++-------
 2 files changed, 80 insertions(+), 50 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index cda77e7ab..a39d843d3 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -136,6 +136,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
         row['orderQty'] = val[0]['orderQty']
         row['uom'] = val[0]['uom']
       }
+      if (formField == 'packQty'){
+        row['packUnit'] = val[0]['packUnit']
+      }
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
@@ -163,6 +166,9 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
       setV['poLine'] = val[0]['poLine']
       setV['uom'] = val[0]['uom']
     }
+    if (formField == 'packQty'){
+      setV['packUnit'] = val[0]['packUnit']
+      }
     formRef.setValues(setV)
   })
 }
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 0a451fd16..7957a5e3e 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -2,18 +2,16 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 import * as SupplierApi from '@/api/wms/supplier'
 import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
-const { t } = useI18n() // 国际化
 import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
-import * as ItembasicApi from '@/api/wms/itembasic'
-import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
 // import { PurchasePlanMain } from '../purchasePlanMain/purchasePlanMain.data'
 import * as PurchasePlanMainApi from '@/api/wms/purchasePlanMain'
 import * as PurchasePlanDetailApi from '@/api/wms/purchasePlanDetail'
-import * as PurchaseMainApi from '@/api/wms/purchaseMain'
-import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
-import { PurchaseDetail, PurchaseMain } from '../purchaseMain/purchaseMain.data'
 import { PurchasePlanDetail, PurchasePlanMain } from '../purchasePlanMain/purchasePlanMain.data'
 import { validateHanset, validateEmail } from '@/utils/validator'
+import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts'
+import * as ItemPackageApi from '@/api/wms/itempackage/index'
+
+const { t } = useI18n() // 国际化
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
 const queryParams = {
@@ -698,7 +696,6 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         }]
     }
   },
-
   {
     label: '订单行',
     field: 'poLine',
@@ -736,44 +733,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       precision: 6
     }
   },
-  {
-    label: '包装数量',
-    field: 'packQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 1,
-        precision: 6
-      }
-    },
-    isTableForm: false,
-    isForm: false,
-    tableForm: {
-      type: 'InputNumber',
-      min: 1,
-      precision: 6
-    }
-  },
-  {
-    label: '包装规格',
-    field: 'packUnit',
-    dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false,
-    tableForm: {
-      type: 'Select'
-    }
-  },
+  
   {
     label: '供应商计量数量',
     field: 'supplierPackQty',
@@ -846,7 +806,6 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       }
     }
   },
-
   {
     label: '物料代码',
     field: 'itemCode',
@@ -878,7 +837,6 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       type: 'Select'
     }
   },
-
   {
     label: '数量',
     field: 'qty',
@@ -899,14 +857,72 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       precision: 6
     }
   },
-
   {
-    label: '备注',
-    field: 'remark',
+    label: '包装数量',
+    field: 'packQty',
     sort: 'custom',
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择包装',
+        searchField: 'packQty',
+        searchTitle: '物品包装信息',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItemPackageApi.getItempackagingPage,
+        searchCondition: [
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请选择订单行',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+
+        ]
+      }
+    },
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择包装',
+      searchField: 'packQty',
+      searchTitle: '物品包装信息',
+      searchAllSchemas: Itempackaging.allSchemas,
+      searchPage: ItemPackageApi.getItempackagingPage,
+      searchCondition: [
+        {
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请选择订单行',
+          isMainValue: true
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    }
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150,
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '从货主代码',
@@ -1034,6 +1050,14 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isTableForm: false,
     isForm: false,
   },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '操作',
     field: 'action',