From 90c731cdd9274bec8d7ecc547e007d991faa9a26 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期二, 19 八月 2025 11:53:40 +0800 Subject: [PATCH] art: 删除物料拉动明细相关代码 --- src/views/mes/modules/MesProductionWorkOrderScheduleModal.vue | 31 ++++++++++++++++--------------- 1 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/views/mes/modules/MesProductionWorkOrderScheduleModal.vue b/src/views/mes/modules/MesProductionWorkOrderScheduleModal.vue index 8a0a54a..cf7c9c8 100644 --- a/src/views/mes/modules/MesProductionWorkOrderScheduleModal.vue +++ b/src/views/mes/modules/MesProductionWorkOrderScheduleModal.vue @@ -157,7 +157,6 @@ <!-- :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"--> <!-- @page-change="handlePageChange">--> <!-- </vxe-pager>--> - </div> </a-card> </a-col> <a-col :span="12"> @@ -233,16 +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', - schedule: '/mesproductionworkorder/mesProductionWorkOrder/schedule', - addSchedulePlan: '/mesproductionworkorder/mesProductionWorkOrder/addSchedulePlan' + queryLswMaterialByProductionType: '/lsw/lswMaterial/queryLswMaterialByProductionType', + schedule: '/mes/mesProductionWorkOrder/schedule', + addSchedulePlan: '/mes/mesProductionWorkOrder/addSchedulePlan' }, editRules: { materialNumber: [ @@ -482,21 +482,20 @@ }); promises.push(shiftGroupPromise); - const materialNumberPromise = ajaxGetDictItems("lsw_material,material_name,material_number,del_flag!='1' order by material_number asc", null).then(res => { + const materialNumberPromise = getAction(this.url.queryLswMaterialByProductionType, { factoryId: factoryId }).then(res => { if (res.success) { this.materialOptions = res.result.map(item => { return { - value: item.value, - label: item.value + value: item.materialNumber, + label: item.materialNumber } - }); + }) this.materNumberNameMap = res.result.reduce((map, item) => { - map[item.value] = item.text + map[item.materialNumber] = item.materialName return map }, {}) } - }).catch(() => { - }); + }) promises.push(materialNumberPromise); // 绛夊緟鎵�鏈夎姹傚畬鎴� @@ -522,6 +521,8 @@ if (this.dateRange[0]) { this.calendarStartDate = this.dateRange[0].clone().startOf('week'); } + } else { + this.$message.error(res.message) } }) }, -- Gitblit v1.9.3