This commit is contained in:
parent
46e43b2113
commit
185e2e8e81
|
|
@ -47,9 +47,9 @@
|
||||||
|
|
||||||
<vxe-table border show-overflow keep-source ref="fittings_xTable" :data="fittings_detailsData"
|
<vxe-table border show-overflow keep-source ref="fittings_xTable" :data="fittings_detailsData"
|
||||||
:keyboard-config="{
|
:keyboard-config="{
|
||||||
isArrow: true, isDel: true,
|
isArrow: true, isDel: true,
|
||||||
isEnter: false, isTab: true, isEdit: true, isChecked: true
|
isEnter: false, isTab: true, isEdit: true, isChecked: true
|
||||||
}" :mouse-config="{ selected: true }" @pulldownSelected="fittings_onPulldownSelected" show-footer
|
}" :mouse-config="{ selected: true }" @pulldownSelected="fittings_onPulldownSelected" show-footer
|
||||||
:footer-method="fittings_footerMethod" :footer-cell-class-name="fittings_footerCellClassName"
|
:footer-method="fittings_footerMethod" :footer-cell-class-name="fittings_footerCellClassName"
|
||||||
@popupSelected="fittings_onPopupSelected" :export-config="{}" @edit-closed="fittings_afterEditEvent"
|
@popupSelected="fittings_onPopupSelected" :export-config="{}" @edit-closed="fittings_afterEditEvent"
|
||||||
@edit-actived="fittings_beforeEditEvent"
|
@edit-actived="fittings_beforeEditEvent"
|
||||||
|
|
@ -182,9 +182,9 @@
|
||||||
(合计)金额:{{ parseFloat(formOptions.data.parts_total_amount || 0).toFixed(2) }}
|
(合计)金额:{{ parseFloat(formOptions.data.parts_total_amount || 0).toFixed(2) }}
|
||||||
</div>
|
</div>
|
||||||
<vxe-table border show-overflow keep-source ref="parts_xTable" :data="parts_detailsData" :keyboard-config="{
|
<vxe-table border show-overflow keep-source ref="parts_xTable" :data="parts_detailsData" :keyboard-config="{
|
||||||
isArrow: true, isDel: true,
|
isArrow: true, isDel: true,
|
||||||
isEnter: false, isTab: true, isEdit: true, isChecked: true
|
isEnter: false, isTab: true, isEdit: true, isChecked: true
|
||||||
}" :mouse-config="{ selected: true }" @pulldownSelected="parts_onPulldownSelected"
|
}" :mouse-config="{ selected: true }" @pulldownSelected="parts_onPulldownSelected"
|
||||||
@popupSelected="parts_onPopupSelected" :export-config="{}" @edit-closed="parts_afterEditEvent"
|
@popupSelected="parts_onPopupSelected" :export-config="{}" @edit-closed="parts_afterEditEvent"
|
||||||
@edit-actived="parts_beforeEditEvent" show-footer :footer-method="parts_footerMethod"
|
@edit-actived="parts_beforeEditEvent" show-footer :footer-method="parts_footerMethod"
|
||||||
:footer-cell-class-name="parts_footerCellClassName"
|
:footer-cell-class-name="parts_footerCellClassName"
|
||||||
|
|
@ -237,9 +237,9 @@
|
||||||
</div>
|
</div>
|
||||||
<vxe-table border show-overflow keep-source ref="packaging_xTable" :data="packaging_detailsData"
|
<vxe-table border show-overflow keep-source ref="packaging_xTable" :data="packaging_detailsData"
|
||||||
:keyboard-config="{
|
:keyboard-config="{
|
||||||
isArrow: true, isDel: true,
|
isArrow: true, isDel: true,
|
||||||
isEnter: false, isTab: true, isEdit: true, isChecked: true
|
isEnter: false, isTab: true, isEdit: true, isChecked: true
|
||||||
}" :mouse-config="{ selected: true }" @pulldownSelected="packaging_onPulldownSelected"
|
}" :mouse-config="{ selected: true }" @pulldownSelected="packaging_onPulldownSelected"
|
||||||
@popupSelected="packaging_onPopupSelected" :export-config="{}" @edit-closed="packaging_afterEditEvent"
|
@popupSelected="packaging_onPopupSelected" :export-config="{}" @edit-closed="packaging_afterEditEvent"
|
||||||
@edit-actived="packaging_beforeEditEvent" show-footer :footer-method="packaging_footerMethod"
|
@edit-actived="packaging_beforeEditEvent" show-footer :footer-method="packaging_footerMethod"
|
||||||
:footer-cell-class-name="packaging_footerCellClassName"
|
:footer-cell-class-name="packaging_footerCellClassName"
|
||||||
|
|
@ -340,9 +340,9 @@
|
||||||
(合计)金额:{{ parseFloat(formOptions.data.drawer_total_amount || 0).toFixed(2) }}
|
(合计)金额:{{ parseFloat(formOptions.data.drawer_total_amount || 0).toFixed(2) }}
|
||||||
</div>
|
</div>
|
||||||
<vxe-table border show-overflow keep-source ref="drawer_xTable" :data="drawer_detailsData" :keyboard-config="{
|
<vxe-table border show-overflow keep-source ref="drawer_xTable" :data="drawer_detailsData" :keyboard-config="{
|
||||||
isArrow: true, isDel: true,
|
isArrow: true, isDel: true,
|
||||||
isEnter: false, isTab: true, isEdit: true, isChecked: true
|
isEnter: false, isTab: true, isEdit: true, isChecked: true
|
||||||
}" :mouse-config="{ selected: true }" @pulldownSelected="drawer_onPulldownSelected"
|
}" :mouse-config="{ selected: true }" @pulldownSelected="drawer_onPulldownSelected"
|
||||||
@popupSelected="drawer_onPopupSelected" :export-config="{}" @edit-closed="drawer_afterEditEvent"
|
@popupSelected="drawer_onPopupSelected" :export-config="{}" @edit-closed="drawer_afterEditEvent"
|
||||||
@edit-actived="drawer_beforeEditEvent" show-footer :footer-method="drawer_footerMethod"
|
@edit-actived="drawer_beforeEditEvent" show-footer :footer-method="drawer_footerMethod"
|
||||||
:footer-cell-class-name="drawer_footerCellClassName"
|
:footer-cell-class-name="drawer_footerCellClassName"
|
||||||
|
|
@ -375,9 +375,9 @@
|
||||||
|
|
||||||
<vxe-table border show-overflow keep-source ref="material_xTable" :data="material_detailsData"
|
<vxe-table border show-overflow keep-source ref="material_xTable" :data="material_detailsData"
|
||||||
:keyboard-config="{
|
:keyboard-config="{
|
||||||
isArrow: true, isDel: true,
|
isArrow: true, isDel: true,
|
||||||
isEnter: false, isTab: true, isEdit: true, isChecked: true
|
isEnter: false, isTab: true, isEdit: true, isChecked: true
|
||||||
}" :mouse-config="{ selected: true }" @pulldownSelected="material_onPulldownSelected"
|
}" :mouse-config="{ selected: true }" @pulldownSelected="material_onPulldownSelected"
|
||||||
@popupSelected="material_onPopupSelected" :export-config="{}" @edit-closed="material_afterEditEvent"
|
@popupSelected="material_onPopupSelected" :export-config="{}" @edit-closed="material_afterEditEvent"
|
||||||
show-footer :footer-method="material_footerMethod" :footer-cell-class-name="material_footerCellClassName"
|
show-footer :footer-method="material_footerMethod" :footer-cell-class-name="material_footerCellClassName"
|
||||||
:edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: material_beforeEditMethod }">
|
:edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: material_beforeEditMethod }">
|
||||||
|
|
@ -437,9 +437,9 @@
|
||||||
(合计)金额:{{ parseFloat(formOptions.data.labor_total_amount || 0).toFixed(2) }}
|
(合计)金额:{{ parseFloat(formOptions.data.labor_total_amount || 0).toFixed(2) }}
|
||||||
</div>
|
</div>
|
||||||
<vxe-table border show-overflow keep-source ref="labor_xTable" :data="labor_detailsData" :keyboard-config="{
|
<vxe-table border show-overflow keep-source ref="labor_xTable" :data="labor_detailsData" :keyboard-config="{
|
||||||
isArrow: true, isDel: true,
|
isArrow: true, isDel: true,
|
||||||
isEnter: false, isTab: true, isEdit: true, isChecked: true
|
isEnter: false, isTab: true, isEdit: true, isChecked: true
|
||||||
}" :mouse-config="{ selected: true }" @pulldownSelected="labor_onPulldownSelected"
|
}" :mouse-config="{ selected: true }" @pulldownSelected="labor_onPulldownSelected"
|
||||||
@popupSelected="labor_onPopupSelected" :export-config="{}" @edit-closed="labor_afterEditEvent"
|
@popupSelected="labor_onPopupSelected" :export-config="{}" @edit-closed="labor_afterEditEvent"
|
||||||
@edit-actived="labor_beforeEditEvent" show-footer :footer-method="labor_footerMethod"
|
@edit-actived="labor_beforeEditEvent" show-footer :footer-method="labor_footerMethod"
|
||||||
:footer-cell-class-name="labor_footerCellClassName"
|
:footer-cell-class-name="labor_footerCellClassName"
|
||||||
|
|
@ -488,9 +488,9 @@
|
||||||
</div>
|
</div>
|
||||||
<vxe-table border show-overflow keep-source ref="expense_xTable" :data="expense_detailsData"
|
<vxe-table border show-overflow keep-source ref="expense_xTable" :data="expense_detailsData"
|
||||||
:keyboard-config="{
|
:keyboard-config="{
|
||||||
isArrow: true, isDel: true,
|
isArrow: true, isDel: true,
|
||||||
isEnter: false, isTab: true, isEdit: true, isChecked: true
|
isEnter: false, isTab: true, isEdit: true, isChecked: true
|
||||||
}" :mouse-config="{ selected: true }" @pulldownSelected="expense_onPulldownSelected"
|
}" :mouse-config="{ selected: true }" @pulldownSelected="expense_onPulldownSelected"
|
||||||
@popupSelected="expense_onPopupSelected" :export-config="{}" @edit-closed="expense_afterEditEvent"
|
@popupSelected="expense_onPopupSelected" :export-config="{}" @edit-closed="expense_afterEditEvent"
|
||||||
@edit-actived="expense_beforeEditEvent" show-footer :footer-method="expense_footerMethod"
|
@edit-actived="expense_beforeEditEvent" show-footer :footer-method="expense_footerMethod"
|
||||||
:footer-cell-class-name="expense_footerCellClassName"
|
:footer-cell-class-name="expense_footerCellClassName"
|
||||||
|
|
@ -542,9 +542,9 @@
|
||||||
</div>
|
</div>
|
||||||
<vxe-table border show-overflow keep-source ref="paintMaterial_xTable" :data="paintMaterial_detailsData"
|
<vxe-table border show-overflow keep-source ref="paintMaterial_xTable" :data="paintMaterial_detailsData"
|
||||||
:keyboard-config="{
|
:keyboard-config="{
|
||||||
isArrow: true, isDel: true,
|
isArrow: true, isDel: true,
|
||||||
isEnter: false, isTab: true, isEdit: true, isChecked: true
|
isEnter: false, isTab: true, isEdit: true, isChecked: true
|
||||||
}" :mouse-config="{ selected: true }" @pulldownSelected="paintMaterial_onPulldownSelected"
|
}" :mouse-config="{ selected: true }" @pulldownSelected="paintMaterial_onPulldownSelected"
|
||||||
@popupSelected="paintMaterial_onPopupSelected" :export-config="{}"
|
@popupSelected="paintMaterial_onPopupSelected" :export-config="{}"
|
||||||
@edit-closed="paintMaterial_afterEditEvent" show-footer :footer-method="paintMaterial_footerMethod"
|
@edit-closed="paintMaterial_afterEditEvent" show-footer :footer-method="paintMaterial_footerMethod"
|
||||||
:footer-cell-class-name="paintMaterial_footerCellClassName"
|
:footer-cell-class-name="paintMaterial_footerCellClassName"
|
||||||
|
|
@ -605,9 +605,9 @@
|
||||||
</div>
|
</div>
|
||||||
<vxe-table border show-overflow keep-source ref="paintLabor_xTable" :data="paintLabor_detailsData"
|
<vxe-table border show-overflow keep-source ref="paintLabor_xTable" :data="paintLabor_detailsData"
|
||||||
:keyboard-config="{
|
:keyboard-config="{
|
||||||
isArrow: true, isDel: true,
|
isArrow: true, isDel: true,
|
||||||
isEnter: false, isTab: true, isEdit: true, isChecked: true
|
isEnter: false, isTab: true, isEdit: true, isChecked: true
|
||||||
}" :mouse-config="{ selected: true }" @pulldownSelected="paintLabor_onPulldownSelected"
|
}" :mouse-config="{ selected: true }" @pulldownSelected="paintLabor_onPulldownSelected"
|
||||||
@popupSelected="paintLabor_onPopupSelected" :export-config="{}" @edit-closed="paintLabor_afterEditEvent"
|
@popupSelected="paintLabor_onPopupSelected" :export-config="{}" @edit-closed="paintLabor_afterEditEvent"
|
||||||
@edit-actived="paintLabor_beforeEditEvent" show-footer :footer-method="paintLabor_footerMethod"
|
@edit-actived="paintLabor_beforeEditEvent" show-footer :footer-method="paintLabor_footerMethod"
|
||||||
:footer-cell-class-name="paintLabor_footerCellClassName"
|
:footer-cell-class-name="paintLabor_footerCellClassName"
|
||||||
|
|
@ -654,9 +654,9 @@
|
||||||
</div>
|
</div>
|
||||||
<vxe-table border show-overflow keep-source ref="paintExpense_xTable" :data="paintExpense_detailsData"
|
<vxe-table border show-overflow keep-source ref="paintExpense_xTable" :data="paintExpense_detailsData"
|
||||||
:keyboard-config="{
|
:keyboard-config="{
|
||||||
isArrow: true, isDel: true,
|
isArrow: true, isDel: true,
|
||||||
isEnter: false, isTab: true, isEdit: true, isChecked: true
|
isEnter: false, isTab: true, isEdit: true, isChecked: true
|
||||||
}" :mouse-config="{ selected: true }" @pulldownSelected="paintExpense_onPulldownSelected"
|
}" :mouse-config="{ selected: true }" @pulldownSelected="paintExpense_onPulldownSelected"
|
||||||
@popupSelected="paintExpense_onPopupSelected" :export-config="{}"
|
@popupSelected="paintExpense_onPopupSelected" :export-config="{}"
|
||||||
@edit-closed="paintExpense_afterEditEvent" @edit-actived="paintExpense_beforeEditEvent" show-footer
|
@edit-closed="paintExpense_afterEditEvent" @edit-actived="paintExpense_beforeEditEvent" show-footer
|
||||||
:footer-method="paintExpense_footerMethod" :footer-cell-class-name="paintExpense_footerCellClassName"
|
:footer-method="paintExpense_footerMethod" :footer-cell-class-name="paintExpense_footerCellClassName"
|
||||||
|
|
@ -769,7 +769,7 @@ export default {
|
||||||
currentConfigName: "",
|
currentConfigName: "",
|
||||||
// 当前项目ID
|
// 当前项目ID
|
||||||
currentBeid: 0,
|
currentBeid: 0,
|
||||||
settignsValues : {},
|
settignsValues: {},
|
||||||
tabKey: 'main',
|
tabKey: 'main',
|
||||||
showAll: false,
|
showAll: false,
|
||||||
showExp: false,
|
showExp: false,
|
||||||
|
|
@ -1157,6 +1157,8 @@ export default {
|
||||||
|
|
||||||
this.drawer_detailsData = JSON.parse(data.drawer_list || "[]");
|
this.drawer_detailsData = JSON.parse(data.drawer_list || "[]");
|
||||||
|
|
||||||
|
this.materialHeightInit();
|
||||||
|
|
||||||
this.detailDataInit();
|
this.detailDataInit();
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -1186,6 +1188,33 @@ export default {
|
||||||
methods: {
|
methods: {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
materialHeightInit() {
|
||||||
|
|
||||||
|
this.$mk.post({
|
||||||
|
url: `${BASE_URL.BASE_URL}/BathroomMaterial/v1/bathroom/material/list`,
|
||||||
|
data: { "page": 1, "limit": 100, "order_bys": [], "search_rules": [] }
|
||||||
|
}).then(a => {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
a.data.BathroomMaterial.forEach(o => {
|
||||||
|
this.fittings_detailsData.forEach(item => {
|
||||||
|
if (item.material && item.material[0] && item.material[0].toString() == o.id.toString()) {
|
||||||
|
|
||||||
|
item.material_default_height = o.spec || "15";
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
console.log(this.fittings_detailsData)
|
||||||
|
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
|
|
||||||
loadSettings() {
|
loadSettings() {
|
||||||
|
|
||||||
this.$mk.post({
|
this.$mk.post({
|
||||||
|
|
@ -1522,7 +1551,7 @@ export default {
|
||||||
row.height_formula = selectedData.spec;
|
row.height_formula = selectedData.spec;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!row.rate_materials && this.settignsValues.Main_material_utilization_rate) {
|
if (!row.rate_materials && this.settignsValues.Main_material_utilization_rate) {
|
||||||
row.rate_materials = this.settignsValues.Main_material_utilization_rate;
|
row.rate_materials = this.settignsValues.Main_material_utilization_rate;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue