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

报价

This commit is contained in:
xielue 2023-06-25 12:40:19 +08:00
parent 185e2e8e81
commit e1ddcc0314
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/Edit.vue
View File

@ -1548,7 +1548,7 @@ export default {
this.resetMaterial(); this.resetMaterial();
if (selectedData.spec) { if (selectedData.spec) {
row.height_formula = selectedData.spec; row.material_default_height = selectedData.spec;
} }
} }
@ -1558,6 +1558,13 @@ export default {
if (!row.paint_number && this.settignsValues.Default_rate_of_paint_surface) { if (!row.paint_number && this.settignsValues.Default_rate_of_paint_surface) {
row.paint_number = this.settignsValues.Default_rate_of_paint_surface; row.paint_number = this.settignsValues.Default_rate_of_paint_surface;
} }
if (!row.board_length_formula) {
row.board_length_formula = this.settignsValues.Default_board_length_formula || '{板材的长}*{板材的宽}*{部件的数量}/{主材利用率}/1000000/2.96';
}
if (!row.paint_area_formula) {
row.paint_area_formula = this.settignsValues.Default_paint_area_formula || '{板材的长}*{板材的宽}*{部件的数量}*{油漆面}/1000000';
}
}, },
fittings_onPopupSelected({ rows, name, params }) { fittings_onPopupSelected({ rows, name, params }) {
console.log(rows, name, params); console.log(rows, name, params);

14
src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/drawer.vue
View File

@ -124,8 +124,6 @@
</template> </template>
</vxe-column> </vxe-column>
<vxe-column field="real_quantity" title="实木用量(立方)" width="80"
:edit-render="{ name: '$input', props: { type: 'number' } }"></vxe-column>
<vxe-column field="paint_area_formula" title="油漆面积(㎡)" width="220" :edit-render="{ name: 'EditExpressions' }"> <vxe-column field="paint_area_formula" title="油漆面积(㎡)" width="220" :edit-render="{ name: 'EditExpressions' }">
<template #default="{ row }"> <template #default="{ row }">
<a-tooltip> <a-tooltip>
@ -141,6 +139,8 @@
</a-tooltip> </a-tooltip>
</template> </template>
</vxe-column> </vxe-column>
<vxe-column field="real_quantity" title="实木用量(立方)" width="80"
:edit-render="{ name: '$input', props: { type: 'number' } }"></vxe-column>
<vxe-column field="remark" title="备注" width="120" :edit-render="{ name: 'textarea' }"></vxe-column> <vxe-column field="remark" title="备注" width="120" :edit-render="{ name: 'textarea' }"></vxe-column>
</vxe-table> </vxe-table>
@ -1076,7 +1076,7 @@ export default {
this.resetMaterial(); this.resetMaterial();
if(selectedData.spec){ if(selectedData.spec){
row.height_formula = selectedData.spec; row.material_default_height = selectedData.spec;
} }
} }
if (!row.rate_materials && this.settignsValues.Main_material_utilization_rate) { if (!row.rate_materials && this.settignsValues.Main_material_utilization_rate) {
@ -1085,6 +1085,14 @@ export default {
if (!row.paint_number && this.settignsValues.Default_rate_of_paint_surface) { if (!row.paint_number && this.settignsValues.Default_rate_of_paint_surface) {
row.paint_number = this.settignsValues.Default_rate_of_paint_surface; row.paint_number = this.settignsValues.Default_rate_of_paint_surface;
} }
if (!row.board_length_formula) {
row.board_length_formula = this.settignsValues.Default_board_length_formula || '{板材的长}*{板材的宽}*{部件的数量}/{主材利用率}/1000000/2.96';
}
if (!row.paint_area_formula) {
row.paint_area_formula = this.settignsValues.Default_paint_area_formula || '{板材的长}*{板材的宽}*{部件的数量}*{油漆面}/1000000';
}
}, },
fittings_onPopupSelected({ rows, name, params }) { fittings_onPopupSelected({ rows, name, params }) {
console.log(rows, name, params); console.log(rows, name, params);