From fca8ac3bc450aa679bd5f51cb96f038ab4e22f6d Mon Sep 17 00:00:00 2001
From: xielue <gd_star@163.com>
Date: Thu, 27 Jul 2023 21:29:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/application/mk/index.js                   |  2 +-
 .../BathroomQuotation/Edit.vue                | 28 +++++++++++--------
 .../BathroomQuotation/drawer.vue              | 26 ++++++++++-------
 3 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/src/application/mk/index.js b/src/application/mk/index.js
index e311fa2..811ac4a 100644
--- a/src/application/mk/index.js
+++ b/src/application/mk/index.js
@@ -129,7 +129,7 @@ VXETable.formats.mixin({
         if (!column.params) return '';
         for (let i = 0; i < column.params.length; i++) {
             if (column.params[i].value == cellValue) {
-                return '<span>' + column.params[i].label + '</span>';
+                return '' + column.params[i].label + '';
             }
         }
         return '';
diff --git a/src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/Edit.vue b/src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/Edit.vue
index 37639f9..ace69bb 100644
--- a/src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/Edit.vue
+++ b/src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/Edit.vue
@@ -399,7 +399,7 @@
                   isEnter: false, isTab: true, isEdit: true, isChecked: true
                 }" :mouse-config="{ selected: true }" @pulldownSelected="material_onPulldownSelected"
                 @popupSelected="material_onPopupSelected" :export-config="{}" @edit-closed="material_afterEditEvent"
-                show-footer :footer-method="material_footerMethod" :footer-cell-class-name="material_footerCellClassName"
+                 :footer-cell-class-name="material_footerCellClassName"
                 :edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: material_beforeEditMethod }">
                 <vxe-column width="60" v-if="!isReadonly">
                   <template #default="{ row }">
@@ -464,7 +464,7 @@
                 isEnter: false, isTab: true, isEdit: true, isChecked: true
               }" :mouse-config="{ selected: true }" @pulldownSelected="labor_onPulldownSelected"
                 @popupSelected="labor_onPopupSelected" :export-config="{}" @edit-closed="labor_afterEditEvent"
-                @edit-actived="labor_beforeEditEvent" show-footer :footer-method="labor_footerMethod"
+                @edit-actived="labor_beforeEditEvent"  
                 :footer-cell-class-name="labor_footerCellClassName"
                 :edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: labor_beforeEditMethod }">
                 <vxe-column width="60" v-if="!isReadonly">
@@ -515,7 +515,8 @@
                   isEnter: false, isTab: true, isEdit: true, isChecked: true
                 }" :mouse-config="{ selected: true }" @pulldownSelected="expense_onPulldownSelected"
                 @popupSelected="expense_onPopupSelected" :export-config="{}" @edit-closed="expense_afterEditEvent"
-                @edit-actived="expense_beforeEditEvent" show-footer :footer-method="expense_footerMethod"
+                @edit-actived="expense_beforeEditEvent" 
+                
                 :footer-cell-class-name="expense_footerCellClassName"
                 :edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: expense_beforeEditMethod }">
                 <vxe-column width="60" v-if="!isReadonly">
@@ -569,7 +570,7 @@
                   isEnter: false, isTab: true, isEdit: true, isChecked: true
                 }" :mouse-config="{ selected: true }" @pulldownSelected="paintMaterial_onPulldownSelected"
                 @popupSelected="paintMaterial_onPopupSelected" :export-config="{}"
-                @edit-closed="paintMaterial_afterEditEvent" show-footer :footer-method="paintMaterial_footerMethod"
+                @edit-closed="paintMaterial_afterEditEvent"  
                 :footer-cell-class-name="paintMaterial_footerCellClassName"
                 :edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: paintMaterial_beforeEditMethod }">
                 <vxe-column width="60" v-if="!isReadonly">
@@ -633,7 +634,7 @@
                   isEnter: false, isTab: true, isEdit: true, isChecked: true
                 }" :mouse-config="{ selected: true }" @pulldownSelected="paintLabor_onPulldownSelected"
                 @popupSelected="paintLabor_onPopupSelected" :export-config="{}" @edit-closed="paintLabor_afterEditEvent"
-                @edit-actived="paintLabor_beforeEditEvent" show-footer :footer-method="paintLabor_footerMethod"
+                @edit-actived="paintLabor_beforeEditEvent"  
                 :footer-cell-class-name="paintLabor_footerCellClassName"
                 :edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: paintLabor_beforeEditMethod }">
                 <vxe-column width="60" v-if="!isReadonly">
