From 0b2abbca2d1d99ed92dd2531f3a2bf6542ed4518 Mon Sep 17 00:00:00 2001
From: bjang03 <wenwu901@icloud.com>
Date: Sun, 7 Apr 2024 15:21:22 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=AE=A2=E5=8D=95=E6=9C=88=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=EF=BC=8C=E8=AE=A1=E5=88=92=E7=B1=BB=E5=9E=8B=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E5=AD=97=E5=85=B8=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/ordermonthplan/index.vue        | 10 ++-
 .../ordermonthplan/mesOrderMonthSub.data.ts   | 63 ++++++++++++-------
 2 files changed, 43 insertions(+), 30 deletions(-)

diff --git a/src/views/mes/ordermonthplan/index.vue b/src/views/mes/ordermonthplan/index.vue
index eaf3a3cde..b2ac5fff8 100644
--- a/src/views/mes/ordermonthplan/index.vue
+++ b/src/views/mes/ordermonthplan/index.vue
@@ -54,16 +54,16 @@
   <Detail ref="detailRef"
           :isBasic="false"
           :allSchemas="MesOrderMonthMain.allSchemas"
-          :detailAllSchemas="MesOrderMonthSub.allSchemas"
+          :detailAllSchemas="detailAllSchemas"
           :detailAllSchemasRules="MesOrderMonthSubRules"
           :apiPage="MesOrderMonthApi.getMesOrderMonthSubPage"
           :apiCreate="MesOrderMonthApi.createMesOrderMonthSub"
           :apiUpdate="MesOrderMonthApi.updateMesOrderMonthSub"
           :apiDelete="MesOrderMonthApi.deleteMesOrderMonthSub"
           :tabs="TabsList"
-          :detailButtonIsShowAdd="true"
           :detailButtonIsShowDelete="true"
-          :detailButtonIsShowEdit="false"
+          :detailButtonIsShowEdit="true"
+          :detailButtonIsShowAdd="true"
   />
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/plan/mes-order-month-main/import"
@@ -77,7 +77,6 @@ import * as MesOrderMonthApi from '@/api/mes/ordermonthplan'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-import Detail from '@/components/Detail/src/Detail.vue'
 import {
   MesOrderMonthSub,
   MesOrderMonthSubRules
@@ -100,7 +99,6 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
     formRef.setValues(setV)
   })
 }
-
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
   tableColumns.value = val
@@ -256,5 +254,5 @@ onMounted(async () => {
   getList()
   importTemplateData.templateUrl = await MesOrderMonthApi.importTemplate()
 })
-
+const detailAllSchemas = ref(MesOrderMonthSub.allSchemas)
 </script>
diff --git a/src/views/mes/ordermonthplan/mesOrderMonthSub.data.ts b/src/views/mes/ordermonthplan/mesOrderMonthSub.data.ts
index e24c58e31..d61da01ac 100644
--- a/src/views/mes/ordermonthplan/mesOrderMonthSub.data.ts
+++ b/src/views/mes/ordermonthplan/mesOrderMonthSub.data.ts
@@ -19,10 +19,7 @@ export const MesOrderMonthSub = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'productCode',
     sort: 'custom',
     isTable: false,
-    isSearch: true,
-    form: {
-      component: 'SelectV2'
-    }
+    isSearch: true
   },
   {
     label: '产品名称',
@@ -59,36 +56,28 @@ export const MesOrderMonthSub = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'finishCount',
     sort: 'custom',
     isSearch: true,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    }
+    isForm: false
   },
   {
     label: '合格数量',
     field: 'qualifiedCount',
     sort: 'custom',
     isSearch: true,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    }
+    isForm: false
   },
   {
     label: '不合格数量',
     field: 'unqualifiedCount',
     sort: 'custom',
     isSearch: true,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    }
+    isForm: false
   },
   {
     label: '是否回冲',
     field: 'flagBackwash',
     sort: 'custom',
-    isSearch: true
+    isSearch: true,
+    isForm: false
   },
   {
     label: '产品批次号',
@@ -115,25 +104,53 @@ export const MesOrderMonthSub = useCrudSchemas(reactive<CrudSchema[]>([
     label: '计划开始日期',
     field: 'planBegin',
     sort: 'custom',
-    isSearch: true
+    isSearch: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
   },
   {
     label: '计划结束日期',
     field: 'planEnd',
     sort: 'custom',
-    isSearch: true
+    isSearch: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
   },
   {
     label: '实际开工日期',
     field: 'realStart',
     sort: 'custom',
-    isSearch: true
+    isSearch: true,
+    isForm: false
   },
   {
     label: '实际完工日期',
     field: 'realFinish',
     sort: 'custom',
-    isSearch: true
+    isSearch: true,
+    isForm: false
   },
   {
     label: '备注',
@@ -146,9 +163,7 @@ export const MesOrderMonthSub = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'status',
     sort: 'custom',
     isSearch: true,
-    form: {
-      component: 'Radio'
-    }
+    isForm: false
   },
   {
     label: '操作',