From 6bd5cb2c3fd93c968870f8c1c78ec7210b4cbb81 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Tue, 27 Feb 2024 14:20:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=80=81=E8=BE=BE=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E7=AA=97=E5=AD=97=E6=AE=B5=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/purchasePlanMain/index.ts         |  5 ++
 .../purchasePlanMain/index.vue                | 23 +++++--
 .../purchasePlanMain/purchasePlanMain.data.ts | 67 +++++++++++++------
 3 files changed, 72 insertions(+), 23 deletions(-)

diff --git a/src/api/wms/purchasePlanMain/index.ts b/src/api/wms/purchasePlanMain/index.ts
index 614cd6a95..167e3ffd6 100644
--- a/src/api/wms/purchasePlanMain/index.ts
+++ b/src/api/wms/purchasePlanMain/index.ts
@@ -90,3 +90,8 @@ export const exportPurchasePlanMain = async (params) => {
 export const importTemplate = () => {
   return request.download({ url: '/wms/purchase-plan-main/get-import-template' })
 }
+
+// 查询要货计划策略根据供应商
+export const queryPurchasePlan = async (supplierCode: string) => {
+  return await request.get({ url: `/wms/purchase-plan-main/queryPurchasePlan?supplierCode=` + supplierCode })
+}
\ No newline at end of file
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index 856b77acc..157816868 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -27,9 +27,12 @@
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <BasicForm ref="formRef" @success="getList" :rules="PurchasePlanMainRules"
-    :formAllSchemas="PurchasePlanMain.allSchemas" :tableAllSchemas="PurchasePlanDetail.allSchemas"
-    :tableFormRules="PurchasePlanDetailRules" :tableData="tableData"
+  <BasicForm ref="formRef" @success="getList" 
+    :rules="PurchasePlanMainRules"
+    :formAllSchemas="PurchasePlanMain.allSchemas" 
+    :tableAllSchemas="PurchasePlanDetail.allSchemas"
+    :tableFormRules="PurchasePlanDetailRules" 
+    :tableData="tableData"
     :apiUpdate="PurchasePlanMainApi.updatePurchasePlanMain" 
     :apiCreate="PurchasePlanMainApi.createPurchasePlanMain"
     :isBusiness="true" 
@@ -68,7 +71,6 @@
   import * as PurchasePlanDetailApi from '@/api/wms/purchasePlanDetail'
   import * as defaultButtons from '@/utils/disposition/defaultButtons'
   import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
-  import {mainListPurchasePlanModBtn} from "@/utils/disposition/defaultButtons";
 
   // 要货计划
   defineOptions({ name: 'PurchasePlanMain' })
@@ -108,6 +110,19 @@
         setV['itemCode'] = val[0]['code']
         setV['poNumber'] = val[0]['number']
         setV['poLine'] = val[0]['lineNumber']
+        if(formField == 'supplierCode'){
+          setV['supplierCode'] = val[0]['code']
+          await PurchasePlanMainApi.queryPurchasePlan(val[0]['code']).then(res => {
+            let beginTime = res.beginTime
+            var ms = beginTime.substring(0, 2)
+		        var me = beginTime.substring(3)
+            setV['beginTime'] = new Date(2024, 1, 1, Number(ms), Number(me))
+            let endTime = res.endTime
+            var ms = endTime.substring(0, 2)
+		        var me = endTime.substring(3)
+            setV['endTime'] = new Date(2024, 1, 1, Number(ms), Number(me))
+          })
+        }
         if (formField == 'poLine') {
           setV['itemCode'] = val[0]['itemCode']
           setV['uom'] = val[0]['uom']
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
index a7cdca71d..10ff7a48c 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
@@ -48,14 +48,60 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '送达日期',
+    field: 'deliveryDate',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+  },
   {
     label: '时间窗口',
     field: 'timeWindow',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '开始时间',
+    field: 'beginTime',
     sort: 'custom',
     table: {
       width: 150
     },
-    isForm: false,
+    form:{
+      component:"TimePicker",
+      componentProps: {
+        format:"HH:mm",
+      }
+    }
+  },
+  {
+    label: '结束时间',
+    field: 'endTime',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form:{
+      component:"TimePicker",
+      componentProps: {
+        format:"HH:mm",
+      }
+    }
   },
   {
     label: '仓库代码',
@@ -108,24 +154,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '开始时间',
-    field: 'beginTime',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
-  },
-  {
-    label: '结束时间',
-    field: 'endTime',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
-  },
+  
   {
     label: '自动发布',
     field: 'autoPublish',