From 5c2457527a23d1f2ca7f49682cb5320a65675898 Mon Sep 17 00:00:00 2001
From: "YEJIAXING-PC\\lenovo" <591141169@qq.com>
Date: Fri, 14 Mar 2025 11:57:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E6=96=99=E4=BE=BF=E6=AC=A1=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repleinshDeliCount/index.vue              |  4 +-
 .../repleinshDeliCount.data.ts                | 57 ++++---------------
 .../repleinshRequestMain.data.ts              | 54 +++++++++++++++++-
 3 files changed, 64 insertions(+), 51 deletions(-)

diff --git a/src/views/wms/basicDataManage/repleinshDeliCount/index.vue b/src/views/wms/basicDataManage/repleinshDeliCount/index.vue
index 9fe8ccc35..097ab3cb9 100644
--- a/src/views/wms/basicDataManage/repleinshDeliCount/index.vue
+++ b/src/views/wms/basicDataManage/repleinshDeliCount/index.vue
@@ -99,9 +99,7 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:repleinshDeliCount:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:repleinshDeliCount:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:repleinshDeliCount:export'}), // 导出
+  defaultButtons.defaultExportBtn(null), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
diff --git a/src/views/wms/basicDataManage/repleinshDeliCount/repleinshDeliCount.data.ts b/src/views/wms/basicDataManage/repleinshDeliCount/repleinshDeliCount.data.ts
index 55ab2bb17..cc22c811b 100644
--- a/src/views/wms/basicDataManage/repleinshDeliCount/repleinshDeliCount.data.ts
+++ b/src/views/wms/basicDataManage/repleinshDeliCount/repleinshDeliCount.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
 
 // 表单校验
 export const RepleinshDeliCountRules = reactive({
@@ -29,30 +29,16 @@ export const RepleinshDeliCount = useCrudSchemas(reactive<CrudSchema[]>([
     label: '计时器时间',
     field: 'timer',
     sort: 'custom',
-    isSearch: false,
-  },
-  {
-    label: '计算便次日期',
-    field: 'currentDeliDate',
-    sort: 'custom',
     formatter: dateFormatter,
-    isSearch: false,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
-      }
-    },
+    isForm: false,
   },
+  {
+     label: '计算便次日期',
+     field: 'currentDeliDate',
+     sort: 'custom',
+     formatter: dateFormatter2,
+     isForm: false,
+   },
   {
     label: '计算便次',
     field: 'currentDeli',
@@ -73,23 +59,8 @@ export const RepleinshDeliCount = useCrudSchemas(reactive<CrudSchema[]>([
     label: '延迟便次日期',
     field: 'delayDeliDate',
     sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: false,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
-      }
-    },
+    formatter: dateFormatter2,
+    isForm: false,
   },
   {
     label: '延迟便次',
@@ -101,12 +72,6 @@ export const RepleinshDeliCount = useCrudSchemas(reactive<CrudSchema[]>([
       value: 0
     },
   },
-  {
-    label: '下一便次开始时间',
-    field: 'nextDeliTimer',
-    sort: 'custom',
-    isSearch: false,
-  },
   {
     label: '创建时间',
     field: 'createTime',
diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
index 5292d40cb..02d29d9bf 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
 import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
 
 import * as ItembasicApi  from '@/api/wms/itembasic'
@@ -80,7 +80,57 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: true,
     isDetail: true
   },
-  
+{
+      label: '日期',
+      sortTableDefault:5,
+      field: 'day',
+      sort: 'custom',
+      isDetail: true,
+      isTable: true,
+      isForm: true,
+      isTableForm: false,
+      isSearch: true,
+      sortSearchDefault: 3,
+      formatter: dateFormatter2,
+      search: {
+        component: 'DatePicker',
+        componentProps: {
+          valueFormat: 'YYYY-MM-DD HH:mm:ss',
+          type: 'daterange',
+          defaultTime: [new Date('1 '), new Date('1 ')]
+        }
+      },
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          format: 'YYYY-MM-DD',
+          valueFormat: 'x',
+          defaultTime: [new Date('1 '), new Date('1 ')]
+        }
+      },
+      table: {
+        width: 150
+      },
+      detail: {
+        dateFormat:'YYYY-MM-DD'
+      }
+    },
+    {
+      label: '便次',
+      field: 'deliNo',
+      sort: 'custom',
+      sortTableDefault: 5,
+      table: {
+        width: 150
+      },
+      isTable:true,
+      form: {
+        component: 'InputNumber',
+        componentProps: {
+          min: 1,
+        },
+      }
+    },
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',