From 250a8119259e493b53baaf7605cf8e1d057242a8 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Fri, 14 Jun 2024 16:53:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug=E5=8F=91=E8=B4=A7?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deliverPlanMain/deliverPlanMain.data.ts   | 34 +++++++++----------
 .../saleShipmentMainRequest/index.vue         |  4 +--
 .../saleShipmentMain.data.ts                  |  5 ++-
 3 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
index ca6a09608..9e966e926 100644
--- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
@@ -123,7 +123,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
         searchField: 'code',
         searchTitle: '客户月台基础信息',
         searchAllSchemas: Customerdock.allSchemas,
-        searchPage: CustomerDockApi.pageCustomerCodeToCustomerDock,
+        searchPage: CustomerDockApi.getCustomerdockPage,
         searchCondition: [{
           key: 'available',
           value: 'TRUE',
@@ -136,22 +136,22 @@ export const DeliverPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
-  {
-    label: '到仓库',
-    field: 'toWarehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: true,
-    isTableForm:false,
-    isDetail:false,
-    form: {
-      componentProps: {
-        disabled:true
-      }
-    }
-  },
+  // {
+  //   label: '到仓库',
+  //   field: 'toWarehouseCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isForm: true,
+  //   isTableForm:false,
+  //   isDetail:false,
+  //   form: {
+  //     componentProps: {
+  //       disabled:true
+  //     }
+  //   }
+  // },
   {
     label: '到库位',
     field: 'toLocationCode',
diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
index 3a9d13a1d..a2e6ee052 100644
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
@@ -220,9 +220,9 @@ const butttondata = (row,$index) => {
     return []
   }
     return [
-  defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:sale-shipment-main-request:update'}), // 编辑
+  defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1','4']),hasPermi:'wms:sale-shipment-main-request:update'}), // 编辑
   defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:sale-shipment-main-request:close'}), // 关闭
-  defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:sale-shipment-main-request:reAdd'}), //重新添加
+  defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:sale-shipment-main-request:reAdd'}), //重新添加
   defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:sale-shipment-main-request:submit'}), // 提交审批
   defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:sale-shipment-main-request:refused'}), // 驳回
   defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:sale-shipment-main-request:agree'}), // 审批通过
diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts
index 0655ce008..b61c881fe 100644
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts
@@ -254,7 +254,10 @@ export const SaleShipmentDetailRules = reactive({
     { required: true, message: '请选择订单行', trigger: 'blur' }
   ],
   fromLocationCode: [
-    { required: true, message: '请输选择客户库位', trigger: 'blur' }
+    { required: true, message: '请选择客户库位', trigger: 'blur' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
   ],
   qty: [
     { required: true, message: '请输入开票数量', trigger: 'blur' }