xd
/
JNBusiness
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

'123'

This commit is contained in:
xd 2024-03-06 16:50:10 +08:00
parent 5d7a033c7e
commit 5871c178a2
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-system/src/main/java/com/ruoyi/clMaterial/domain/CYlMaterial.java
View File

@ -73,9 +73,13 @@ public class CYlMaterial extends BaseEntity
return materialPrice; return materialPrice;
} }
public String getMaterialState() {return materialState;} public String getMaterialState() {
return materialState;
}
public void setMaterialState(String materialState) {this.materialState = materialState;} public void setMaterialState(String materialState) {
this.materialState = materialState;
}
@Override @Override
public String toString() { public String toString() {

1
ruoyi-system/src/main/resources/mapper/material/CMaterialMapper.xml
View File

@ -44,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="materialXingh != null and materialXingh != ''"> and material_xingh like concat('%', #{materialXingh}, '%')</if> <if test="materialXingh != null and materialXingh != ''"> and material_xingh like concat('%', #{materialXingh}, '%')</if>
<if test="materialGuig != null and materialGuig != ''"> and material_guig like concat('%', #{materialGuig}, '%')</if> <if test="materialGuig != null and materialGuig != ''"> and material_guig like concat('%', #{materialGuig}, '%')</if>
<if test="materialDiany != null and materialDiany != ''"> and material_diany like concat('%', #{materialDiany}, '%')</if> <if test="materialDiany != null and materialDiany != ''"> and material_diany like concat('%', #{materialDiany}, '%')</if>
<if test="materialState != null and materialState != ''"> and material_state = #{materialState}</if>
</where> </where>
</select> </select>

6
ruoyi-ui/src/views/material/material/index.vue
View File

@ -26,7 +26,7 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="materialState"> <el-form-item label="状态" prop="materialState">
<el-select v-model="queryParams.materialState" placeholder="材料状态" clearable> <el-select v-model="queryParams.materialState" placeholder="物料状态" clearable>
<el-option <el-option
v-for="dict in dict.type.material_state" v-for="dict in dict.type.material_state"
:key="dict.value" :key="dict.value"
@ -292,6 +292,7 @@ export default {
materialXingh: null, materialXingh: null,
materialGuig: null, materialGuig: null,
materialDiany: null, materialDiany: null,
materialState: null
}, },
// 表单参数 // 表单参数
form: {}, form: {},
@ -374,7 +375,8 @@ export default {
materialXingh: null, materialXingh: null,
materialGuig: null, materialGuig: null,
materialDiany: null, materialDiany: null,
materialDw: null materialDw: null,
materialState: 0
}; };
this.cMaterialCostList = []; this.cMaterialCostList = [];
this.resetForm("form"); this.resetForm("form");