mes/mes-lxsm-ui
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：工作站设备选择中增加“所属车间”过滤条件。设备台账中的“所属车间”名称展示问题修复

Browse Source
This commit is contained in:
zhangxuanming 2025-02-05 17:38:40 +08:00
parent 4995e9bf2f
commit b01fba286e
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/components/machinerySelect/single.vue
View File

@ -52,6 +52,15 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="所属车间" prop="workshopName">
<el-input
v-model="queryParams.workshopName"
placeholder="请输入所属车间"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -68,7 +77,7 @@
<el-table-column label="设备名称" min-width="120" align="left" key="machineryName" prop="machineryName" :show-overflow-tooltip="true" />
<el-table-column label="品牌" align="left" key="machineryBrand" prop="machineryBrand" :show-overflow-tooltip="true" />
<el-table-column label="规格型号" align="left" key="machinerySpec" prop="machinerySpec" :show-overflow-tooltip="true" />
<el-table-column label="所属车间" align="center" key="machineryTypeName" prop="machineryTypeName" :show-overflow-tooltip="true" />
<el-table-column label="所属车间" align="center" key="workshopName" prop="workshopName" :show-overflow-tooltip="true" />
<el-table-column label="设备状态" align="center" key="status" prop="status" >
<template slot-scope="scope">
<dict-tag :options="dict.type.mes_machinery_status" :value="scope.row.status"/>

10
src/views/mes/dv/machinery/index.vue
View File

@ -123,7 +123,7 @@
<el-table-column label="设备名称" min-width="120" align="left" key="machineryName" prop="machineryName" :show-overflow-tooltip="true" />
<el-table-column label="品牌" align="left" key="machineryBrand" prop="machineryBrand" :show-overflow-tooltip="true" />
<el-table-column label="规格型号" align="left" key="machinerySpec" prop="machinerySpec" :show-overflow-tooltip="true" />
<el-table-column label="所属车间" align="center" key="machineryTypeName" prop="machineryTypeName" :show-overflow-tooltip="true" />
<el-table-column label="所属车间" align="center" key="workshopName" prop="workshopName" :show-overflow-tooltip="true" />
<el-table-column label="设备状态" align="center" key="status" prop="status" >
<template slot-scope="scope">
<dict-tag :options="dict.type.mes_machinery_status" :value="scope.row.status"/>
@ -218,7 +218,7 @@
<el-row>
<el-col :span="24">
<el-form-item label="所属车间" prop="workshopId">
<el-select v-model="form.workshopId" placeholder="请选择车间">
<el-select v-model="form.workshopId" @change="changeWorkshop" placeholder="请选择车间">
<el-option
v-for="item in workshopOptions"
:key="item.workshopId"
@ -412,6 +412,12 @@ export default {
this.getTreeselect();
},
methods: {
changeWorkshop(val) {
const workshop = this.workshopOptions.filter(item => item.workshopId == val)
this.form.workshopId = workshop[0].workshopId
this.form.workshopName = workshop[0].workshopName
this.form.workshopCode = workshop[0].workshopCode
},
/** 查询物料编码列表 */
getList() {
this.loading = true;