@@ -682,8 +683,8 @@
                   isEnter: false, isTab: true, isEdit: true, isChecked: true
                 }" :mouse-config="{ selected: true }" @pulldownSelected="paintExpense_onPulldownSelected"
                 @popupSelected="paintExpense_onPopupSelected" :export-config="{}"
-                @edit-closed="paintExpense_afterEditEvent" @edit-actived="paintExpense_beforeEditEvent" show-footer
-                :footer-method="paintExpense_footerMethod" :footer-cell-class-name="paintExpense_footerCellClassName"
+                @edit-closed="paintExpense_afterEditEvent" @edit-actived="paintExpense_beforeEditEvent" 
+                :footer-cell-class-name="paintExpense_footerCellClassName"
                 :edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: paintExpense_beforeEditMethod }">
                 <vxe-column width="60" v-if="!isReadonly">
                   <template #default="{ row }">
@@ -1089,9 +1090,9 @@ export default {
                   { field: '报价日期', title: '报价日期', span: 12, itemRender: { name: '$input', props: { type: "date" } } },
                   { field: '报价有效日期', title: '报价有效日期', span: 12, itemRender: { name: '$input', props: { type: "date" } } },
 
-                  { field: 'show_expense', title: '总费用(免漆)', span: 12, itemRender: { name: 'MkFormInputShow' } },
-                  { field: 'show_paint_expense', title: '总费用(油漆)', span: 12, itemRender: { name: 'MkFormInputShow' } },
-                ]
+                  { field: 'show_expense', title: '总费用(免漆)', span: 12, itemRender: { name: '$input' } },
+                  { field: 'show_paint_expense', title: '总费用(油漆)', span: 12, itemRender: { name: '$input' } },
+                ] 
               },
             ]
           },
@@ -1512,7 +1513,7 @@ export default {
         this.tabKey = this.drawer_detailsData.length - 1;
         this.$forceUpdate(); // 强制更新
 
-      } else { //主柜
+      } else { //主柜 或者 镜柜
 
 
         this.mainTabTitle = row.type == '1' ? '主柜' : '镜柜';
@@ -2718,6 +2719,11 @@ export default {
           let name = n.substr(1, n.length - 2);
           return this.getExpressionItemValue({ row, name, defaultValue })
         });
+
+        value = value.replace("/，/g",",");
+        value = value.replace("/？/g","?");  
+        value = value.replace("/：/g",":");  
+
         eval("value = " + value)
         return value;
       } catch {
diff --git a/src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/drawer.vue b/src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/drawer.vue
index 9d72257..2839459 100644
--- a/src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/drawer.vue
+++ b/src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/drawer.vue
@@ -338,7 +338,7 @@
             isEnter: false, isTab: true, isEdit: true, isChecked: true
           }" :mouse-config="{ selected: true }" @pulldownSelected="material_onPulldownSelected"
             @popupSelected="material_onPopupSelected" :export-config="{}" @edit-closed="material_afterEditEvent"
-            show-footer :footer-method="material_footerMethod" :footer-cell-class-name="material_footerCellClassName"
+              :footer-cell-class-name="material_footerCellClassName"
             :edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: material_beforeEditMethod }">
             <vxe-column width="60" v-if="!isReadonly">
               <template #default="{ row }">
@@ -401,7 +401,7 @@
             isEnter: false, isTab: true, isEdit: true, isChecked: true
           }" :mouse-config="{ selected: true }" @pulldownSelected="labor_onPulldownSelected"
             @popupSelected="labor_onPopupSelected" :export-config="{}" @edit-closed="labor_afterEditEvent"
-            @edit-actived="labor_beforeEditEvent" show-footer :footer-method="labor_footerMethod"
+            @edit-actived="labor_beforeEditEvent" 
             :footer-cell-class-name="labor_footerCellClassName"
             :edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: labor_beforeEditMethod }">
             <vxe-column width="60" v-if="!isReadonly">
@@ -450,7 +450,7 @@
             isEnter: false, isTab: true, isEdit: true, isChecked: true
           }" :mouse-config="{ selected: true }" @pulldownSelected="expense_onPulldownSelected"
             @popupSelected="expense_onPopupSelected" :export-config="{}" @edit-closed="expense_afterEditEvent"
