From 8e451b57702434dcf0ec9deb2e7398d235970260 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期二, 26 八月 2025 16:50:31 +0800
Subject: [PATCH] 报工查询页面、产线选择下拉框调整
---
src/views/mes/modules/MesProductionWorkOrderScheduleModal.vue | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/src/views/mes/modules/MesProductionWorkOrderScheduleModal.vue b/src/views/mes/modules/MesProductionWorkOrderScheduleModal.vue
index 8a0a54a..27a6bbe 100644
--- a/src/views/mes/modules/MesProductionWorkOrderScheduleModal.vue
+++ b/src/views/mes/modules/MesProductionWorkOrderScheduleModal.vue
@@ -19,8 +19,9 @@
<a-row :gutter="12">
<a-col :span="7">
<a-form-item label="浜х嚎" :label-col="{span: 6}" :wrapper-col="{span: 18}">
- <j-tree-select dict="base_factory,factory_name,id" pid-field="parent_id"
- v-model="queryParam.factoryId" style="width: 100%"></j-tree-select>
+ <j-search-select-tag placeholder="璇烽�夋嫨" v-model="queryParam.factoryId"
+ dict="base_factory,factory_name,id,del_flag=0 and factory_category = '3'"
+ ></j-search-select-tag>
</a-form-item>
</a-col>
<a-col :span="9">
@@ -157,7 +158,6 @@
<!-- :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"-->
<!-- @page-change="handlePageChange">-->
<!-- </vxe-pager>-->
- </div>
</a-card>
</a-col>
<a-col :span="12">
@@ -233,16 +233,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 +483,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 +522,8 @@
if (this.dateRange[0]) {
this.calendarStartDate = this.dateRange[0].clone().startOf('week');
}
+ } else {
+ this.$message.error(res.message)
}
})
},
--
Gitblit v1.9.3