From 7e65dfc84c368ff17dc388c906df7bb0f4abfcd2 Mon Sep 17 00:00:00 2001
From: "YEJIAXING-PC\\lenovo" <591141169@qq.com>
Date: Thu, 6 Feb 2025 17:20:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=8E=86=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierManage/receivedCalendar/index.vue | 31 +++++--------------
 .../receivedCalendar/receivedCalendar.data.ts | 14 +++++++--
 2 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/src/views/wms/basicDataManage/supplierManage/receivedCalendar/index.vue b/src/views/wms/basicDataManage/supplierManage/receivedCalendar/index.vue
index fb75e0e94..e8a35675a 100644
--- a/src/views/wms/basicDataManage/supplierManage/receivedCalendar/index.vue
+++ b/src/views/wms/basicDataManage/supplierManage/receivedCalendar/index.vue
@@ -13,7 +13,7 @@
                 :value="item.value"
               />
             </el-select>
-            <ButtonBaseMore :Butttondata="HeadButttondata" @button-base-click="buttonTableClick($event,row)" />
+            <ButtonBaseMore :Butttondata="HeadButttondata" @button-base-click="buttonBaseClick($event,row)" />
           </div>
           <el-button size="small" text @click="selectDate('prev-month',date)">
             <Icon icon="ep:arrow-left" size="18px"/>
@@ -136,7 +136,10 @@ const openForm = (type: string, row?: any) => {
 }
 const handleDateChange=async(value)=> {
   if (value && value.length === 2) {
+    console.log(value)
     const [start, end] = value;
+    console.log(start)
+    console.log(end)
     let middleDays = (end - start) / (24 * 60 * 60 * 1000) - 1;
     if (middleDays > 0) {
       let middleDates = [];
@@ -144,6 +147,7 @@ const handleDateChange=async(value)=> {
         let middleDate = new Date(start.getTime() + i * 24 * 60 * 60 * 1000);
         middleDates.push(formatDate(middleDate, 'YYYY-MM-DD'));
       }
+      console.log([formatDate(start, 'YYYY-MM-DD'), ...middleDates, formatDate(end, 'YYYY-MM-DD')])
       return [formatDate(start, 'YYYY-MM-DD'), ...middleDates, formatDate(end, 'YYYY-MM-DD')];
     }
   }
@@ -152,28 +156,6 @@ const handleDateChange=async(value)=> {
 // form表单提交
 const formsSuccess = async (formType, data) => {
   console.log(data)
-  const dateArray = await handleDateChange(data.calendarDate)
-  datesInCurrentMonth.value.forEach(item => {
-    dateArray.forEach(cur => {
-      if (item.day == cur) {
-        item.isHideMoon = true
-        item.isHideSun = true
-      }
-    })
-  })
-  
-  return
-  var isHave =ReceivedCalendar.allSchemas.formSchema.some(function (item) {
-    return item.field === 'activeTime' || item.field === 'expireTime';
-  });
-  if(isHave){
-    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
-      message.error('失效时间要大于生效时间')
-      return;
-    }
-  }
-  if(data.activeTime==0)data.activeTime = null;
-  if(data.expireTime==0)data.expireTime = null;
   if (formType === 'create') {
     await ReceivedCalendarApi.createReceivedCalendar(data)
     message.success(t('common.createSuccess'))
@@ -182,9 +164,10 @@ const formsSuccess = async (formType, data) => {
     message.success(t('common.updateSuccess'))
   }
   basicFormRef.value.dialogVisible = false
-  getList()
+  getData()
 }
 
+
 // 刪除班次
 const deleteShift=(day,type) =>{
   console.log(dayData.value)
diff --git a/src/views/wms/basicDataManage/supplierManage/receivedCalendar/receivedCalendar.data.ts b/src/views/wms/basicDataManage/supplierManage/receivedCalendar/receivedCalendar.data.ts
index 111c72c49..9abeb5031 100644
--- a/src/views/wms/basicDataManage/supplierManage/receivedCalendar/receivedCalendar.data.ts
+++ b/src/views/wms/basicDataManage/supplierManage/receivedCalendar/receivedCalendar.data.ts
@@ -18,8 +18,18 @@ export const ReceivedCalendar = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '班次',
     field: 'shift',
+    dictType: DICT_TYPE.SHIFT,
+    dictClass: 'string',
+    isTable: true,
+    isDetail: true,
     sort: 'custom',
-    isSearch: true,
+    table: {
+      width: 150
+    },
+    isTableForm: true,
+    tableForm: {
+      type: 'Select'
+    }
   },
   {
     label: '日期',
@@ -45,7 +55,7 @@ export const ReceivedCalendar = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'DatePicker',
       componentProps: {
         style: {width: '100%'},
-        type: 'date',
+        type: 'daterange',
         dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }