From 7edd931aa33aa0f4fff9a89e1bc1a064c3709035 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期三, 20 八月 2025 17:42:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/mes/MesProductionWorkOrderListView.vue | 10 ----------
1 files changed, 0 insertions(+), 10 deletions(-)
diff --git a/src/views/mes/MesProductionWorkOrderListView.vue b/src/views/mes/MesProductionWorkOrderListView.vue
index 61084a8..ef4e254 100644
--- a/src/views/mes/MesProductionWorkOrderListView.vue
+++ b/src/views/mes/MesProductionWorkOrderListView.vue
@@ -195,7 +195,6 @@
<mes-production-work-order-modal ref="modalForm" @ok="modalFormOk"></mes-production-work-order-modal>
<mes-production-order-modal ref="MesProductionOrderModal"></mes-production-order-modal>
<MesMaterialUnloadingList ref="MesMaterialUnloadingList"></MesMaterialUnloadingList>
- <MesMaterialTransferDetailList ref="MesMaterialTransferDetailList"></MesMaterialTransferDetailList>
<MesProductionWorkOrderScheduleModal ref="MesProductionWorkOrderScheduleModal" @ok="modalFormOk"></MesProductionWorkOrderScheduleModal>
<MesProductionWorkOrderRepublishModal ref="MesProductionWorkOrderRepublishModal" @ok="modalFormOk"></MesProductionWorkOrderRepublishModal>
<MesProductionWorkOrderReportModal ref="MesProductionWorkOrderReportModal" @ok="modalFormOk"></MesProductionWorkOrderReportModal>
@@ -215,7 +214,6 @@
import { getAction, requestPut } from '@api/manage'
import MesProductionOrderModal from '@views/mes/modules/MesProductionOrderModal.vue'
import MesMaterialUnloadingList from '@views/mes/MesMaterialUnloadingList.vue'
-import MesMaterialTransferDetailList from '@views/mes/MesMaterialTransferDetailList.vue'
import MesProductionWorkOrderScheduleModal from '@views/mes/modules/MesProductionWorkOrderScheduleModal.vue'
import MesProductionWorkOrderRepublishModal from '@views/mes/modules/MesProductionWorkOrderRepublishModal.vue'
import MesProductionWorkOrderReportModal from '@views/mes/modules/MesProductionWorkOrderReportModal.vue'
@@ -228,7 +226,6 @@
MesProductionWorkOrderModal,
MesProductionOrderModal,
MesMaterialUnloadingList,
- MesMaterialTransferDetailList,
MesProductionWorkOrderScheduleModal,
MesProductionWorkOrderRepublishModal,
MesProductionWorkOrderReportModal,
@@ -583,7 +580,6 @@
queryCompletenessCheckByWorkOrderId:'/mes/mesKittingCompletenessCheck/queryCompletenessCheckByWorkOrderId',
queryOrderById:'/mes/productionOrder/queryById',
queryUnloadingByLoadingId:'/mes/mesMaterialUnloading/queryUnloadingByLoadingId',
- queryTransferDetailBy:'/mes/mesMaterialTransferDetail/queryTransferDetailBy',
publish: '/mes/mesProductionWorkOrder/publish',
execute: '/mes/mesProductionWorkOrder/execute',
},
@@ -631,12 +627,6 @@
},
handleCompletenessCheck(record) {
this.$refs.MesProductionWorkOrderCompletenessCheckModal.check(record)
- },
- async handleTransferDetail(row){
- console.log('row---->',row)
- const transferDetailResult = await getAction(this.url.queryTransferDetailBy,{'requestId':row.id})
- this.$refs.MesMaterialTransferDetailList.visible = true
- this.$refs.MesMaterialTransferDetailList.dataSource = transferDetailResult.result.records
},
async handleUnLoadingDetail(row){
console.log('row---->',row)
--
Gitblit v1.9.3