From 2c975a5e2b7e512b7f61ab443a9d01f79828227c Mon Sep 17 00:00:00 2001
From: "YEJIAXING-PC\\lenovo" <591141169@qq.com>
Date: Thu, 6 Mar 2025 13:56:31 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E4=BE=BF?=
 =?UTF-8?q?=E6=AC=A1=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierManage/supplierDeliMain/supplierDeliMain.data.ts  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierDeliMain/supplierDeliMain.data.ts b/src/views/wms/supplierManage/supplierDeliMain/supplierDeliMain.data.ts
index 0e34589d2..2971294a9 100644
--- a/src/views/wms/supplierManage/supplierDeliMain/supplierDeliMain.data.ts
+++ b/src/views/wms/supplierManage/supplierDeliMain/supplierDeliMain.data.ts
@@ -53,10 +53,10 @@ export const SupplierDeliMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
     search: {
       component: 'DatePicker',
-      value: formatDate(new Date(),'YYYY-MM'),
+      value: formatDate(new Date(),'YYYYMM'),
       componentProps: {
         type: 'month',
-        valueFormat: 'YYYY-MM',
+        valueFormat: 'YYYYMM',
       }
     }
   },

From 5b35c2431dcefa61bd64a720822d7071834fdf79 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 6 Mar 2025 14:53:48 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=9C=B0?=
 =?UTF-8?q?=E7=82=B9=E5=8F=97=E5=85=A5=E5=8F=B7=E4=BE=BF=E6=AC=A1=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierAddressModelDeli/index.vue        | 33 ++++++++++++-------
 .../supplierAddressModelDeli.data.ts          | 26 ++++++++++-----
 2 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/src/views/wms/basicDataManage/supplierManage/supplierAddressModelDeli/index.vue b/src/views/wms/basicDataManage/supplierManage/supplierAddressModelDeli/index.vue
index 477d5ee9d..70c6abc41 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplierAddressModelDeli/index.vue
+++ b/src/views/wms/basicDataManage/supplierManage/supplierAddressModelDeli/index.vue
@@ -32,6 +32,10 @@
           <span>{{ row.code }}</span>
         </el-button>
       </template>
+      <template #shift="{row}">
+        <el-tag type="primary" v-if="row.isDay == 1">白班</el-tag>
+        <el-tag type="primary" v-if="row.isNight == 1">夜班</el-tag>
+      </template>
       <template #action="{ row }">
         <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
@@ -170,22 +174,27 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
+  if (type == 'update') {
+    row.shift = []
+    row.modelShow = row.model?.split(',')
+    if (row.isDay == 1) {
+      row.shift.push('day')
+    }
+    if (row.isNight == 1) {
+      row.shift.push('night')
+    }
+  }
+    console.log(row)
   basicFormRef.value.open(type, row)
 }
 
 // form表单提交
-const formsSuccess = async (formType,data) => {
-  var isHave =SupplierAddressModelDeli.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;
+const formsSuccess = async (formType, dataParams) => {
+  const data = {...dataParams}
+  data.isDay = data.shift.some(item=>item === 'day') ? 1 :0
+  data.isNight = data.shift.some(item => item === 'night') ? 1 :0
+  data.model = data.modelShow.join(',')
+  delete data.shift
   if (formType === 'create') {
     await SupplierAddressModelDeliApi.createSupplierAddressModelDeli(data)
     message.success(t('common.createSuccess'))
diff --git a/src/views/wms/basicDataManage/supplierManage/supplierAddressModelDeli/supplierAddressModelDeli.data.ts b/src/views/wms/basicDataManage/supplierManage/supplierAddressModelDeli/supplierAddressModelDeli.data.ts
index 6a87b0690..00d76cbf4 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplierAddressModelDeli/supplierAddressModelDeli.data.ts
+++ b/src/views/wms/basicDataManage/supplierManage/supplierAddressModelDeli/supplierAddressModelDeli.data.ts
@@ -8,7 +8,8 @@ export const SupplierAddressModelDeliRules = reactive({
   yearAndMonth: [required],
   shift: [required],
   deliNo: [required],
-  concurrencyStamp: [required]
+  concurrencyStamp: [required],
+  modelShow: [required],
 })
 
 export const SupplierAddressModelDeli = useCrudSchemas(
@@ -69,16 +70,24 @@ export const SupplierAddressModelDeli = useCrudSchemas(
       label: '供应商地点',
       field: 'supplierAddress',
       sort: 'custom',
-      isSearch: true
+      isSearch: true,
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
     },
     {
       label: '年月',
       field: 'yearAndMonth',
       sort: 'custom',
-      isSearch: true
+      isSearch: true,
+      form: {
+        componentProps: {
+          disabled: true
+        }
+      },
     },
-
-
     {
       label: '受入号',
       field: 'modelShow',
@@ -120,9 +129,10 @@ export const SupplierAddressModelDeli = useCrudSchemas(
         width: 150
       },
       isTableForm: true,
-      tableForm: {
-        type: 'Select'
-      }
+      form: {
+        component: 'Checkbox',
+        value: [],
+      },
     },
     {
       label: '便次数',