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/MesProductionWorkOrderListView.vue | 146 +++--------------------------------------------- 1 files changed, 11 insertions(+), 135 deletions(-) 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 } -- Gitblit v1.9.3