From 3ae9655ccf111c0feb3cc1fe4354e92ff0298aa2 Mon Sep 17 00:00:00 2001
From: bjang03 <wenwu901@icloud.com>
Date: Wed, 3 Apr 2024 14:14:43 +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=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/ordermonthplan/index.vue        | 40 ++++++-----
 .../ordermonthplan/mesOrderMonthMain.data.ts  | 66 +++++++++----------
 2 files changed, 54 insertions(+), 52 deletions(-)

diff --git a/src/views/mes/ordermonthplan/index.vue b/src/views/mes/ordermonthplan/index.vue
index 31e9bca22..bea98e710 100644
--- a/src/views/mes/ordermonthplan/index.vue
+++ b/src/views/mes/ordermonthplan/index.vue
@@ -4,15 +4,15 @@
     <Search :schema="MesOrderMonthMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
-    <!-- 列表头部 -->
-    <TableHead
-      :HeadButttondata="HeadButttondata"
-      @button-base-click="buttonBaseClick"
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="MesOrderMonthMain.allSchemas"
-    />
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="MesOrderMonthMain.allSchemas"
+  />
 
   <!-- 列表 -->
   <ContentWrap>
@@ -51,15 +51,19 @@
   />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="MesOrderMonthMain.allSchemas" />
-
+  <Detail ref="detailRef"
+          :isBasic="false"
+          :detailAllSchemasRules="MesOrderMonthMainRules"
+          :allSchemas="MesOrderMonthMain.allSchemas"
+  />
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/plan/mes-order-month-main/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm ref="importFormRef" url="/plan/mes-order-month-main/import"
+              :importTemplateData="importTemplateData" @success="importSuccess"/>
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { MesOrderMonthMain,MesOrderMonthMainRules } from './mesOrderMonthMain.data'
+import {MesOrderMonthMain, MesOrderMonthMainRules} from './mesOrderMonthMain.data'
 import * as MesOrderMonthMainApi from '@/api/mes/ordermonthplan'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
@@ -99,9 +103,9 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:mesOrderMonthMain:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:mesOrderMonthMain:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:mesOrderMonthMain:export'}), // 导出
+  defaultButtons.defaultAddBtn({hasPermi: 'mes:ordermonthplan:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi: 'mes:ordermonthplan:import'}), // 导入
+  // defaultButtons.defaultExportBtn({hasPermi:'mes:ordermonthplan:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -133,8 +137,8 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:mesOrderMonthMain:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:mesOrderMonthMain:delete'}), // 删除
+  defaultButtons.mainListEditBtn({hasPermi: 'mes:ordermonthplan:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi: 'mes:ordermonthplan:delete'}), // 删除
 ]
 
 // 列表-操作按钮事件
diff --git a/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts b/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts
index b30b0fc88..0fc21aaf8 100644
--- a/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts
+++ b/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts
@@ -3,9 +3,39 @@ import { dateFormatter } from '@/utils/formatTime'
 
 // 表单校验
 export const MesOrderMonthMainRules = reactive({
+  planMasterCode: [required],
+  planSubCode:[required],
+  planType:[required],
+  factoryCode:[required]
 })
 
 export const MesOrderMonthMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '计划类型',
+    field: 'planType',
+    sort: 'custom',
+    isSearch: true
+  },
+  {
+    label: '工厂编码',
+    field: 'factoryCode',
+    sort: 'custom',
+    isTable: false
+  },
+  {
+    label: '主计划编码',
+    field: 'planMasterCode',
+    sort: 'custom',
+    isTable: false,
+    isSearch: true
+  },
+  {
+    label: '计划辅助编码',
+    field: 'planSubCode',
+    sort: 'custom',
+    isTable: true,
+    isSearch: true
+  },
   {
     label: '备注',
     field: 'remark',
@@ -35,44 +65,12 @@ export const MesOrderMonthMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
     isForm: false
   },
-  {
-    label: '主计划编码',
-    field: 'planMasterCode',
-    sort: 'custom',
-    isSearch: true
-  },
-  {
-    label: '计划辅助编码',
-    field: 'planSubCode',
-    sort: 'custom',
-    isSearch: true
-  },
-  {
-    label: '计划类型',
-    field: 'planType',
-    sort: 'custom',
-    isSearch: true,
-                form: {
-                  component: 'SelectV2'
-                }
-  },
-  {
-    label: '审核人',
-    field: 'checker',
-    sort: 'custom',
-    isSearch: true
-  },
-  {
-    label: '工厂编码',
-    field: 'factoryCode',
-    sort: 'custom',
-    isSearch: true
-  },
   {
     label: '工厂名称',
     field: 'factoryName',
     sort: 'custom',
-    isSearch: true
+    isSearch: true,
+    isForm: false
   },
   {
     label: '操作',