From 744125699d638749e74798d7a678b7848c1ec1ee Mon Sep 17 00:00:00 2001
From: bjang03 <wenwu901@icloud.com>
Date: Sun, 7 Apr 2024 11:50:52 +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=E7=BA=A7=E8=81=94=E5=88=A0=E9=99=A4=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/ordermonthplan/index.ts           |  53 ++++++
 src/views/mes/ordermonthplan/index.vue        |  44 +++--
 .../ordermonthplan/mesOrderMonthMain.data.ts  |  51 +++---
 .../ordermonthplan/mesOrderMonthSub.data.ts   | 162 ++++++++++++++++++
 4 files changed, 271 insertions(+), 39 deletions(-)
 create mode 100644 src/views/mes/ordermonthplan/mesOrderMonthSub.data.ts

diff --git a/src/api/mes/ordermonthplan/index.ts b/src/api/mes/ordermonthplan/index.ts
index 3c86a1a5c..d3fc9bfd1 100644
--- a/src/api/mes/ordermonthplan/index.ts
+++ b/src/api/mes/ordermonthplan/index.ts
@@ -58,3 +58,56 @@ export const exportMesOrderMonthMain = async (params) => {
 export const importTemplate = () => {
   return request.download({ url: '/plan/mes-order-month-main/get-import-template' })
 }
+
+export interface MesOrderMonthSubVO {
+  status: string
+  remark: string
+  productCode: string
+  bomCode: string
+  inStoreCode: string
+  planBegin: Date
+  planEnd: Date
+  realStart: string
+  realFinish: Date
+  planCount: number
+  finishCount: number
+  qualifiedCount: number
+  unqualifiedCount: number
+  flagBackwash: string
+  productBatchcode: string
+}
+// 查询订单月计划子列表
+export const getMesOrderMonthSubPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/plan/mes-order-month-sub/senior', data })
+  } else {
+    return await request.get({ url: `/plan/mes-order-month-sub/page`, params })
+  }
+}
+
+// 查询订单月计划子详情
+export const getMesOrderMonthSub = async (id: number) => {
+  return await request.get({ url: `/plan/mes-order-month-sub/get?id=` + id })
+}
+
+// 新增订单月计划子
+export const createMesOrderMonthSub = async (data: MesOrderMonthSubVO) => {
+  return await request.post({ url: `/plan/mes-order-month-sub/create`, data })
+}
+
+// 修改订单月计划子
+export const updateMesOrderMonthSub = async (data: MesOrderMonthSubVO) => {
+  return await request.put({ url: `/plan/mes-order-month-sub/update`, data })
+}
+
+// 删除订单月计划子
+export const deleteMesOrderMonthSub = async (id: number) => {
+  return await request.delete({ url: `/plan/mes-order-month-sub/delete?id=` + id })
+}
+
+// 导出订单月计划子 Excel
+export const exportMesOrderMonthSub = async (params) => {
+  return await request.download({ url: `/plan/mes-order-month-sub/export-excel`, params })
+}
diff --git a/src/views/mes/ordermonthplan/index.vue b/src/views/mes/ordermonthplan/index.vue
index bea98e710..eaf3a3cde 100644
--- a/src/views/mes/ordermonthplan/index.vue
+++ b/src/views/mes/ordermonthplan/index.vue
@@ -27,9 +27,9 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
-        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
-          <span>{{ row.code }}</span>
+      <template #planMasterCode="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.planMasterCode)">
+          <span>{{ row.planMasterCode }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
@@ -44,17 +44,26 @@
     @success="formsSuccess"
     :rules="MesOrderMonthMainRules"
     :formAllSchemas="MesOrderMonthMain.allSchemas"
-    :apiUpdate="MesOrderMonthMainApi.updateMesOrderMonthMain"
-    :apiCreate="MesOrderMonthMainApi.createMesOrderMonthMain"
-    @searchTableSuccess="searchTableSuccess"
+    :apiUpdate="MesOrderMonthApi.updateMesOrderMonthMain"
+    :apiCreate="MesOrderMonthApi.createMesOrderMonthMain"
+    :apiDelete="MesOrderMonthApi.deleteMesOrderMonthMain"
     :isBusiness="false"
   />
 
   <!-- 详情 -->
   <Detail ref="detailRef"
           :isBasic="false"
-          :detailAllSchemasRules="MesOrderMonthMainRules"
           :allSchemas="MesOrderMonthMain.allSchemas"
+          :detailAllSchemas="MesOrderMonthSub.allSchemas"
+          :detailAllSchemasRules="MesOrderMonthSubRules"
+          :apiPage="MesOrderMonthApi.getMesOrderMonthSubPage"
+          :apiCreate="MesOrderMonthApi.createMesOrderMonthSub"
+          :apiUpdate="MesOrderMonthApi.updateMesOrderMonthSub"
+          :apiDelete="MesOrderMonthApi.deleteMesOrderMonthSub"
+          :tabs="TabsList"
+          :detailButtonIsShowAdd="true"
+          :detailButtonIsShowDelete="true"
+          :detailButtonIsShowEdit="false"
   />
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/plan/mes-order-month-main/import"
@@ -63,18 +72,21 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import {MesOrderMonthMain, MesOrderMonthMainRules} from './mesOrderMonthMain.data'
-import * as MesOrderMonthMainApi from '@/api/mes/ordermonthplan'
+import {MesOrderMonthMain, MesOrderMonthMainRules,TabsList} from './mesOrderMonthMain.data'
+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
+} from "@/views/mes/ordermonthplan/mesOrderMonthSub.data";
 
 defineOptions({ name: 'MesOrderMonthMain' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
-
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
@@ -95,7 +107,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: MesOrderMonthMainApi.getMesOrderMonthMainPage // 分页接口
+  getListApi: MesOrderMonthApi.getMesOrderMonthMainPage // 分页接口
 })
 
 // 获得表格的各种操作
