From 789a96b6ac9c1f9690f96f29345e63afda00abee Mon Sep 17 00:00:00 2001
From: xielue <gd_star@163.com>
Date: Fri, 28 Apr 2023 15:19:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E4=BB=B7=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BathroomQuotation/Edit.vue                | 96 ++++++++++---------
 .../bathroom/BathroomBanding/router.map.js    |  3 +
 .../bathroom/BathroomFittings/router.map.js   |  3 +
 .../bathroom/BathroomLabor/router.map.js      |  3 +
 .../bathroom/BathroomMaterial/router.map.js   |  3 +
 .../BathroomOutsourcing/router.map.js         |  3 +
 .../bathroom/BathroomPackaging/router.map.js  |  3 +
 .../bathroom/BathroomPaint/router.map.js      |  3 +
 .../bathroom/BathroomParts/router.map.js      |  3 +
 .../bathroom/BathroomProcess/router.map.js    |  3 +
 .../bathroom/BathroomQuotation/router.map.js  |  3 +
 .../bathroom/BathroomScheme/router.map.js     |  3 +
 12 files changed, 84 insertions(+), 45 deletions(-)

diff --git a/src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/Edit.vue b/src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/Edit.vue
index 79acbef..d88fa64 100644
--- a/src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/Edit.vue
+++ b/src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/Edit.vue
@@ -47,9 +47,9 @@
 
             <vxe-table border show-overflow keep-source ref="fittings_xTable" :data="fittings_detailsData"
               :keyboard-config="{
-                isArrow: true, isDel: true,
-                isEnter: false, isTab: true, isEdit: true, isChecked: true
-              }" :mouse-config="{ selected: true }" @pulldownSelected="fittings_onPulldownSelected" show-footer
+                  isArrow: true, isDel: true,
+                  isEnter: false, isTab: true, isEdit: true, isChecked: true
+                }" :mouse-config="{ selected: true }" @pulldownSelected="fittings_onPulldownSelected" show-footer
               :footer-method="fittings_footerMethod" :footer-cell-class-name="fittings_footerCellClassName"
               @popupSelected="fittings_onPopupSelected" :export-config="{}" @edit-closed="fittings_afterEditEvent"
               @edit-actived="fittings_beforeEditEvent"
@@ -182,9 +182,9 @@
               （合计）金额：{{ parseFloat(formOptions.data.parts_total_amount || 0).toFixed(2) }}
             </div>
             <vxe-table border show-overflow keep-source ref="parts_xTable" :data="parts_detailsData" :keyboard-config="{
-              isArrow: true, isDel: true,
-              isEnter: false, isTab: true, isEdit: true, isChecked: true
-            }" :mouse-config="{ selected: true }" @pulldownSelected="parts_onPulldownSelected"
+                isArrow: true, isDel: true,
+                isEnter: false, isTab: true, isEdit: true, isChecked: true
+              }" :mouse-config="{ selected: true }" @pulldownSelected="parts_onPulldownSelected"
               @popupSelected="parts_onPopupSelected" :export-config="{}" @edit-closed="parts_afterEditEvent"
               @edit-actived="parts_beforeEditEvent" show-footer :footer-method="parts_footerMethod"
               :footer-cell-class-name="parts_footerCellClassName"
@@ -237,9 +237,9 @@
             </div>
             <vxe-table border show-overflow keep-source ref="packaging_xTable" :data="packaging_detailsData"
               :keyboard-config="{
-                isArrow: true, isDel: true,
-                isEnter: false, isTab: true, isEdit: true, isChecked: true
-              }" :mouse-config="{ selected: true }" @pulldownSelected="packaging_onPulldownSelected"
+                  isArrow: true, isDel: true,
+                  isEnter: false, isTab: true, isEdit: true, isChecked: true
+                }" :mouse-config="{ selected: true }" @pulldownSelected="packaging_onPulldownSelected"
               @popupSelected="packaging_onPopupSelected" :export-config="{}" @edit-closed="packaging_afterEditEvent"
               @edit-actived="packaging_beforeEditEvent" show-footer :footer-method="packaging_footerMethod"
               :footer-cell-class-name="packaging_footerCellClassName"
@@ -340,9 +340,9 @@
               （合计）金额：{{ parseFloat(formOptions.data.drawer_total_amount || 0).toFixed(2) }}
             </div>
             <vxe-table border show-overflow keep-source ref="drawer_xTable" :data="drawer_detailsData" :keyboard-config="{
-              isArrow: true, isDel: true,
-              isEnter: false, isTab: true, isEdit: true, isChecked: true
-            }" :mouse-config="{ selected: true }" @pulldownSelected="drawer_onPulldownSelected"
+                isArrow: true, isDel: true,
+                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"
               :footer-cell-class-name="drawer_footerCellClassName"
