From a0a4d6e4ab7f10d8a2f5107a09fdf63ddeadb03e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Thu, 4 Jan 2024 13:46:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E6=96=99=E8=AE=A1=E5=88=92=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../preparetoissueMain.data.ts                |  3 +
 .../productionMain/productionMain.data.ts     | 96 +++++++++----------
 2 files changed, 51 insertions(+), 48 deletions(-)

diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
index c984c0959..7dc06c185 100644
--- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
+++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
@@ -691,4 +691,7 @@ export const PreparetoissueDetailRules = reactive({
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
+  dueTime:  [
+    { required: true, message: '请选择截止时间', trigger: 'change' }
+  ]
 })
\ No newline at end of file
diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
index e10c5ed24..d7d235a94 100644
--- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
@@ -162,7 +162,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '开始日期',
+    label: '开始时间',
     field: 'beginTime',
     formatter: dateFormatter,
     detail: {
@@ -183,7 +183,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '结束日期',
+    label: '结束时间',
     field: 'endTime',
     formatter: dateFormatter,
     detail: {
@@ -276,50 +276,50 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true,
   },
-  {
-    label: '开始时间',
-    field: 'beginTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width: '100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-    isForm: false,
-  },
-  {
-    label: '结束时间',
-    field: 'endTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width: '100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-    isForm: false,
-  },
+  // {
+  //   label: '开始时间',
+  //   field: 'beginTime',
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       style: {width: '100%'},
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  //   isForm: false,
+  // },
+  // {
+  //   label: '结束时间',
+  //   field: 'endTime',
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       style: {width: '100%'},
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  //   isForm: false,
+  // },
   // {
   //   label: '订单号',
   //   field: 'woNumber',
@@ -453,10 +453,10 @@ export const ProductionMainRules = reactive({
     { required: true, message: '请选择状态', trigger: 'change' }
   ],
   beginTime: [
-    { required: true, message: '请输入开始日期', trigger: 'blur' }
+    { required: true, message: '请输入开始时间', trigger: 'blur' }
   ],
   endTime: [
-    { required: true, message: '请输入结束日期', trigger: 'blur' }
+    { required: true, message: '请输入结束时间', trigger: 'blur' }
   ],
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }