报价

src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/Edit.vue

@@ -365,12 +365,13 @@
               isEnter: false, isTab: true, isEdit: true, isChecked: true
             }" :mouse-config="{ selected: true }" @pulldownSelected="drawer_onPulldownSelected"
               @popupSelected="drawer_onPopupSelected" :export-config="{}" @edit-closed="drawer_afterEditEvent"
-              @edit-actived="drawer_beforeEditEvent" show-footer :footer-method="drawer_footerMethod"
+              @edit-actived="drawer_beforeEditEvent" 
               :footer-cell-class-name="drawer_footerCellClassName"
               :edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: drawer_beforeEditMethod }">
               <vxe-column type="seq" title="序号" width="48"></vxe-column>
               <vxe-column field="name" title="抽屉" width="260"></vxe-column>
-              <vxe-column field="quantity" title="数量" width="200"></vxe-column>
+              <vxe-column field="quantity" title="数量" width="200"
+            :edit-render="{ name: '$input', props: { type: 'integer' } }"></vxe-column>
               <vxe-column field="expense" formatter="formatNumber" title="单价（免漆）" width="200"></vxe-column>
               <vxe-column field="paint_expense" formatter="formatNumber" title="单价（油漆）" width="200"></vxe-column>
 
@@ -2322,6 +2323,12 @@ export default {
     },
     drawer_afterEditEvent({ column, row }) {
       console.log(row, column);
+
+
+      row.amount = parseFloat(row.quantity ||0) * parseFloat(row.expense ||0) ;
+      row.paint_amount = parseFloat(row.quantity ||0) * parseFloat(row.paint_expense ||0) ;
+ 
+
       this.calculateAll();
     },
     drawer_beforeEditEvent({ column, row }) {
@@ -2793,18 +2800,25 @@ export default {
 
 
 
+      this.calculateTotal();
+    },
+
+    calculateTotal(){
+
       this.formOptions.data.expense = parseFloat(this.formOptions.data.expense_total_amount || 0) +
         parseFloat(this.formOptions.data.material_total_amount || 0) +
         parseFloat(this.formOptions.data.labor_total_amount || 0) +
         parseFloat(this.formOptions.data.parts_total_amount || 0) + 
-        parseFloat(this.formOptions.data.packaging_total_amount || 0);
+        parseFloat(this.formOptions.data.packaging_total_amount || 0)+ 
+        parseFloat(this.formOptions.data.drawer_total_amount || 0);
 
 
       this.formOptions.data.paint_expense = parseFloat(this.formOptions.data.paintExpense_total_amount || 0) +
         parseFloat(this.formOptions.data.paintMaterial_total_amount || 0) +
         parseFloat(this.formOptions.data.paintLabor_total_amount || 0)+
         parseFloat(this.formOptions.data.parts_total_amount || 0) + 
-        parseFloat(this.formOptions.data.packaging_total_amount || 0);
+        parseFloat(this.formOptions.data.packaging_total_amount || 0)+ 
+        parseFloat(this.formOptions.data.drawer_total_amount || 0);
 
 
       this.formOptions.data.show_expense = parseFloat(this.formOptions.data.expense || 0).toFixed(2); // 计算所有 费用 

src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/drawer.vue

@@ -870,7 +870,7 @@ export default {
         items: [
 
           { field: 'name', title: '抽屉名', span: 6, itemRender: { name: '$input' } },
-          { field: 'quantity', title: '数量', span: 6, itemRender: { name: '$input', props: { type: "number" }, events: { change: this.calculateAll } } },
+          //{ field: 'quantity', title: '数量', span: 6, itemRender: { name: '$input', props: { type: "number" }, events: { change: this.calculateAll } } },
 
           { field: 'show_expense', title: '单价(免漆)', span: 6, itemRender: { name: '$input' } },
           { field: 'show_paint_expense', title: '单价(油漆)', span: 6, itemRender: { name: '$input' } },

src/pages/Middle/bathroom/BathroomScheme/BathroomScheme/Edit.vue

@@ -228,7 +228,7 @@
 
           </vxe-table>
         </a-collapse-panel>
-        <a-collapse-panel key="3" header="费用结算" :disabled="false">
+        <a-collapse-panel key="3" header="其他费用" :disabled="false">
           <vxe-table border show-overflow keep-source ref="expense_xTable" :data="expense_detailsData" :keyboard-config="{
             isArrow: true, isDel: true,
             isEnter: false, isTab: true, isEdit: true, isChecked: true
@@ -330,7 +330,7 @@
 
 
         </a-collapse-panel>
-        <a-collapse-panel key="3" header="费用结算" :disabled="false">
+        <a-collapse-panel key="3" header="其他费用" :disabled="false">
           <vxe-table border show-overflow keep-source ref="paintExpense_xTable" :data="paintExpense_detailsData"
             :keyboard-config="{
               isArrow: true, isDel: true,
@@ -536,7 +536,7 @@ export default {
       moreExpressionsList_material_height: [],//材料的厚度 变量列表 
       moreExpressionsList_fittings: [],
 
-      expense_detailsData: [ // 费用结算
+      expense_detailsData: [ // 其他费用
         {
           item_name: "材料小计", amount_formula: "{免漆材料总费用}+{配件总费用}+{包装总费用}"
         },
@@ -817,7 +817,7 @@ export default {
         this.paintMaterial_detailsData = JSON.parse(data.paintMaterialList || "[]");
 
 
-        this.expense_detailsData = JSON.parse(data.expense_list || "[]"); // 费用结算
+        this.expense_detailsData = JSON.parse(data.expense_list || "[]"); // 其他费用
         this.paintExpense_detailsData = JSON.parse(data.paint_expenseList || "[]"); // 油漆费用结算
 
         this.materialHeightInit();
@@ -1808,6 +1808,10 @@ export default {
       this.paintLabor_detailsData = paintLaborList;
       this.paintMaterial_detailsData = paintMaterialList;
 
+
+      this.expense_detailsData = JSON.parse(row.expense_list || "[]"); // 其他费用
+        this.paintExpense_detailsData = JSON.parse(row.paint_expenseList || "[]"); // 油漆费用结算
+
       this.detailDataInit();
 
       this.modalVisible = false;