@@ -375,9 +375,9 @@
 
               <vxe-table border show-overflow keep-source ref="material_xTable" :data="material_detailsData"
                 :keyboard-config="{
-                  isArrow: true, isDel: true,
-                  isEnter: false, isTab: true, isEdit: true, isChecked: true
-                }" :mouse-config="{ selected: true }" @pulldownSelected="material_onPulldownSelected"
+                    isArrow: true, isDel: true,
+                    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"
                 :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) }}
               </div>
               <vxe-table border show-overflow keep-source ref="labor_xTable" :data="labor_detailsData" :keyboard-config="{
-                isArrow: true, isDel: true,
-                isEnter: false, isTab: true, isEdit: true, isChecked: true
-              }" :mouse-config="{ selected: true }" @pulldownSelected="labor_onPulldownSelected"
+                  isArrow: true, isDel: true,
+                  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"
                 :footer-cell-class-name="labor_footerCellClassName"
@@ -488,9 +488,9 @@
               </div>
               <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
-                }" :mouse-config="{ selected: true }" @pulldownSelected="expense_onPulldownSelected"
+                    isArrow: true, isDel: true,
+                    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"
                 :footer-cell-class-name="expense_footerCellClassName"
@@ -542,9 +542,9 @@
               </div>
               <vxe-table border show-overflow keep-source ref="paintMaterial_xTable" :data="paintMaterial_detailsData"
                 :keyboard-config="{
-                  isArrow: true, isDel: true,
-                  isEnter: false, isTab: true, isEdit: true, isChecked: true
-                }" :mouse-config="{ selected: true }" @pulldownSelected="paintMaterial_onPulldownSelected"
+                    isArrow: true, isDel: true,
+                    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"
@@ -605,9 +605,9 @@
               </div>
               <vxe-table border show-overflow keep-source ref="paintLabor_xTable" :data="paintLabor_detailsData"
                 :keyboard-config="{
-                  isArrow: true, isDel: true,
-                  isEnter: false, isTab: true, isEdit: true, isChecked: true
-                }" :mouse-config="{ selected: true }" @pulldownSelected="paintLabor_onPulldownSelected"
+                    isArrow: true, isDel: true,
+                    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"
                 :footer-cell-class-name="paintLabor_footerCellClassName"
@@ -654,9 +654,9 @@
               </div>
               <vxe-table border show-overflow keep-source ref="paintExpense_xTable" :data="paintExpense_detailsData"
                 :keyboard-config="{
