Mes
/
middle-admin-ant
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

报价

This commit is contained in:
xielue 2023-07-20 15:35:18 +08:00
parent 54fdaccac1
commit 5153d8081e
2 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pages/Middle/Mes/MesReporting/MesReporting/index.vue
View File

@ -575,7 +575,7 @@ export default {
postdata.order_id = this.formOptions4.data.order_id;
postdata.production_order_id = this.formOptions4.data.production_order_id;
postdata.materials_id = this.formOptions4.data.materials_id;
postdata.batch_id = this.formOptions4.data.batch_id;
postdata.batch_id = this.formOptions4.data.id;
postdata.batch_no = this.formOptions4.data.batch_no;
postdata.production_plan_id = this.formOptions4.data.production_plan_id;
postdata.production_dispatch_id = this.formOptions4.data.production_dispatch_id;

36
src/pages/Middle/bathroom/BathroomScheme/BathroomScheme/Edit.vue
View File

@ -48,13 +48,13 @@
:edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
<vxe-column field="long_formula" title="长(公式)" width="220"
:params="{ moreExpressionsList: getMoreExpressionsList_material_height }"
:params="{ moreExpressionsList: getMoreExpressionsList }"
:edit-render="{ name: 'EditExpressions' }"></vxe-column>
<vxe-column field="width_formula" title="宽(公式)" width="220"
:params="{ moreExpressionsList: getMoreExpressionsList_material_height }"
:params="{ moreExpressionsList: getMoreExpressionsList }"
:edit-render="{ name: 'EditExpressions' }"></vxe-column>
<vxe-column field="height_formula" title="厚(公式)" width="220"
:params="{ moreExpressionsList: getMoreExpressionsList_material_height }"
:params="{ moreExpressionsList: getMoreExpressionsList }"
:edit-render="{ name: 'EditExpressions' }"></vxe-column>
<vxe-column field="quantity" title="数量" width="80"
:edit-render="{ name: '$input', props: { type: 'number' } }"></vxe-column>
@ -479,7 +479,7 @@ export default {
bathroomMaterial_list: [],//材料的数据
moreExpressionsList_material_height: [],//材料的厚度 变量列表
moreExpressionsList_fittings: [],
uploadDefaultImg: null,
detailDataFieldName: "bathroom_scheme",
@ -731,6 +731,7 @@ export default {
this.materialHeightInit();
this.fittingsListInit();
this.detailDataInit();
}).catch((a) => {
@ -756,6 +757,29 @@ export default {
methods: {
fittingsListInit() { // 获取部件数据
this.$mk.post({ // 获取材料列表
url: `${BASE_URL.BASE_URL}//BathroomFittings/v1/bathroom/fittings/list`,
data: { "page": 1, "limit": 100, "order_bys": [], "search_rules": [] }
}).then(a => {
this.fittings_list = a.data.BathroomFittings || [];
this.moreExpressionsList_fittings = [];
this.fittings_list.forEach(o => {
if (o.IsShowExpression) {
this.moreExpressionsList_fittings.push(this.formatName(o.name) + "的长");
this.moreExpressionsList_fittings.push(this.formatName(o.name) + "的宽");
this.moreExpressionsList_fittings.push(this.formatName(o.name) + "的厚");
}
});
});
},
materialHeightInit() {
this.$mk.post({
@ -789,8 +813,8 @@ export default {
});
},
getMoreExpressionsList_material_height() {
return this.moreExpressionsList_material_height;
getMoreExpressionsList() {
return [...this.moreExpressionsList_material_height, ...this.moreExpressionsList_fittings]
},
loadSettings() {