From 8b3af8886ff543bf0d4c0b4309818e8ff60e96eb Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Mon, 25 Dec 2023 21:17:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=B1=95=E7=A4=BA=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customerreturnRequestMain.data.ts         | 57 +++++++++++++------
 1 file changed, 41 insertions(+), 16 deletions(-)

diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
index 9ca00d4f1..f2bff7b1d 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
@@ -5,6 +5,9 @@ import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
 import * as DeliverRecordMainApi from '@/api/wms/deliverRecordMain'
 import { DeliverRecordMain } from '../../deliver/deliverRecordMain/deliverRecordMain.data'
 
+import * as CustomerdockApi from '@/api/wms/customerdock'
+import { Customerdock } from '../../../basicDataManage/customerManage/customerdock/customerdock.data'
+
 import * as CarrierApi from '@/api/wms/carrier'
 import { Carrier } from '@/views/wms/basicDataManage/orderManage/carrier/carrier.data'
 
@@ -111,6 +114,22 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    // form: {
+    //   // labelMessage: '信息提示说明！！！',
+    //   componentProps: {
+    //     isSearchList: true, // 开启查询弹窗
+    //     searchListPlaceholder: '请选择客户月台代码', // 输入框占位文本
+    //     searchField: 'customerDockCode', // 查询弹窗赋值字段
+    //     searchTitle: '发货记录信息', // 查询弹窗标题
+    //     searchAllSchemas: Customerdock.allSchemas, // 查询弹窗所需类
+    //     searchPage: CustomerdockApi.getCustomerdockPage, // 查询弹窗所需分页方法
+    //     searchCondition: [{
+    //       key: 'available',
+    //       value: 'TRUE',
+    //       isMainValue: false
+    //     }]
+    //   }
+    // }
   },
   {
     label: '承运商',
@@ -483,6 +502,12 @@ export const CustomerreturnRequestMainRules = reactive({
   // toAreaCodes: [
   //   { required: true, message: '请选择到库区代码范围', trigger: 'change' }
   // ],
+  deliverRecordNumber: [
+    { required: true, message: '请选择发货记录单号', trigger: 'change' }
+  ],
+  // customerDockCode: [
+  //   { required: true, message: '请选择客户月台代码', trigger: 'change' }
+  // ],
   departmentCode: [
     { required: true, message: '请输入部门', trigger: 'blur' }
   ],
@@ -744,22 +769,22 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       }
     }
   },
-  {
-    label: '到库位代码',
-    field: 'toLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
+  // {
+  //   label: '到库位代码',
+  //   field: 'toLocationCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   tableForm: {
+  //     disabled: true
+  //   },
+  //   form: {
+  //     componentProps: {
+  //       disabled: true
+  //     }
+  //   }
+  // },
   {
     label: '库存状态',
     field: 'inventoryStatus',