'123'
This commit is contained in:
parent
5d7a033c7e
commit
5871c178a2
|
@ -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() {
|
||||||
|
|
|
@ -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>
|
||||||
|
|
||||||
|
|
|
@ -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");
|
||||||
|
|
Loading…
Reference in New Issue