-                  isArrow: true, isDel: true,
-                  isEnter: false, isTab: true, isEdit: true, isChecked: true
-                }" :mouse-config="{ selected: true }" @pulldownSelected="paintExpense_onPulldownSelected"
+                    isArrow: true, isDel: true,
+                    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"
@@ -1043,25 +1043,31 @@ export default {
 
           {
             title: '左侧',
-            span: 18,
+            span: 19,
             children: [
-              { field: 'project_name', title: '工程名', span: 6, itemRender: { name: '$input' } },
-              { field: 'mode_name', title: '型号', span: 6, itemRender: { name: '$input' } },
-              { field: 'customer', title: '客户名称', span: 6, itemRender: { name: '$input' } },
-              { field: '报价日期', title: '报价日期', span: 6, itemRender: { name: '$input',props:{type:"date"} } },
+              { field: 'project_name', title: '工程名', span: 8, itemRender: { name: '$input' } },
+              { field: 'mode_name', title: '型号', span: 8, itemRender: { name: '$input' } },
+              { field: 'customer', title: '客户名称', span: 8, itemRender: { name: '$input' } },
 
-              { field: 'main_cabinet_length', title: '主柜规格 长', span: 6, itemRender: { name: '$input', events: { change: this.calculateAll } } },
-              { field: 'main_cabinet_width', title: '宽', span: 6, itemRender: { name: '$input', events: { change: this.calculateAll } } },
-              { field: 'main_cabinet_height', title: '高', span: 6, itemRender: { name: '$input', events: { change: this.calculateAll } } },
-              { field: '报价有效日期', title: '报价有效日期', span: 6, itemRender: { name: '$input',props:{type:"date"} } },
+              { field: 'main_cabinet_length', title: '主柜规格 长', span: 8, itemRender: { name: '$input', events: { change: this.calculateAll } } },
+              { field: 'main_cabinet_width', title: '宽', span: 8, itemRender: { name: '$input', events: { change: this.calculateAll } } },
+              { field: 'main_cabinet_height', title: '高', span: 8, itemRender: { name: '$input', events: { change: this.calculateAll } } },
+              {
+                title: '下侧',
+                span: 16,
+                children: [
+                  { 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: 6, itemRender: { name: 'MkFormInputShow' } },
-              { field: 'show_paint_expense', title: '总费用(油漆)', span: 6, itemRender: { name: 'MkFormInputShow' } },
+                  { field: 'show_expense', title: '总费用(免漆)', span: 12, itemRender: { name: 'MkFormInputShow' } },
+                  { field: 'show_paint_expense', title: '总费用(油漆)', span: 12, itemRender: { name: 'MkFormInputShow' } },
+                ]
+              },
             ]
           },
           {
             title: '右侧',
-            span: 6,
+            span: 5,
             children: [
               {
                 field: 'image', span: 24, itemRender: {
@@ -1562,11 +1568,11 @@ export default {
     parts_onPulldownSelected({ selectedData, row }) {
       console.log(row, selectedData);
       if (selectedData.spec) {
-        row.spec = selectedData.spec; 
+        row.spec = selectedData.spec;
       }
-      if(selectedData.price){
+      if (selectedData.price) {
         row.price = selectedData.price;
-         
+
       }
 
     },
diff --git a/src/router/Middle/bathroom/BathroomBanding/router.map.js b/src/router/Middle/bathroom/BathroomBanding/router.map.js
index 67b820f..e8d6895 100644
--- a/src/router/Middle/bathroom/BathroomBanding/router.map.js
+++ b/src/router/Middle/bathroom/BathroomBanding/router.map.js
@@ -29,6 +29,9 @@ routerMap[FunName + 'List']= {
   name: FunTitle, 
   icon: 'idcard',
   path: `/${FunName}/${FunName}List`,
+  meta:{
+    page:{ cacheAble:false}
+  },
   component: () => import(`@/pages/Middle/bathroom/BathroomBanding/BathroomBanding/List`),
   authority: {
     permission: [],
diff --git a/src/router/Middle/bathroom/BathroomFittings/router.map.js b/src/router/Middle/bathroom/BathroomFittings/router.map.js
index 3ecff39..433270e 100644
--- a/src/router/Middle/bathroom/BathroomFittings/router.map.js
+++ b/src/router/Middle/bathroom/BathroomFittings/router.map.js
@@ -29,6 +29,9 @@ routerMap[FunName + 'List']= {
   name: FunTitle, 
   icon: 'idcard',
   path: `/${FunName}/${FunName}List`,
+  meta:{
+    page:{ cacheAble:false}
+  },
   component: () => import(`@/pages/Middle/bathroom/BathroomFittings/BathroomFittings/List`),
   authority: {
     permission: [],
diff --git a/src/router/Middle/bathroom/BathroomLabor/router.map.js b/src/router/Middle/bathroom/BathroomLabor/router.map.js
index 9df818d..72be09d 100644
--- a/src/router/Middle/bathroom/BathroomLabor/router.map.js
+++ b/src/router/Middle/bathroom/BathroomLabor/router.map.js
@@ -29,6 +29,9 @@ routerMap[FunName + 'List']= {
   name: FunTitle, 
   icon: 'idcard',
   path: `/${FunName}/${FunName}List`,
+  meta:{
+    page:{ cacheAble:false}
+  },
   component: () => import(`@/pages/Middle/bathroom/BathroomLabor/BathroomLabor/List`),
   authority: {
     permission: [],
diff --git a/src/router/Middle/bathroom/BathroomMaterial/router.map.js b/src/router/Middle/bathroom/BathroomMaterial/router.map.js
index a8389cf..e48be04 100644
--- a/src/router/Middle/bathroom/BathroomMaterial/router.map.js
+++ b/src/router/Middle/bathroom/BathroomMaterial/router.map.js
@@ -29,6 +29,9 @@ routerMap[FunName + 'List']= {
   name: FunTitle, 
   icon: 'idcard',
   path: `/${FunName}/${FunName}List`,
+  meta:{
+    page:{ cacheAble:false}
+  },
   component: () => import(`@/pages/Middle/bathroom/BathroomMaterial/BathroomMaterial/List`),
   authority: {
     permission: [],
diff --git a/src/router/Middle/bathroom/BathroomOutsourcing/router.map.js b/src/router/Middle/bathroom/BathroomOutsourcing/router.map.js
index f6798cf..c1cd09c 100644
--- a/src/router/Middle/bathroom/BathroomOutsourcing/router.map.js
+++ b/src/router/Middle/bathroom/BathroomOutsourcing/router.map.js
@@ -29,6 +29,9 @@ routerMap[FunName + 'List']= {
   name: FunTitle, 
   icon: 'idcard',
   path: `/${FunName}/${FunName}List`,
+  meta:{
+    page:{ cacheAble:false}
+  },
   component: () => import(`@/pages/Middle/bathroom/BathroomOutsourcing/BathroomOutsourcing/List`),
   authority: {
     permission: [],
diff --git a/src/router/Middle/bathroom/BathroomPackaging/router.map.js b/src/router/Middle/bathroom/BathroomPackaging/router.map.js
index c095a74..7a50436 100644
--- a/src/router/Middle/bathroom/BathroomPackaging/router.map.js
+++ b/src/router/Middle/bathroom/BathroomPackaging/router.map.js
@@ -29,6 +29,9 @@ routerMap[FunName + 'List']= {
   name: FunTitle, 
   icon: 'idcard',
   path: `/${FunName}/${FunName}List`,
+  meta:{
+    page:{ cacheAble:false}
+  },
   component: () => import(`@/pages/Middle/bathroom/BathroomPackaging/BathroomPackaging/List`),
   authority: {
     permission: [],
diff --git a/src/router/Middle/bathroom/BathroomPaint/router.map.js b/src/router/Middle/bathroom/BathroomPaint/router.map.js
index a30a0d0..15b3b3f 100644
--- a/src/router/Middle/bathroom/BathroomPaint/router.map.js
+++ b/src/router/Middle/bathroom/BathroomPaint/router.map.js
@@ -29,6 +29,9 @@ routerMap[FunName + 'List']= {
   name: FunTitle, 
   icon: 'idcard',
   path: `/${FunName}/${FunName}List`,
+  meta:{
+    page:{ cacheAble:false}
+  },
   component: () => import(`@/pages/Middle/bathroom/BathroomPaint/BathroomPaint/List`),
   authority: {
     permission: [],
diff --git a/src/router/Middle/bathroom/BathroomParts/router.map.js b/src/router/Middle/bathroom/BathroomParts/router.map.js
index 2a4ea75..0585505 100644
--- a/src/router/Middle/bathroom/BathroomParts/router.map.js
+++ b/src/router/Middle/bathroom/BathroomParts/router.map.js
@@ -29,6 +29,9 @@ routerMap[FunName + 'List']= {
   name: FunTitle, 
   icon: 'idcard',
   path: `/${FunName}/${FunName}List`,
+  meta:{
+    page:{ cacheAble:false}
+  },
   component: () => import(`@/pages/Middle/bathroom/BathroomParts/BathroomParts/List`),
   authority: {
     permission: [],
diff --git a/src/router/Middle/bathroom/BathroomProcess/router.map.js b/src/router/Middle/bathroom/BathroomProcess/router.map.js
index 9839296..e105bac 100644
--- a/src/router/Middle/bathroom/BathroomProcess/router.map.js
+++ b/src/router/Middle/bathroom/BathroomProcess/router.map.js
@@ -29,6 +29,9 @@ routerMap[FunName + 'List']= {
   name: FunTitle, 
   icon: 'idcard',
   path: `/${FunName}/${FunName}List`,
+  meta:{
+    page:{ cacheAble:false}
+  },
   component: () => import(`@/pages/Middle/bathroom/BathroomProcess/BathroomProcess/List`),
   authority: {
     permission: [],
diff --git a/src/router/Middle/bathroom/BathroomQuotation/router.map.js b/src/router/Middle/bathroom/BathroomQuotation/router.map.js
index 24d07b5..24260af 100644
--- a/src/router/Middle/bathroom/BathroomQuotation/router.map.js
+++ b/src/router/Middle/bathroom/BathroomQuotation/router.map.js
@@ -29,6 +29,9 @@ routerMap[FunName + 'List']= {
   name: FunTitle, 
   icon: 'idcard',
   path: `/${FunName}/${FunName}List`,
+  meta:{
+    page:{ cacheAble:false}
+  },
   component: () => import(`@/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/List`),
   authority: {
     permission: [],
diff --git a/src/router/Middle/bathroom/BathroomScheme/router.map.js b/src/router/Middle/bathroom/BathroomScheme/router.map.js
index b0cc903..c8c8115 100644
--- a/src/router/Middle/bathroom/BathroomScheme/router.map.js
+++ b/src/router/Middle/bathroom/BathroomScheme/router.map.js
@@ -28,6 +28,9 @@ routerMap[FunName + 'List']= {
   name: FunTitle, 
   icon: 'idcard',
   path: `/${FunName}/${FunName}List`,
+  meta:{
+    page:{ cacheAble:false}
+  },
   component: () => import(`@/pages/Middle/bathroom/BathroomScheme/BathroomScheme/List`),
   authority: {
     permission: [],