From 48e2a1a3c952ffae42d597722c44a330337b7122 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Wed, 17 Jan 2024 11:40:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E8=AE=A1=E5=88=92=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=AE=A2=E6=88=B7=E6=9C=88=E5=8F=B0=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierManage/purchaseprice/index.vue    |  1 -
 .../deliverPlanMain/deliverPlanMain.data.ts   | 24 ++++++++++++++++++-
 .../inventorychangeRequestMain/index.vue      |  3 ++-
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue b/src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue
index 12a562ceb..416a853d2 100644
--- a/src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue
+++ b/src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue
@@ -55,7 +55,6 @@
 
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/wms/purchaseprice/import" :importTemplateData="importTemplateData" @success="importSuccess" 
-  :mode="2"
    />
 </template>
 
diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
index 83ee6eb79..977980018 100644
--- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
@@ -4,6 +4,9 @@ import { dateFormatter } from '@/utils/formatTime'
 import * as CustomerApi from '@/api/wms/customer'
 import { Customer } from '@/views/wms/basicDataManage/customerManage/customer/customer.data'
 
+import * as CustomerDockApi from '@/api/wms/customerdock'
+import { Customerdock } from '@/views/wms/basicDataManage/customerManage/customerdock/customerdock.data'
+
 import * as SaleMainApi from '@/api/wms/saleMain'
 import * as SaleDetailApi from '@/api/wms/saleDetail'
 import { SaleDetail, SaleMain } from '../saleMain/saleMain.data'
@@ -320,7 +323,23 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isTableForm: false,
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择物料代码',
+      searchField: 'code',
+      searchTitle: '物料基础信息',
+      searchAllSchemas: Customerdock.allSchemas,
+      searchPage: CustomerDockApi.getCustomerdockPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'customerCode',
+        value: 'customerCode',
+        isMainValue: true
+    }]
+    },
     isForm: false,
   },
   {
@@ -533,6 +552,9 @@ export const DeliverPlanDetailRules = reactive({
   number: [
     { required: true, message: '请输入单据号', trigger: 'blur' }
   ],
+  customerDockCode: [
+    { required: true, message: '请选择客户月台代码', trigger: 'blur' }
+  ],
   itemCode: [
     { required: true, message: '请选择物料代码', trigger: 'change' }
   ],
diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
index e5457f191..db8e46e7f 100644
--- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
@@ -373,7 +373,8 @@ const submitForm = async (formType, data) => {
       return;
     }
   })
-  if(flag){
+  if(flag.value){
+    formRef.value.formLoading = false
     return
   }
   try {