@@ -170,10 +182,10 @@ const formsSuccess = async (formType,data) => {
   if(data.activeTime==0)data.activeTime = null;
   if(data.expireTime==0)data.expireTime = null;
   if (formType === 'create') {
-    await MesOrderMonthMainApi.createMesOrderMonthMain(data)
+    await MesOrderMonthApi.createMesOrderMonthMain(data)
     message.success(t('common.createSuccess'))
   } else {
-    await MesOrderMonthMainApi.updateMesOrderMonthMain(data)
+    await MesOrderMonthApi.updateMesOrderMonthMain(data)
     message.success(t('common.updateSuccess'))
   }
   basicFormRef.value.dialogVisible = false
@@ -192,7 +204,7 @@ const handleDelete = async (id: number) => {
     // 删除的二次确认
     await message.delConfirm()
     // 发起删除
-    await MesOrderMonthMainApi.deleteMesOrderMonthMain(id)
+    await MesOrderMonthApi.deleteMesOrderMonthMain(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
     await getList()
@@ -207,7 +219,7 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await MesOrderMonthMainApi.exportMesOrderMonthMain(tableObject.params)
+    const data = await MesOrderMonthApi.exportMesOrderMonthMain(tableObject.params)
     download.excel(data, '订单计划月主.xlsx')
   } catch {
   } finally {
@@ -242,7 +254,7 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async () => {
   getList()
-  importTemplateData.templateUrl = await MesOrderMonthMainApi.importTemplate()
+  importTemplateData.templateUrl = await MesOrderMonthApi.importTemplate()
 })
 
 </script>
diff --git a/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts b/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts
index 0fc21aaf8..66be46d39 100644
--- a/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts
+++ b/src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts
@@ -1,39 +1,43 @@
-import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import type {CrudSchema} from '@/hooks/web/useCrudSchemas'
+import {dateFormatter} from '@/utils/formatTime'
 
 // 表单校验
 export const MesOrderMonthMainRules = reactive({
   planMasterCode: [required],
-  planSubCode:[required],
-  planType:[required],
-  factoryCode:[required]
+  planSubCode: [required],
+  planType: [required],
+  factoryCode: [required]
 })
 
 export const MesOrderMonthMain = useCrudSchemas(reactive<CrudSchema[]>([
+
   {
-    label: '计划类型',
-    field: 'planType',
+    label: '主计划编码',
+    field: 'planMasterCode',
     sort: 'custom',
     isSearch: true
   },
   {
+    label: '计划辅助编码',
+    field: 'planSubCode',
+    sort: 'custom',
+    isSearch: true
+  }, {
     label: '工厂编码',
     field: 'factoryCode',
     sort: 'custom',
     isTable: false
   },
   {
-    label: '主计划编码',
-    field: 'planMasterCode',
+    label: '工厂名称',
+    field: 'factoryName',
     sort: 'custom',
-    isTable: false,
-    isSearch: true
-  },
-  {
-    label: '计划辅助编码',
-    field: 'planSubCode',
+    isSearch: true,
+    isForm: false
+  }, {
+    label: '计划类型',
+    field: 'planType',
     sort: 'custom',
-    isTable: true,
     isSearch: true
   },
   {
@@ -48,6 +52,9 @@ export const MesOrderMonthMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     formatter: dateFormatter,
     isSearch: true,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -65,13 +72,6 @@ export const MesOrderMonthMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
     isForm: false
   },
-  {
-    label: '工厂名称',
-    field: 'factoryName',
-    sort: 'custom',
-    isSearch: true,
-    isForm: false
-  },
   {
     label: '操作',
     field: 'action',
@@ -82,3 +82,8 @@ export const MesOrderMonthMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   }
 ]))
+export const TabsList = [{
+  label: "子计划",
+  prop: 'mesOrderMonthSub',
+}
+]
diff --git a/src/views/mes/ordermonthplan/mesOrderMonthSub.data.ts b/src/views/mes/ordermonthplan/mesOrderMonthSub.data.ts
new file mode 100644
index 000000000..e24c58e31
--- /dev/null
+++ b/src/views/mes/ordermonthplan/mesOrderMonthSub.data.ts
@@ -0,0 +1,162 @@
+import type {CrudSchema} from '@/hooks/web/useCrudSchemas'
+import {dateFormatter} from '@/utils/formatTime'
+
+// 表单校验
+export const MesOrderMonthSubRules = reactive({
+  productCode: [required],
+  productName: [required],
+  bomCode: [required],
+  inStoreCode: [required],
+  planBegin: [required],
+  planEnd: [required],
+  planCount: [required],
+  productBatchcode: [required]
+})
+
+export const MesOrderMonthSub = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '产品编码',
+    field: 'productCode',
+    sort: 'custom',
+    isTable: false,
+    isSearch: true,
+    form: {
+      component: 'SelectV2'
+    }
+  },
+  {
+    label: '产品名称',
+    field: 'productName',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  },
+  {
+    label: 'BOM编号',
+    field: 'bomCode',
+    sort: 'custom',
+    isTable: false,
+    isSearch: true
+  },
+  {
+    label: '入库仓库编码',
+    field: 'inStoreCode',
+    sort: 'custom',
+    isSearch: true
+  },
+  {
+    label: '计划数量',
+    field: 'planCount',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    }
+  },
+  {
+    label: '完成数量',
+    field: 'finishCount',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    }
+  },
+  {
+    label: '合格数量',
+    field: 'qualifiedCount',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    }
+  },
+  {
+    label: '不合格数量',
+    field: 'unqualifiedCount',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    }
+  },
+  {
+    label: '是否回冲',
+    field: 'flagBackwash',
+    sort: 'custom',
+    isSearch: true
+  },
+  {
+    label: '产品批次号',
+    field: 'productBatchcode',
+    sort: 'custom',
+    isSearch: true
+  }, {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    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')]
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '计划开始日期',
+    field: 'planBegin',
+    sort: 'custom',
+    isSearch: true
+  },
+  {
+    label: '计划结束日期',
+    field: 'planEnd',
+    sort: 'custom',
+    isSearch: true
+  },
+  {
+    label: '实际开工日期',
+    field: 'realStart',
+    sort: 'custom',
+    isSearch: true
+  },
+  {
+    label: '实际完工日期',
+    field: 'realFinish',
+    sort: 'custom',
+    isSearch: true
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isTable: false
+  },
+  {
+    label: '状态',
+    field: 'status',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'Radio'
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))