From 81848fbe80c4e053282c26a8ed7018c9068747ae Mon Sep 17 00:00:00 2001
From: liuchen864 <23082234@qq.com>
Date: Wed, 29 May 2024 09:41:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue           |  1 +
 src/views/qms/sampleCode/sampleCode.data.ts          |  4 ++--
 .../supplierdeliverRequestMain/index.vue             |  1 +
 .../supplierdeliverRequestMain.data.ts               | 12 +++++++++---
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 714c529a0..5ca7737c2 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -725,6 +725,7 @@ const inpuFocus = (headerItem, row, index) => {
  * @param cur 改变后值
  */
 const onChange = (field, cur) => {
+  console.log(2222222222222)
   emit('onChange', field, cur, formRef)
 }
 
diff --git a/src/views/qms/sampleCode/sampleCode.data.ts b/src/views/qms/sampleCode/sampleCode.data.ts
index 4d1228a15..5c9b96ee3 100644
--- a/src/views/qms/sampleCode/sampleCode.data.ts
+++ b/src/views/qms/sampleCode/sampleCode.data.ts
@@ -19,7 +19,7 @@ export const SampleCodeRules = reactive({
 const samplingSchemeList = await getSamplingScheme()
 export const SampleCode = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '采样方案',
+    label: '采样方案编码',
     field: 'code',
     sort: 'custom',
     isSearch: true,
@@ -28,7 +28,7 @@ export const SampleCode = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         options: samplingSchemeList,
         optionsAlias: {
-          labelField: 'description',
+          labelField: 'code',
           valueField: 'code'
         },
       }
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 7433e2f4d..02cda2ab7 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -342,6 +342,7 @@ const searchTableSuccessLabel = (formField, searchField, val, formRef, type, row
       if (formField == 'secondPackUnit') {
         row['secondPackUnit'] = val[0]['packUnit']
         row['secondPackQty'] = val[0]['packQty']
+      SupplierdeliverRequestDetailRules.secondPackQty[0].required = true
       }
     } 
   })
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index fd000436c..501469f91 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -1114,6 +1114,13 @@ export const SupplierdeliverRequestDetailRules = reactive({
   packUnit: [
     { required: true, message: '请选择包装规格', trigger: 'change' }
   ],
+  secondPackUnit: [
+    { required: false, message: '请选择包装规格2', trigger: 'change' }
+  ],
+  secondPackQty: [
+    { required: false, message: '请输入包装数量2', trigger: 'blur' },
+    { validator: validateInteger, message: '请输入正确的整数', trigger: 'blur' }
+  ],
   convertRate: [
     { required: true, message: '请输入转换率', trigger: 'blur' }
   ],
@@ -1123,7 +1130,7 @@ export const SupplierdeliverRequestDetailRules = reactive({
   remark: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
-  secondPackQty:[{ validator:validateInteger, message: '请输入正确的整数', trigger: 'blur'}]
+  // secondPackQty:[{ validator:validateInteger, message: '请输入正确的整数', trigger: 'blur'}]
 })
 
 export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([
@@ -1157,6 +1164,7 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
         type: 'date',
         dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
+        
       }
     },
     tableForm: {
@@ -1526,7 +1534,6 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
       }
     },
     tableForm: {
-      // disabled: true,
     }
   },
   {
@@ -1595,7 +1602,6 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
       }
     },
     tableForm: {
-      // disabled: true,
     }
   },
   {