|
@@ -1034,14 +1034,14 @@
|
|
|
<!-- </Tooltip> -->
|
|
<!-- </Tooltip> -->
|
|
|
</div>
|
|
</div>
|
|
|
</FormItem>
|
|
</FormItem>
|
|
|
- <FormItem label="厚" :label-width="40">
|
|
|
|
|
|
|
+ <FormItem label="高" :label-width="40">
|
|
|
<Select
|
|
<Select
|
|
|
style="width: 80px"
|
|
style="width: 80px"
|
|
|
filterable
|
|
filterable
|
|
|
clearable
|
|
clearable
|
|
|
v-model="ele.material_detail_id"
|
|
v-model="ele.material_detail_id"
|
|
|
@on-change="(e) => handleMaterialChange(e, ele)"
|
|
@on-change="(e) => handleMaterialChange(e, ele)"
|
|
|
- placeholder="请选择厚"
|
|
|
|
|
|
|
+ placeholder="请选择高"
|
|
|
size="small"
|
|
size="small"
|
|
|
>
|
|
>
|
|
|
<Option
|
|
<Option
|
|
@@ -1058,7 +1058,7 @@
|
|
|
filterable
|
|
filterable
|
|
|
clearable
|
|
clearable
|
|
|
v-model="ele.material_detail_id"
|
|
v-model="ele.material_detail_id"
|
|
|
- placeholder="请选择厚"
|
|
|
|
|
|
|
+ placeholder="请选择宽"
|
|
|
size="small"
|
|
size="small"
|
|
|
>
|
|
>
|
|
|
<Option
|
|
<Option
|
|
@@ -1069,7 +1069,7 @@
|
|
|
></Option>
|
|
></Option>
|
|
|
</Select>
|
|
</Select>
|
|
|
</FormItem>
|
|
</FormItem>
|
|
|
- <FormItem label="高" :label-width="40">
|
|
|
|
|
|
|
+ <FormItem label="厚" :label-width="40">
|
|
|
<Select
|
|
<Select
|
|
|
style="width: 80px"
|
|
style="width: 80px"
|
|
|
filterable
|
|
filterable
|
|
@@ -3374,12 +3374,16 @@ export default {
|
|
|
element.wideCalc = JSON.parse(JSON.stringify(element.wide));
|
|
element.wideCalc = JSON.parse(JSON.stringify(element.wide));
|
|
|
element.highCalc = JSON.parse(JSON.stringify(element.high));
|
|
element.highCalc = JSON.parse(JSON.stringify(element.high));
|
|
|
element.part_detail.forEach((elem) => {
|
|
element.part_detail.forEach((elem) => {
|
|
|
|
|
+ elem.org_num = JSON.parse(JSON.stringify(elem.num));
|
|
|
elem.material_detail_id = 0;
|
|
elem.material_detail_id = 0;
|
|
|
elem.material_detail_title =
|
|
elem.material_detail_title =
|
|
|
elem.material_detail_list[0].title;
|
|
elem.material_detail_list[0].title;
|
|
|
elem.material_detail_id =
|
|
elem.material_detail_id =
|
|
|
elem.material_detail_list[0].material_detail_id;
|
|
elem.material_detail_list[0].material_detail_id;
|
|
|
elem.material_detail_num = elem.num || 0;
|
|
elem.material_detail_num = elem.num || 0;
|
|
|
|
|
+ elem.material_detail_org_num = JSON.parse(
|
|
|
|
|
+ JSON.stringify(elem.num || 0)
|
|
|
|
|
+ );
|
|
|
elem.long ? "" : (elem.long = 0);
|
|
elem.long ? "" : (elem.long = 0);
|
|
|
elem.wide ? "" : (elem.wide = 0);
|
|
elem.wide ? "" : (elem.wide = 0);
|
|
|
elem.high ? "" : (elem.high = 0);
|
|
elem.high ? "" : (elem.high = 0);
|
|
@@ -3538,6 +3542,10 @@ export default {
|
|
|
elem.material_detail_list[0].title;
|
|
elem.material_detail_list[0].title;
|
|
|
elem.material_detail_id =
|
|
elem.material_detail_id =
|
|
|
elem.material_detail_list[0].material_detail_id;
|
|
elem.material_detail_list[0].material_detail_id;
|
|
|
|
|
+ elem.org_num = JSON.parse(JSON.stringify(elem.num));
|
|
|
|
|
+ elem.material_detail_org_num = JSON.parse(
|
|
|
|
|
+ JSON.stringify(elem.num || 0)
|
|
|
|
|
+ );
|
|
|
elem.material_detail_num = elem.num || 0;
|
|
elem.material_detail_num = elem.num || 0;
|
|
|
elem.long ? "" : (elem.long = 0);
|
|
elem.long ? "" : (elem.long = 0);
|
|
|
elem.wide ? "" : (elem.wide = 0);
|
|
elem.wide ? "" : (elem.wide = 0);
|
|
@@ -3845,7 +3853,8 @@ export default {
|
|
|
handleProductNumChange(e, product) {
|
|
handleProductNumChange(e, product) {
|
|
|
product.part.map((element) => {
|
|
product.part.map((element) => {
|
|
|
element.part_detail.map((elem) => {
|
|
element.part_detail.map((elem) => {
|
|
|
- elem.material_detail_num *= e.target.value;
|
|
|
|
|
|
|
+ elem.material_detail_num =
|
|
|
|
|
+ e.target.value * elem.material_detail_org_num;
|
|
|
});
|
|
});
|
|
|
});
|
|
});
|
|
|
product.num = product.total_num = e.target.value;
|
|
product.num = product.total_num = e.target.value;
|
Andy