From 8efcef51960a7de3438a8db64a5511183df76025 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Tue, 11 Jun 2024 14:11:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0Mes=E4=B8=8EBom=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../index.vue                                 | 60 +++++++++++++++++--
 .../productreceiptAssembleRecordMain.data.ts  | 20 +++----
 2 files changed, 64 insertions(+), 16 deletions(-)

diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
index 87cc38d0f..b6555b02c 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
@@ -62,16 +62,37 @@
     @tableFormButton="tableFormButton"
   />
 
-  <!-- bom列表 -->
+  <!-- Mes列表 -->
   <Dialog
       :title="DialogTitle"
-      v-model="bomModelVisible"
+      v-model="mesModelVisible"
       width="80%"
       :scroll="true"
       max-height="450px"
     >
       <Table
         :columns="ProductreceiptDetailb.allSchemas.tableColumns"
+        :data="detatableDataMes.tableList"
+        :loading="detatableDataMes.loading"
+        :pagination="{
+          total: detatableDataMes.total
+        }"
+        v-model:pageSize="detatableDataMes.pageSize"
+        v-model:currentPage="detatableDataMes.currentPage"
+        v-model:sort="detatableDataMes.sort"
+      />
+  </Dialog>
+
+   <!-- bom列表 -->
+   <Dialog
+      :title="BomDialogTitle"
+      v-model="bomModelVisible"
+      width="80%"
+      :scroll="true"
+      max-height="450px"
+    >
+      <Table
+        :columns="BackflushRecordDetailb.allSchemas.tableColumns"
         :data="detatableDataBom.tableList"
         :loading="detatableDataBom.loading"
         :pagination="{
@@ -86,11 +107,12 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { ProductreceiptRecordMain,ProductreceiptRecordMainRules,ProductreceiptRecordDetail,ProductreceiptRecordDetailRules, ProductreceiptDetailb } from './productreceiptAssembleRecordMain.data'
+import { ProductreceiptRecordMain,ProductreceiptRecordMainRules,ProductreceiptRecordDetail,ProductreceiptRecordDetailRules, ProductreceiptDetailb,BackflushRecordDetailb } from './productreceiptAssembleRecordMain.data'
 import * as ProductreceiptRecordMainApi from '@/api/wms/productreceiptRecordMain'
 import * as ProductreceiptRecordDetailApi from '@/api/wms/productreceiptRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as ProductreceiptDetailbApi from '@/api/wms/productreceiptDetailb'
+import * as BackflushRecordDetailbApi from '@/api/wms/backflushRecordDetailb'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 
 // 装配收货记录主
@@ -105,6 +127,15 @@ routeName.value = route.name
 const tableColumns = ref([...ProductreceiptRecordMain.allSchemas.tableColumns,...ProductreceiptRecordDetail.allSchemas.tableMainColumns])
 // 详情 table 操作扩展 按钮
 const buttondataTable = ref([{
+    label: 'Mes',
+    name: 'mes',
+    hide: false,
+    type: 'primary',
+    icon: '',
+    color: '',
+    hasPermi: '',
+    link: true, // 文本展现按钮
+  },{
     label: 'Bom',
     name: 'bom',
     hide: false,
@@ -115,11 +146,20 @@ const buttondataTable = ref([{
     link: true, // 文本展现按钮
   }])
 
+// Mes查看
+const DialogTitle = ref('Mes信息')
+const mesModelVisible = ref(false)
+const { tableObject: detatableDataMes, tableMethods: detatableMethodsMes } =useTable({
+  getListApi: ProductreceiptDetailbApi.getProductreceiptDetailbPage
+})
+const { getList:getDetailListMes } = detatableMethodsMes
+
+
 // Bom查看
-const DialogTitle = ref('Bom信息')
+const BomDialogTitle = ref('Bom信息')
 const bomModelVisible = ref(false)
 const { tableObject: detatableDataBom, tableMethods: detatableMethodsBom } =useTable({
-  getListApi: ProductreceiptDetailbApi.getProductreceiptDetailbPage
+  getListApi: BackflushRecordDetailbApi.getBackflushRecordDetailbPage
 })
 const { getList:getDetailListBom } = detatableMethodsBom
 
@@ -220,9 +260,17 @@ const searchFormClick = (searchData) => {
 
 // 查看 Bom 按钮回调事件
 const tableFormButton = async (val , row) => {
+  if (val == 'mes') { // 查看 bom
+    mesModelVisible.value = true
+    DialogTitle.value = '物料代码【' + row.itemCode + '】——Mes信息'
+    detatableDataMes.params = {
+      masterId: row.masterId
+    }
+    await getDetailListMes()
+  }
   if (val == 'bom') { // 查看 bom
     bomModelVisible.value = true
-    DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
+    BomDialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
     detatableDataBom.params = {
       masterId: row.masterId
     }
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts
index a6a4be2e7..096fde2ef 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts
@@ -1015,7 +1015,7 @@ export const ProductreceiptDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     label: '主表ID',
     field: 'masterId',
     sort: 'custom',
-    isSearch: true,
+    isTable:false,
     form: {
       component: 'InputNumber',
       value: 0
@@ -1095,13 +1095,13 @@ export const ProductreceiptDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
   },
-  {
-    label: '操作',
-    field: 'action',
-    isForm: false,
-    table: {
-      width: 150,
-      fixed: 'right'
-    }
-  }
+  // {
+  //   label: '操作',
+  //   field: 'action',
+  //   isForm: false,
+  //   table: {
+  //     width: 150,
+  //     fixed: 'right'
+  //   }
+  // }
 ]))