预览和变量

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

@@ -214,7 +214,8 @@
               <vxe-column field="price" title="单价" width="120"
                 :edit-render="{ name: '$input', props: { type: 'number' } }"></vxe-column>
 
-              <vxe-column field="amount_formula" title="金额" width="220" :edit-render="{ name: 'EditExpressions' }">
+              <vxe-column field="amount_formula" title="金额" width="220" :edit-render="{ name: 'EditExpressions' }"
+              :params="{ moreExpressionsList: getMoreExpressionsList }">
                 <template #default="{ row }">
                   <a-tooltip>
                     <template slot="title">

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

@@ -183,7 +183,8 @@
           <vxe-column field="price" title="单价" width="120"
             :edit-render="{ name: '$input', props: { type: 'number' } }"></vxe-column>
 
-          <vxe-column field="amount_formula" title="金额" width="220" :edit-render="{ name: 'EditExpressions' }">
+          <vxe-column field="amount_formula" title="金额" width="220" :edit-render="{ name: 'EditExpressions' }"
+          :params="{ moreExpressionsList: getMoreExpressionsList }">
             <template #default="{ row }">
               <a-tooltip>
                 <template slot="title">

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

@@ -4,7 +4,7 @@
 
 
     <div class="topbar">
-      <a-button type="primary" @click="ok">保存</a-button>
+      <a-button type="primary" @click="ok({})">保存</a-button>
       <a-button @click="selectScheme">导入方案</a-button>
       <a-button @click="cancel">取消</a-button>
       <a-button @click="previewScheme">预览方案</a-button>
@@ -108,7 +108,8 @@
           <vxe-column field="price" title="单价" width="120"
             :edit-render="{ name: '$input', props: { type: 'number' } }"></vxe-column>
 
-          <vxe-column field="amount_formula" title="金额(公式)" width="220" :edit-render="{ name: 'EditExpressions' }">
+          <vxe-column field="amount_formula" title="金额(公式)" width="220" :edit-render="{ name: 'EditExpressions' }"
+            :params="{ moreExpressionsList: getMoreExpressionsList }">
           </vxe-column>
 
         </vxe-table>
@@ -233,7 +234,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"  
+            @edit-actived="expense_beforeEditEvent"
             :edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: expense_beforeEditMethod }">
             <vxe-column width="60" v-if="!isReadonly">
               <template #default="{ row }">
@@ -336,7 +337,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"  
+            @edit-actived="paintExpense_beforeEditEvent"
             :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 }">
@@ -963,7 +964,7 @@ export default {
         this.paintLabor_detailsData.push({});
       }
 
-      
+
       for (let i = this.expense_detailsData.length; i < settings.table_min_count; i++) { // 遍历费用结算列表
         this.expense_detailsData.push({});
       }
@@ -1239,7 +1240,7 @@ export default {
     },
 
 
-    
+
     // 油漆人工下拉选择事件
     expense_onPulldownSelected({ row, name, params }) {
       console.log(row, name, params);
@@ -1370,7 +1371,7 @@ export default {
       const $table = this.$refs.paintLabor_xTable;
       this.paintLabor_detailsData.splice($table.getRowSeq(row) - 1, 1);
     },
-    
+
 
     paintExpense_onPulldownSelected({ row, name, params }) {
       console.log(row, name, params);
@@ -1573,7 +1574,7 @@ export default {
     },
 
     // 保存
-    ok() {
+    ok({ callback }) {
 
       let save = () => {
 
@@ -1609,7 +1610,7 @@ export default {
         postdata.paintLaborList = postdata.paintLaborList.filter(item => item.labor && item.labor[1] ? true : false);
         postdata.paintMaterialList = postdata.paintMaterialList.filter(item => item.material && item.material[1] ? true : false);
 
- 
+
         postdata.expense_list = postdata.expense_list.filter(item => item.item_name ? true : false);
         postdata.paint_expenseList = postdata.paint_expenseList.filter(item => item.item_name ? true : false);
 
@@ -1643,10 +1644,15 @@ export default {
           data: postdata,
           useBigInt: true,
         }).then(() => { // 成功回调
-          this.$mk.success("保存成功");
+          if (typeof (callback) == "function") {
-          if (!this.isEdit) { // 如果是新增模式，关闭当前页面
+            callback();
-            this.back();
+          } else {
+            this.$mk.success("保存成功");
+            if (!this.isEdit) { // 如果是新增模式，关闭当前页面
+              this.back();
+            }
           }
+
         }).catch((a) => { // 失败回调
           this.$mk.error(a.data.msg); // 显示错误信息
         });
@@ -1705,8 +1711,19 @@ export default {
       this.scheme_load();
     },
     previewScheme() {
-      let dataId = this.getDataId();
+      this.ok({
-      this.$openPage("/BathroomQuotation/BathroomQuotationUpdate/d" + dataId); // 打开页面
+        callback: () => {
+
+          let dataId = this.getDataId();
+          let pageUrl = "/BathroomQuotation/BathroomQuotationUpdate/d" + dataId;
+          this.$closePage({
+            closeRoute: "/BathroomQuotation/BathroomQuotationUpdate"
+          });
+          
+          this.$openPage(pageUrl); // 打开页面
+        }
+      })
+
     },
     confirmSelectScheme() {
       let row = this.$refs.scheme_grid.getCurrentRecord(); // 获取当前行

src/router/Middle/bathroom/BathroomQuotation/router.map.js

@@ -56,8 +56,8 @@ routerMap[FunName + 'Update']= {
     path: `/${FunName}/${FunName}Update/:id`,
     component: () => import(`@/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/Edit`),
     meta: {
-      invisible: true,
+      invisible: true 
-    },
+    }, 
     authority: {
       permission: [],
     }