From 17459b99d76a7dd26acaf6213edaa48b62bbb299 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Tue, 30 Jan 2024 16:41:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=80=80=E8=B4=A7=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=B1=95=E7=A4=BA=E5=AD=97=E6=AE=B5=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customerdock/customerdock.data.ts         | 18 +++++++++++++++
 .../customerreturnRequestMain.data.ts         |  4 ----
 .../customerreturnRequestMain/index.vue       | 12 ++++++++++
 .../deliverRequestMain.data.ts                | 22 +++++++++++++++++++
 .../deliver/deliverRequestMain/index.vue      |  7 ------
 5 files changed, 52 insertions(+), 11 deletions(-)

diff --git a/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts b/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts
index cd96b4c93..910c8407c 100644
--- a/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts
+++ b/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts
@@ -138,6 +138,24 @@ export const Customerdock = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位基础信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          action: '==',
+          isSearch: true,
+          isMainValue: false
+        }]
+      }
+    }
   },
   {
     label: '是否可用',
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
index 17622bc58..c54b29e97 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
@@ -84,10 +84,6 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        },{
-          key: 'customerCode',
-          value: 'customerCode',
-          isMainValue: false
         }]
       }
     }
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
index 735e0d9b5..13f291fa5 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
@@ -125,6 +125,18 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           }]
       }
     })
+    CustomerreturnRequestMain.allSchemas.formSchema.forEach(item => {
+      if(item.field == 'deliverRecordNumber') {
+        if(customerCode.value != null){
+          item.componentProps.searchCondition = [
+          {
+            key: 'customerCode',
+            value: customerCode.value ,
+            isMainValue: false
+          }]
+        }
+      }
+    })
 
     console.log(128, customerCode.value)
     if (type == 'tableForm') {
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
index 73324cdb5..f06754363 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
@@ -840,6 +840,28 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '计划数量',
+    field: 'planQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+  },
+  {
+    label: '已收货数量',
+    field: 'shippedQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    },
+  },
   {
     label: '创建时间',
     field: 'createTime',
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
index ef69eeaf7..a825db894 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
@@ -57,7 +57,6 @@
     @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
     :isShowButton = isShowButton
-    :isShowReduceButton = isShowButton
   />
 
   <!-- 详情 -->
@@ -175,9 +174,6 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           delete item.form.componentProps.searchCondition
         }
       })
-        }).catch(err => {
-          console.log(err)
-          message.error('错误')
         })
         if(formField == 'itemCode'){
           console.log( val[0]);
@@ -545,9 +541,6 @@ const resetShow = async () => {
       item.tableForm.isInpuFocusShow = true
       item.tableForm.disabled = false
     }
-    if(item.field == 'planQty') {
-      item.tableForm.disabled = false
-    }
     if(item.field == 'uom') {
       item.tableForm.disabled = false
     }