-            @edit-actived="expense_beforeEditEvent" show-footer :footer-method="expense_footerMethod"
+            @edit-actived="expense_beforeEditEvent"  
             :footer-cell-class-name="expense_footerCellClassName"
             :edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: expense_beforeEditMethod }">
             <vxe-column width="60" v-if="!isReadonly">
@@ -504,7 +504,7 @@
               isEnter: false, isTab: true, isEdit: true, isChecked: true
             }" :mouse-config="{ selected: true }" @pulldownSelected="paintMaterial_onPulldownSelected"
             @popupSelected="paintMaterial_onPopupSelected" :export-config="{}" @edit-closed="paintMaterial_afterEditEvent"
-            show-footer :footer-method="paintMaterial_footerMethod"
+             
             :footer-cell-class-name="paintMaterial_footerCellClassName"
             :edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: paintMaterial_beforeEditMethod }">
             <vxe-column width="60" v-if="!isReadonly">
@@ -568,7 +568,8 @@
               isEnter: false, isTab: true, isEdit: true, isChecked: true
             }" :mouse-config="{ selected: true }" @pulldownSelected="paintLabor_onPulldownSelected"
             @popupSelected="paintLabor_onPopupSelected" :export-config="{}" @edit-closed="paintLabor_afterEditEvent"
-            @edit-actived="paintLabor_beforeEditEvent" show-footer :footer-method="paintLabor_footerMethod"
+            @edit-actived="paintLabor_beforeEditEvent" 
+            
             :footer-cell-class-name="paintLabor_footerCellClassName"
             :edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: paintLabor_beforeEditMethod }">
             <vxe-column width="60" v-if="!isReadonly">
@@ -617,7 +618,7 @@
               isEnter: false, isTab: true, isEdit: true, isChecked: true
             }" :mouse-config="{ selected: true }" @pulldownSelected="paintExpense_onPulldownSelected"
             @popupSelected="paintExpense_onPopupSelected" :export-config="{}" @edit-closed="paintExpense_afterEditEvent"
-            @edit-actived="paintExpense_beforeEditEvent" show-footer :footer-method="paintExpense_footerMethod"
+            @edit-actived="paintExpense_beforeEditEvent"  
             :footer-cell-class-name="paintExpense_footerCellClassName"
             :edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: paintExpense_beforeEditMethod }">
             <vxe-column width="60" v-if="!isReadonly">
@@ -877,8 +878,8 @@ export default {
           { field: 'name', title: '抽屉名', span: 6, itemRender: { name: '$input' } },
           { field: 'quantity', title: '数量', span: 6, itemRender: { name: '$input', props: { type: "number" }, events: { change: this.calculateAll } } },
 
-          { field: 'show_expense', title: '单价(免漆)', span: 6, itemRender: { name: 'MkFormInputShow' } },
-          { field: 'show_paint_expense', title: '单价(油漆)', span: 6, itemRender: { name: 'MkFormInputShow' } },
+          { field: 'show_expense', title: '单价(免漆)', span: 6, itemRender: { name: '$input' } },
+          { field: 'show_paint_expense', title: '单价(油漆)', span: 6, itemRender: { name: '$input' } },
 
           { field: 'long', title: '长', span: 6, itemRender: { name: '$input', events: { change: this.calculateAll } } },
           { field: 'width', title: '宽', span: 6, itemRender: { name: '$input', events: { change: this.calculateAll } } },
@@ -2032,6 +2033,10 @@ export default {
           let name = n.substr(1, n.length - 2);
           return this.getExpressionItemValue({ row, name, defaultValue })
         });
+
+        value = value.replace("/，/g",",");
+        value = value.replace("/？/g","?");  
+        value = value.replace("/：/g",":");  
         eval("value = " + value)
         return value;
       } catch {
@@ -2078,6 +2083,8 @@ export default {
       this.formOptions.data.show_expense = parseFloat(this.formOptions.data.expense || 0).toFixed(2);
       this.formOptions.data.show_paint_expense = parseFloat(this.formOptions.data.paint_expense || 0).toFixed(2);
  
+      this.formOptions.data = JSON.parse(JSON.stringify(this.formOptions.data))
+
 
       let postdata = this.item;
 
@@ -2120,8 +2127,7 @@ export default {
       this.formatDetailsData(postdata.expense_list);
       this.formatDetailsData(postdata.paint_expenseList);
 
-
-
+ 
       this.$emit("update");
 
     },