From fe20fa14448a04a8904b25fa6ddc1894c7225a9b Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Thu, 4 Jan 2024 13:50:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=89=8D=E7=AB=AF=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customerreturnRequestMain.data.ts              |  7 +++++--
 .../deliver/deliverRequestMain/index.vue           | 14 +++++++++++---
 .../purchasereturnRequestMain/index.vue            |  1 -
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
index a70645bb3..f7340df87 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
@@ -491,8 +491,11 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
 
 //表单校验
 export const CustomerreturnRequestMainRules = reactive({
-  deliverRecordNumber: [
-    { required: true, message: '请选择发货记录单号', trigger: 'change' }
+  // deliverRecordNumber: [
+  //   { required: true, message: '请选择发货记录单号', trigger: 'change' }
+  // ],
+  customerCode: [
+    { required: true, message: '请选择客户代码', trigger: 'blur' }
   ],
   departmentCode: [
     { required: true, message: '请输入部门', trigger: 'blur' }
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
index 4dcf049c6..426f9b7b2 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
@@ -110,7 +110,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       row[formField] = val[0][searchField]
     } else {
       const setV = {}
-      setV[formField] = val[0][searchField]
+      setV[formField] = val[0][searchField]      
       if(formField == 'deliverPlanNumber') {
         setV['deliverPlanNumber'] = val[0]['number']
         setV['customerCode'] = val[0]['customerCode']
@@ -290,8 +290,16 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm =async (type: string, row?: number) => {
-  console.log(9999,row)
-  console.log(996669,type)
+  if(type == "update"){
+    DeliverRequestMain.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'deliverPlanNumber') {
+              item.componentProps.isSearchList = false
+            }
+          })       
+  }else {
+    item.componentProps.isSearchList = true,
+    item.componentProps.disabled = true
+  }
   tableData.value = [] // 重置明细数据
   formRef.value.open(type, row)
 }
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
index 535325963..1e2c76356 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
@@ -189,7 +189,6 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
             // item.fromLocationGroupCode = item.fromLocationGroupCode
           })
           isShowButton.value = false
-
           PurchasereturnRequestMain.allSchemas.formSchema.forEach((item) => {
             if (item.field == 'supplierCode') {
               item.componentProps.disabled = true