licq/chem_mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(equipment): 修复设备管理页面数据类型和功能问题

Browse Source
This commit is contained in:
zxy 2026-04-13 17:23:14 +08:00
parent 0482415535
commit 79e97ce31b
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/equipment/EquipmentPagination.java
View File

@ -32,7 +32,7 @@ public class EquipmentPagination extends Pagination {
private String eqStatus;
@Schema(description = "责任部门id")
private Integer deptId;
private String deptId;
@Schema(description = "产线id")
private Integer lineId;

37
jnpf-java-boot/jnpf-web/src/views/example/equipment/index.vue
View File

@ -38,24 +38,24 @@
<el-option
v-for="item in deptList"
:key="item.id"
:label="item.fullName"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="所属产线">
<el-select v-model="query.lineId" placeholder="请选择产线" clearable>
<el-option
v-for="item in lineList"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :span="6">-->
<!-- <el-form-item label="所属产线">-->
<!-- <el-select v-model="query.lineId" placeholder="请选择产线" clearable>-->
<!-- <el-option-->
<!-- v-for="item in lineList"-->
<!-- :key="item.id"-->
<!-- :label="item.name"-->
<!-- :value="item.id">-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="6">
<el-form-item class="btn">
<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
@ -77,6 +77,7 @@
:data="list"
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center"/>
<el-table-column prop="deptName" label="所属部门" align="center" min-width="100"/>
<el-table-column prop="eqCode" label="设备编码" align="center" min-width="120"/>
<el-table-column prop="eqName" label="设备名称" align="center" min-width="120"/>
<el-table-column prop="eqType" label="设备类型" align="center" min-width="100">
@ -87,7 +88,6 @@
<el-table-column prop="mode" label="型号" align="center" min-width="100"/>
<el-table-column prop="manufacturer" label="生产厂家" align="center" min-width="120"/>
<el-table-column prop="supplier" label="供应商" align="center" min-width="120"/>
<el-table-column prop="deptName" label="所属部门" align="center" min-width="100"/>
<el-table-column prop="userName" label="责任人" align="center" min-width="80"/>
<el-table-column prop="lineName" label="所属产线" align="center" min-width="100"/>
<el-table-column prop="buyDate" label="购买日期" align="center" min-width="100" :formatter="jnpf.tableDateFormat1"/>
@ -122,6 +122,7 @@
<script>
import {customerOptions, deleteEquipment, getEquipmentList, getLabel, getLineList} from "./equipment";
import {getDataInterfaceRes} from "@/api/systemData/dataInterface";
import {mapGetters} from "vuex";
import JNPFForm from "./form";
import jnpf from "@/utils/jnpf";
@ -206,10 +207,12 @@ export default {
this.multipleSelection = val;
},
getDeptList() {
// TODO: 需要添加对应的 API 方法
// getDeptList().then(res => {
// this.deptList = res.data || [];
// });
getDataInterfaceRes('811583643129479301').then(res => {
this.deptList = res.data || [];
console.log(this.deptList);
}).catch(() => {
this.deptList = [];
});
},
getLineList() {
getLineList().then(res => {