From 1dc6ba0aebd5978ff37b25bce9911db14ae71816 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Fri, 26 Jul 2024 14:06:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E6=96=99=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../issueRecordMain/issueRecordMain.data.ts   | 26 ++++++++++++++++---
 .../issueRequestMain/issueRequestMain.data.ts | 15 ++++++-----
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts b/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts
index 5e39ab54b..d497d850c 100644
--- a/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts
@@ -473,8 +473,8 @@ export const IssueRecordDetail = useCrudSchemas(
       hiddenInMain: true
     },
     {
-      label: '包装规格',
-      field: 'packUnit',
+      label: '从包装规格',
+      field: 'fromPackUnit',
       sort: 'custom',
       table: {
         width: 150
@@ -482,8 +482,26 @@ export const IssueRecordDetail = useCrudSchemas(
       sortTableDefault: 8
     },
     {
-      label: '包装数量',
-      field: 'packQty',
+      label: '到包装规格',
+      field: 'toPackUnit',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 8
+    },
+    {
+      label: '从包装数量',
+      field: 'fromPackQty',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 8
+    },
+    {
+      label: '到包装数量',
+      field: 'toPackQty',
       sort: 'custom',
       table: {
         width: 150
diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
index b02157b91..e752763d6 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
@@ -314,7 +314,8 @@ export const IssueRequestMain = useCrudSchemas(
         width: 150
       },
       form: {
-        component: 'Select'
+        component: 'Select',
+        value: '1'
       }
     },
     {
@@ -905,7 +906,7 @@ export const IssueRequestDetail = useCrudSchemas(
       tableForm: {
         isInpuFocusShow: true,
         searchListPlaceholder: '请选择包装规格', // 输入框占位文本
-        searchField: 'itemCode', // 查询弹窗赋值字段
+        searchField: 'packUnit', // 查询弹窗赋值字段
         searchTitle: '物料包装信息', // 查询弹窗标题
         searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
         searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法
@@ -959,7 +960,6 @@ export const IssueRequestDetail = useCrudSchemas(
       table: {
         width: 150
       },
-      hiddenInMain: true,
       tableForm: {
         disabled:true,
         type: 'InputNumber',
@@ -990,7 +990,7 @@ export const IssueRequestDetail = useCrudSchemas(
       form: {
         component: 'InputNumber',
         componentProps: {
-          min: 0,
+          min: 1,
           precision: 0
         }
       }
@@ -1285,8 +1285,8 @@ export const IssueRequestDetailRules = reactive({
     { required: true, message: '请输入到库位代码', trigger: 'blur' }
   ],
   qty1: [
-    { required: true, message: '请输入包装数量', trigger: 'blur' },
-    { min: true, message: '包装数量不能小于1', trigger: 'blur' }
+    { required: true, message: '请输入包装数量', trigger: 'change' },
+    // { min: 0, message: '包装数量不能小于1', trigger: 'blur' }
   ],
   qty: [
     { required: true, message: '请输入数量', trigger: 'blur' }
@@ -1297,4 +1297,7 @@ export const IssueRequestDetailRules = reactive({
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: 'change' }
+  ]
 })