机床信息 上传限制1个,查询和列表改为运行状态字段

This commit is contained in:
xusd 2024-11-12 14:48:59 +08:00
parent e0697e2103
commit ec590f7e9f
3 changed files with 7 additions and 6 deletions

View File

@ -30,6 +30,7 @@ public interface EquipInfoMapper extends BaseMapperX<EquipInfoDO> {
.likeIfPresent(EquipInfoDO::getEquipName, reqVO.getEquipName())
.likeIfPresent(EquipInfoDO::getEquipNo, reqVO.getEquipNo())
.eqIfPresent(EquipInfoDO::getStatus, reqVO.getStatus())
.eqIfPresent(EquipInfoDO::getRunStatus, reqVO.getRunStatus())
.groupBy(EquipInfoDO::getCustomerId, EquipInfoDO::getModelId)
);
}

View File

@ -146,7 +146,7 @@
/>
</el-form-item>
<el-form-item label="二维码图片">
<ImageUpload v-model="formData.qrcodePicPath" />
<ImageUpload v-model="formData.qrcodePicPath" :limit="1"/>
</el-form-item>
</el-form>
<div

View File

@ -58,7 +58,7 @@
</el-form-item>
<el-form-item
label="机床状态"
prop="status"
prop="runStatus"
>
<el-select
v-model="queryParams.status"
@ -67,7 +67,7 @@
size="small"
>
<el-option
v-for="dict in this.getDictDatas(DICT_TYPE.EQUIP_STATUS)"
v-for="dict in this.getDictDatas(DICT_TYPE.EQUIP_RUN_STATUS)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
@ -178,12 +178,12 @@
<el-table-column
label="机床状态"
align="center"
prop="status"
prop="runStatus"
>
<template v-slot="scope">
<dict-tag
:type="DICT_TYPE.EQUIP_STATUS"
:value="scope.row.status"
:type="DICT_TYPE.EQUIP_RUN_STATUS"
:value="scope.row.runStatus"
/>
</template>
</el-table-column>