From 84bd2806feecfe7938fcdf91469e025a8e7f5749 Mon Sep 17 00:00:00 2001 From: cuilei <ray_tsu1@163.com> Date: 星期一, 18 八月 2025 18:04:42 +0800 Subject: [PATCH] 规范涉及mes接口的请求前缀 --- src/views/mes/modules/MesProductionWorkOrderCompletenessCheckModal.vue | 4 src/views/mes/modules/MesTransferOrderPrintForm.vue | 8 src/views/mes/modules/MesKittingCompletenessCheckForm.vue | 8 src/views/mes/modules/MesProductionWorkOrderScheduleModal.vue | 14 +- src/views/mes/MesProductionOrderListView.vue | 14 +- src/views/mes/modules/MesProductionWorkOrderForm.vue | 6 src/views/mes/modules/MesWorkReportingForm.vue | 8 src/views/mes/MesTransferOrderPrintList.vue | 12 +- src/views/mes/MesProductionWorkOrderListView.vue | 146 ++--------------------------- src/views/mes/MesKittingCompletenessCheckList.vue | 10 +- src/views/mes/MesProductionWorkOrderList.vue | 14 +- src/views/mes/MesWorkReportingList.vue | 10 +- src/views/mes/modules/MesProductionWorkOrderRepublishModal.vue | 2 src/views/mes/modules/MesProductionWorkOrderReportModal.vue | 2 src/views/mes/modules/MesProductionWorkOrderListModal.vue | 2 15 files changed, 68 insertions(+), 192 deletions(-) diff --git a/src/views/mes/MesKittingCompletenessCheckList.vue b/src/views/mes/MesKittingCompletenessCheckList.vue index 01b09dd..13e891c 100644 --- a/src/views/mes/MesKittingCompletenessCheckList.vue +++ b/src/views/mes/MesKittingCompletenessCheckList.vue @@ -187,11 +187,11 @@ } ], url: { - list: "/meskittingcompletenesscheck/mesKittingCompletenessCheck/list", - delete: "/meskittingcompletenesscheck/mesKittingCompletenessCheck/delete", - deleteBatch: "/meskittingcompletenesscheck/mesKittingCompletenessCheck/deleteBatch", - exportXlsUrl: "/meskittingcompletenesscheck/mesKittingCompletenessCheck/exportXls", - importExcelUrl: "meskittingcompletenesscheck/mesKittingCompletenessCheck/importExcel", + list: "/mes/mesKittingCompletenessCheck/list", + delete: "/mes/mesKittingCompletenessCheck/delete", + deleteBatch: "/mes/mesKittingCompletenessCheck/deleteBatch", + exportXlsUrl: "/mes/mesKittingCompletenessCheck/exportXls", + importExcelUrl: "mes/mesKittingCompletenessCheck/importExcel", }, dictOptions:{}, diff --git a/src/views/mes/MesProductionOrderListView.vue b/src/views/mes/MesProductionOrderListView.vue index eb8d92a..bf76414 100644 --- a/src/views/mes/MesProductionOrderListView.vue +++ b/src/views/mes/MesProductionOrderListView.vue @@ -475,13 +475,13 @@ ] }, url: { - list: '/mesproductionwork/mesProductionOrder/list', - delete: '/mesproductionwork/mesProductionOrder/delete', - deleteBatch: '/mesproductionwork/mesProductionOrder/deleteBatch', - exportXlsUrl: '/mesproductionwork/mesProductionOrder/exportXls', - importExcelUrl: 'mesproductionwork/mesProductionOrder/importExcel', - queryWorkReportingByOrderId:'/mesworkreporting/mesWorkReporting/queryWorkReportingByOrderId', - queryOrderPrintByOrderId:'/mestransferorderprint/mesTransferOrderPrint/queryOrderPrintByOrderId' + list: '/mes/productionOrder/list', + delete: '/mes/productionOrder/delete', + deleteBatch: '/mes/productionOrder/deleteBatch', + exportXlsUrl: '/mes/productionOrder/exportXls', + importExcelUrl: 'mes/productionOrder/importExcel', + queryWorkReportingByOrderId:'/mes/mesWorkReporting/queryWorkReportingByOrderId', + queryOrderPrintByOrderId:'/mes/mesTransferOrderPrint/queryOrderPrintByOrderId' }, dictOptions: {}, superFieldList: [] diff --git a/src/views/mes/MesProductionWorkOrderList.vue b/src/views/mes/MesProductionWorkOrderList.vue index 8d1fe7d..2e2d49d 100644 --- a/src/views/mes/MesProductionWorkOrderList.vue +++ b/src/views/mes/MesProductionWorkOrderList.vue @@ -275,14 +275,14 @@ } ], url: { - list: '/mesproductionworkorder/mesProductionWorkOrder/list', - delete: '/mesproductionworkorder/mesProductionWorkOrder/delete', - deleteBatch: '/mesproductionworkorder/mesProductionWorkOrder/deleteBatch', - exportXlsUrl: '/mesproductionworkorder/mesProductionWorkOrder/exportXls', - importExcelUrl: 'mesproductionworkorder/mesProductionWorkOrder/importExcel', + list: '/mes/mesProductionWorkOrder/list', + delete: '/mes/mesProductionWorkOrder/delete', + deleteBatch: '/mes/mesProductionWorkOrder/deleteBatch', + exportXlsUrl: '/mes/mesProductionWorkOrder/exportXls', + importExcelUrl: 'mes/mesProductionWorkOrder/importExcel', listProductionLinesOption: '/base/factory/queryIdTree', - schedule: '/mesproductionworkorder/mesProductionWorkOrder/schedule', - publish: '/mesproductionworkorder/mesProductionWorkOrder/publish' + schedule: '/mes/mesProductionWorkOrder/schedule', + publish: '/mes/mesProductionWorkOrder/publish' }, dictOptions: {}, superFieldList: [], diff --git a/src/views/mes/MesProductionWorkOrderListView.vue b/src/views/mes/MesProductionWorkOrderListView.vue index 6b524e3..61084a8 100644 --- a/src/views/mes/MesProductionWorkOrderListView.vue +++ b/src/views/mes/MesProductionWorkOrderListView.vue @@ -155,26 +155,6 @@ </template> </j-vxe-table> </a-tab-pane> - <a-tab-pane tab="鐗╂枡鎷夊姩鐢宠" :key="refKeys2[0]" :forceRender="true"> - <div style="display: flex; align-items: center; margin-bottom: 10px;"> - </div> - <j-vxe-table - keep-source - :ref="refKeys2[0]" - :loading="mesMaterialTransferRequest.loading" - :columns="mesMaterialTransferRequest.columns" - :dataSource="mesMaterialTransferRequest.dataSource" - :maxHeight="300" - :rowNumber="true" - :rowSelection="true" - :toolbar="false"> - <template slot="showTransferDetail" slot-scope="{row}"> - <a-button type="primary" @click="handleTransferDetail(row)" size="small"> - <a-icon type="eye" />鐗╂枡鎷夊姩鏄庣粏 - </a-button> - </template> - </j-vxe-table> - </a-tab-pane> <a-tab-pane tab="涓婁笅鏂欐煡璇�" :key="refKeys3[0]" :forceRender="true"> <div style="display: flex; align-items: center; margin-bottom: 10px;"> </div> @@ -261,9 +241,6 @@ // 宸ュ崟鎶ュ伐 refKeys1: ['mesWorkReporting'], tableKeys1: ['mesWorkReporting'], - //鐗╂枡鎷夊姩鐢宠 - refKeys2: ['mesMaterialTransferRequest'], - tableKeys2: ['mesMaterialTransferRequest'], //涓婃枡 refKeys3: ['mesMaterialLoading'], tableKeys3: ['mesMaterialLoading'], @@ -455,101 +432,6 @@ }, ] }, - mesMaterialTransferRequest: { - loading: false, - dataSource: [], - columns: [ - { - title: '鎿嶄綔', - key: 'action', - type: JVXETypes.slot, - slotName: 'showTransferDetail', - width: '120px', - align: 'center' - }, - { - title: '鎷夊姩鍗曞彿', - key: 'requestCode', - type: JVXETypes.input, - width: '200px', - placeholder: '璇疯緭鍏�${title}', - defaultValue: '' - }, - { - title: '宸ュ崟鍙�', - key: 'workOrderCode', - type: JVXETypes.input, - width: '200px', - placeholder: '璇疯緭鍏�${title}', - defaultValue: '' - }, - { - title: 'SAP棰勭暀鍙�', - key: 'reservationCode', - type: JVXETypes.input, - width: '200px', - placeholder: '璇疯緭鍏�${title}', - defaultValue: '' - }, - { - title: '鍙戝竷鐘舵��', - key: 'publishStatus', - type: JVXETypes.input, - width: '200px', - placeholder: '璇疯緭鍏�${title}', - defaultValue: '' - }, - { - title: '璇锋眰鐘舵��', - key: 'requestStatus', - type: JVXETypes.input, - width: '200px', - placeholder: '璇疯緭鍏�${title}', - defaultValue: '' - }, - { - title: '璇锋眰鏃堕棿', - key: 'requestTime', - type: JVXETypes.input, - width: '200px', - placeholder: '璇疯緭鍏�${title}', - defaultValue: '' - }, - { - title: '鍘熷簱瀛樺湴', - key: 'originalWarehouseName', - type: JVXETypes.input, - width: '200px', - placeholder: '璇疯緭鍏�${title}', - defaultValue: '' - }, - { - title: '鐩爣搴撳瓨鍦�', - key: 'targetWarehouseName', - type: JVXETypes.input, - width: '200px', - placeholder: '璇疯緭鍏�${title}', - defaultValue: '' - }, - { - title: '浼樺厛绾�', - key: 'priority', - type: JVXETypes.select, - dictCode: 'priority', - width: '200px', - placeholder: '璇疯緭鍏�${title}', - defaultValue: '' - }, - { - title: '鏈�鏅氶厤閫佹椂闂�', - key: 'latestDeliveryTime', - type: JVXETypes.input, - width: '200px', - placeholder: '璇疯緭鍏�${title}', - defaultValue: '' - }, - ] - }, mesMaterialLoading: { loading: false, dataSource: [], @@ -691,20 +573,19 @@ ] }, url: { - list: '/mesproductionworkorder/mesProductionWorkOrder/list', - delete: '/mesproductionworkorder/mesProductionWorkOrder/delete', - deleteBatch: '/mesproductionworkorder/mesProductionWorkOrder/deleteBatch', - exportXlsUrl: '/mesproductionworkorder/mesProductionWorkOrder/exportXls', - importExcelUrl: 'mesproductionworkorder/mesProductionWorkOrder/importExcel', - queryWorkReportingByWorkOrderId:'/mesworkreporting/mesWorkReporting/queryWorkReportingByWorkOrderId', - queryMaterialTransferRequestByWorkOrderId:'/mesmaterialtransferrequest/mesMaterialTransferRequest/queryMaterialTransferRequestByWorkOrderId', + list: '/mes/mesProductionWorkOrder/list', + delete: '/mes/mesProductionWorkOrder/delete', + deleteBatch: '/mes/mesProductionWorkOrder/deleteBatch', + exportXlsUrl: '/mes/mesProductionWorkOrder/exportXls', + importExcelUrl: 'mes/mesProductionWorkOrder/importExcel', + queryWorkReportingByWorkOrderId:'/mes/mesWorkReporting/queryWorkReportingByWorkOrderId', queryLoadingByWorkOrderId:'/mes/mesMaterialLoading/queryLoadingByWorkOrderId', - queryCompletenessCheckByWorkOrderId:'/meskittingcompletenesscheck/mesKittingCompletenessCheck/queryCompletenessCheckByWorkOrderId', - queryOrderById:'/mesproductionwork/mesProductionOrder/queryById', + queryCompletenessCheckByWorkOrderId:'/mes/mesKittingCompletenessCheck/queryCompletenessCheckByWorkOrderId', + queryOrderById:'/mes/productionOrder/queryById', queryUnloadingByLoadingId:'/mes/mesMaterialUnloading/queryUnloadingByLoadingId', queryTransferDetailBy:'/mes/mesMaterialTransferDetail/queryTransferDetailBy', - publish: '/mesproductionworkorder/mesProductionWorkOrder/publish', - execute: '/mesproductionworkorder/mesProductionWorkOrder/execute', + publish: '/mes/mesProductionWorkOrder/publish', + execute: '/mes/mesProductionWorkOrder/execute', }, dictOptions: {}, superFieldList: [] @@ -770,15 +651,13 @@ this.$refs.MesProductionOrderModal.disableSubmit = true; }, async onSelectChange(selectedRowKeys){ - //mesWorkReporting,mesMaterialTransferRequest,mesMaterialLoading,mesKittingCompletenessCheck + //mesWorkReporting,路,mesMaterialLoading,mesKittingCompletenessCheck this.mesWorkReporting.loading = true - this.mesMaterialTransferRequest.loading = true this.mesMaterialLoading.loading = true this.mesKittingCompletenessCheck.loading = true this.selectedRowKeys = selectedRowKeys this.mesWorkReporting.dataSource=[] - this.mesMaterialTransferRequest.dataSource=[] this.mesMaterialLoading.dataSource=[] this.mesKittingCompletenessCheck.dataSource=[] if (selectedRowKeys.length > 0) { @@ -787,15 +666,12 @@ 'workOrderId':selectedId } const mesWorkReportingResult = await getAction(this.url.queryWorkReportingByWorkOrderId, parm) - const mesMaterialTransferRequestResult = await getAction(this.url.queryMaterialTransferRequestByWorkOrderId, parm) const mesMaterialLoadingResult = await getAction(this.url.queryLoadingByWorkOrderId, parm) const mesKittingCompletenessCheckResult = await getAction(this.url.queryCompletenessCheckByWorkOrderId, parm) this.mesWorkReporting.dataSource = mesWorkReportingResult.result - this.mesMaterialTransferRequest.dataSource = mesMaterialTransferRequestResult.result this.mesMaterialLoading.dataSource = mesMaterialLoadingResult.result this.mesKittingCompletenessCheck.dataSource = mesKittingCompletenessCheckResult.result this.mesWorkReporting.loading = false - this.mesMaterialTransferRequest.loading = false this.mesMaterialLoading.loading = false this.mesKittingCompletenessCheck.loading = false } diff --git a/src/views/mes/MesTransferOrderPrintList.vue b/src/views/mes/MesTransferOrderPrintList.vue index 9570e0e..14aa780 100644 --- a/src/views/mes/MesTransferOrderPrintList.vue +++ b/src/views/mes/MesTransferOrderPrintList.vue @@ -187,12 +187,12 @@ } ], url: { - list: "/mestransferorderprint/mesTransferOrderPrint/list", - delete: "/mestransferorderprint/mesTransferOrderPrint/delete", - deleteBatch: "/mestransferorderprint/mesTransferOrderPrint/deleteBatch", - exportXlsUrl: "/mestransferorderprint/mesTransferOrderPrint/exportXls", - importExcelUrl: "mestransferorderprint/mesTransferOrderPrint/importExcel", - + list: "/mes/mesTransferOrderPrint/list", + delete: "/mes/mesTransferOrderPrint/delete", + deleteBatch: "/mes/mesTransferOrderPrint/deleteBatch", + exportXlsUrl: "/mes/mesTransferOrderPrint/exportXls", + importExcelUrl: "mes/mesTransferOrderPrint/importExcel", + }, dictOptions:{}, superFieldList:[], diff --git a/src/views/mes/MesWorkReportingList.vue b/src/views/mes/MesWorkReportingList.vue index 7c50ded..d9a2d33 100644 --- a/src/views/mes/MesWorkReportingList.vue +++ b/src/views/mes/MesWorkReportingList.vue @@ -227,11 +227,11 @@ } ], url: { - list: "/mesworkreporting/mesWorkReporting/list", - delete: "/mesworkreporting/mesWorkReporting/delete", - deleteBatch: "/mesworkreporting/mesWorkReporting/deleteBatch", - exportXlsUrl: "/mesworkreporting/mesWorkReporting/exportXls", - importExcelUrl: "mesworkreporting/mesWorkReporting/importExcel", + list: "/mes/mesWorkReporting/list", + delete: "/mes/mesWorkReporting/delete", + deleteBatch: "/mes/mesWorkReporting/deleteBatch", + exportXlsUrl: "/mes/mesWorkReporting/exportXls", + importExcelUrl: "mes/mesWorkReporting/importExcel", }, dictOptions:{}, diff --git a/src/views/mes/modules/MesKittingCompletenessCheckForm.vue b/src/views/mes/modules/MesKittingCompletenessCheckForm.vue index 30e7c6f..bf66ec1 100644 --- a/src/views/mes/modules/MesKittingCompletenessCheckForm.vue +++ b/src/views/mes/modules/MesKittingCompletenessCheckForm.vue @@ -72,9 +72,9 @@ validatorRules: { }, url: { - add: "/meskittingcompletenesscheck/mesKittingCompletenessCheck/add", - edit: "/meskittingcompletenesscheck/mesKittingCompletenessCheck/edit", - queryById: "/meskittingcompletenesscheck/mesKittingCompletenessCheck/queryById" + add: "/mes/mesKittingCompletenessCheck/add", + edit: "/mes/mesKittingCompletenessCheck/edit", + queryById: "/mes/mesKittingCompletenessCheck/queryById" } } }, @@ -121,7 +121,7 @@ that.confirmLoading = false; }) } - + }) }, } diff --git a/src/views/mes/modules/MesProductionWorkOrderCompletenessCheckModal.vue b/src/views/mes/modules/MesProductionWorkOrderCompletenessCheckModal.vue index 6cb752a..e9aeb99 100644 --- a/src/views/mes/modules/MesProductionWorkOrderCompletenessCheckModal.vue +++ b/src/views/mes/modules/MesProductionWorkOrderCompletenessCheckModal.vue @@ -107,8 +107,8 @@ url: { report: '/mesworkreporting/mesWorkReporting/add', selectReportWorkOrderList: '/mes/productionOrder/selectReportWorkOrderList', - workOrderCompletenessCheck: '/mesproductionworkorder/mesProductionWorkOrder/workOrderCompletenessCheck', - add: '/meskittingcompletenesscheck/mesKittingCompletenessCheck/addBatch' + workOrderCompletenessCheck: '/mes/mesProductionWorkOrder/workOrderCompletenessCheck', + add: '/mes/mesKittingCompletenessCheck/addBatch' }, workOrderOptions: [] } diff --git a/src/views/mes/modules/MesProductionWorkOrderForm.vue b/src/views/mes/modules/MesProductionWorkOrderForm.vue index ce6941f..99228ef 100644 --- a/src/views/mes/modules/MesProductionWorkOrderForm.vue +++ b/src/views/mes/modules/MesProductionWorkOrderForm.vue @@ -112,9 +112,9 @@ validatorRules: { }, url: { - add: "/mesproductionworkorder/mesProductionWorkOrder/add", - edit: "/mesproductionworkorder/mesProductionWorkOrder/edit", - queryById: "/mesproductionworkorder/mesProductionWorkOrder/queryById" + add: "/mes/mesProductionWorkOrder/add", + edit: "/mes/mesProductionWorkOrder/edit", + queryById: "/mes/mesProductionWorkOrder/queryById" } } }, diff --git a/src/views/mes/modules/MesProductionWorkOrderListModal.vue b/src/views/mes/modules/MesProductionWorkOrderListModal.vue index 6075145..fb63710 100644 --- a/src/views/mes/modules/MesProductionWorkOrderListModal.vue +++ b/src/views/mes/modules/MesProductionWorkOrderListModal.vue @@ -97,7 +97,7 @@ workOrderDateOptions: [], url: { queryShiftGroupByFactoryId: '/base/shiftGroup/queryShiftGroupByFactoryId', - addSchedulePlan: '/mesproductionworkorder/mesProductionWorkOrder/addSchedulePlan' + addSchedulePlan: '/mes/mesProductionWorkOrder/addSchedulePlan' }, editRules: { materialNumber: [ diff --git a/src/views/mes/modules/MesProductionWorkOrderReportModal.vue b/src/views/mes/modules/MesProductionWorkOrderReportModal.vue index a26ef11..f5fbd02 100644 --- a/src/views/mes/modules/MesProductionWorkOrderReportModal.vue +++ b/src/views/mes/modules/MesProductionWorkOrderReportModal.vue @@ -81,7 +81,7 @@ sm: { span: 18 }, }, url: { - report: '/mesworkreporting/mesWorkReporting/add', + report: '/mes/mesWorkReporting/add', selectReportWorkOrderList: '/mes/productionOrder/selectReportWorkOrderList' }, workOrderOptions: [] diff --git a/src/views/mes/modules/MesProductionWorkOrderRepublishModal.vue b/src/views/mes/modules/MesProductionWorkOrderRepublishModal.vue index bf3160d..af38734 100644 --- a/src/views/mes/modules/MesProductionWorkOrderRepublishModal.vue +++ b/src/views/mes/modules/MesProductionWorkOrderRepublishModal.vue @@ -73,7 +73,7 @@ sm: { span: 18 }, }, url: { - republish: '/mesproductionworkorder/mesProductionWorkOrder/republish' + republish: '/mes/mesProductionWorkOrder/republish' } } }, diff --git a/src/views/mes/modules/MesProductionWorkOrderScheduleModal.vue b/src/views/mes/modules/MesProductionWorkOrderScheduleModal.vue index 0caacd9..cf7c9c8 100644 --- a/src/views/mes/modules/MesProductionWorkOrderScheduleModal.vue +++ b/src/views/mes/modules/MesProductionWorkOrderScheduleModal.vue @@ -232,17 +232,17 @@ }, // 琛ㄥご url: { - list: '/mesproductionworkorder/mesProductionWorkOrder/list', - delete: '/mesproductionworkorder/mesProductionWorkOrder/delete', - deleteBatch: '/mesproductionworkorder/mesProductionWorkOrder/deleteBatch', - exportXlsUrl: '/mesproductionworkorder/mesProductionWorkOrder/exportXls', - importExcelUrl: 'mesproductionworkorder/mesProductionWorkOrder/importExcel', + list: '/mes/mesProductionWorkOrder/list', + delete: '/mes/mesProductionWorkOrder/delete', + deleteBatch: '/mes/mesProductionWorkOrder/deleteBatch', + exportXlsUrl: '/mes/mesProductionWorkOrder/exportXls', + importExcelUrl: 'mes/mesProductionWorkOrder/importExcel', listProductionLinesOption: '/base/factory/queryIdTree', queryShiftGroupByFactoryId: '/base/shiftGroup/queryShiftGroupByFactoryId', queryFactoryById: '/base/factory/queryById', queryLswMaterialByProductionType: '/lsw/lswMaterial/queryLswMaterialByProductionType', - schedule: '/mesproductionworkorder/mesProductionWorkOrder/schedule', - addSchedulePlan: '/mesproductionworkorder/mesProductionWorkOrder/addSchedulePlan' + schedule: '/mes/mesProductionWorkOrder/schedule', + addSchedulePlan: '/mes/mesProductionWorkOrder/addSchedulePlan' }, editRules: { materialNumber: [ diff --git a/src/views/mes/modules/MesTransferOrderPrintForm.vue b/src/views/mes/modules/MesTransferOrderPrintForm.vue index 13a1a31..ae1fb68 100644 --- a/src/views/mes/modules/MesTransferOrderPrintForm.vue +++ b/src/views/mes/modules/MesTransferOrderPrintForm.vue @@ -97,9 +97,9 @@ validatorRules: { }, url: { - add: "/mestransferorderprint/mesTransferOrderPrint/add", - edit: "/mestransferorderprint/mesTransferOrderPrint/edit", - queryById: "/mestransferorderprint/mesTransferOrderPrint/queryById" + add: "/mes/mesTransferOrderPrint/add", + edit: "/mes/mesTransferOrderPrint/edit", + queryById: "/mes/mesTransferOrderPrint/queryById" } } }, @@ -146,7 +146,7 @@ that.confirmLoading = false; }) } - + }) }, } diff --git a/src/views/mes/modules/MesWorkReportingForm.vue b/src/views/mes/modules/MesWorkReportingForm.vue index 4e8986e..d6d095d 100644 --- a/src/views/mes/modules/MesWorkReportingForm.vue +++ b/src/views/mes/modules/MesWorkReportingForm.vue @@ -97,9 +97,9 @@ validatorRules: { }, url: { - add: "/mesworkreporting/mesWorkReporting/add", - edit: "/mesworkreporting/mesWorkReporting/edit", - queryById: "/mesworkreporting/mesWorkReporting/queryById" + add: "/mes/mesWorkReporting/add", + edit: "/mes/mesWorkReporting/edit", + queryById: "/mes/mesWorkReporting/queryById" } } }, @@ -146,7 +146,7 @@ that.confirmLoading = false; }) } - + }) }, } -- Gitblit v1.9.3