From 8e8c31f514d3f013fc125601d00514fea2fc8b4a Mon Sep 17 00:00:00 2001
From: "YEJIAXING-PC\\lenovo" <591141169@qq.com>
Date: Fri, 7 Feb 2025 17:30:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=8E=86=E4=BB=A3=E7=A0=81=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierManage/receivedCalendar/index.vue |  4 +-
 .../receivedCalendar/receivedCalendar.data.ts | 49 +++++++++++++------
 2 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/src/views/wms/basicDataManage/supplierManage/receivedCalendar/index.vue b/src/views/wms/basicDataManage/supplierManage/receivedCalendar/index.vue
index e8a35675a..e2c8d776b 100644
--- a/src/views/wms/basicDataManage/supplierManage/receivedCalendar/index.vue
+++ b/src/views/wms/basicDataManage/supplierManage/receivedCalendar/index.vue
@@ -157,6 +157,8 @@ const handleDateChange=async(value)=> {
 const formsSuccess = async (formType, data) => {
   console.log(data)
   if (formType === 'create') {
+    data.calendarDateList=data.calendarDate
+    data.calendarDate=[]
     await ReceivedCalendarApi.createReceivedCalendar(data)
     message.success(t('common.createSuccess'))
   } else {
@@ -214,7 +216,7 @@ const getData=async () =>{
   const month = today.getMonth(); // 注意：月份是从0开始的，0代表1月，11代表12月
   dayData.value = await ReceivedCalendarApi.getMonthReceivedCalendar({
     receivedNumber:'',
-    calendarDate:year + '-' + (month + 1 >= 10 ? month + 1 : '0' +( month + 1)),
+    calendarDateString:year + '-' + (month + 1 >= 10 ? month + 1 : '0' +( month + 1)),
   })
   await getDatesInCurrentMonth(year,month)
 }
diff --git a/src/views/wms/basicDataManage/supplierManage/receivedCalendar/receivedCalendar.data.ts b/src/views/wms/basicDataManage/supplierManage/receivedCalendar/receivedCalendar.data.ts
index 9abeb5031..161ee5964 100644
--- a/src/views/wms/basicDataManage/supplierManage/receivedCalendar/receivedCalendar.data.ts
+++ b/src/views/wms/basicDataManage/supplierManage/receivedCalendar/receivedCalendar.data.ts
@@ -15,22 +15,6 @@ export const ReceivedCalendar = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
   },
-  {
-    label: '班次',
-    field: 'shift',
-    dictType: DICT_TYPE.SHIFT,
-    dictClass: 'string',
-    isTable: true,
-    isDetail: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: true,
-    tableForm: {
-      type: 'Select'
-    }
-  },
   {
     label: '日期',
     field: 'calendarDate',
@@ -61,6 +45,39 @@ export const ReceivedCalendar = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '白班',
+    field: 'isHideSun',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '晚班',
+    field: 'isHideMoon',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  
   {
     label: '创建时间',
     field: 'createTime',