修改数据

src/views/businessManager/orderManager/financeManager.vue

@@ -96,9 +96,10 @@
       </el-form>
       <!-- 列表 -->
       <div style="font-size: 14px; color: #F85043; padding-bottom: 10px;">
-        应收总金额：{{ totalExpectAmount }}元 &nbsp;&nbsp;&nbsp;&nbsp;
-        现金实收总额：{{ totalActualAmount }}元 &nbsp;&nbsp;&nbsp;&nbsp;
-        余额实收总额：{{ Number((totalExpectAmount - totalActualAmount).toFixed(2)) }}元 
+        营收金额：{{ totalRevenueAmount }}元<i style="width: 10px; display: inline-block"></i>
+        实收金额：{{ totalActualAmount }}元<i style="width: 10px; display: inline-block"></i>
+        预收金额：{{ totalAdvanceAmount }}元<i style="width: 10px; display: inline-block"></i>
+        预收余额：{{ totalUserBalance }}元
       </div>
       <div class="tableWrap">
         <el-table :data="tableList" :header-cell-style="{background:'#EDEEF0',color:'#444'}">
@@ -180,8 +181,10 @@ export default {
         total: 0, // 总条数
         page_size: [10, 20, 40, 50] // 选择限制显示条数
       },
-      totalExpectAmount: 0, //应收总金额
-      totalActualAmount: 0 //实收总金额
+      totalUserBalance: 0,
+      totalActualAmount: 0,
+      totalAdvanceAmount: 0,
+      totalRevenueAmount: 0,
     };
   },
   mounted() {
@@ -304,12 +307,10 @@ export default {
         if (res.code == 200) {
           this.tableList = result.rows;
           this.pageInfo.total = result.total;
-          this.totalExpectAmount = result.totalExpectAmount
-            ? result.totalExpectAmount
-            : 0;
-          this.totalActualAmount = result.totalActualAmount
-            ? result.totalActualAmount
-            : 0;
+          this.totalUserBalance = result.totalUserBalance ? result.totalUserBalance : 0
+          this.totalActualAmount = result.totalActualAmount ? result.totalActualAmount : 0
+          this.totalAdvanceAmount = result.totalAdvanceAmount ? result.totalAdvanceAmount : 0
+          this.totalRevenueAmount = result.totalRevenueAmount ? result.totalRevenueAmount : 0
         }
       });
     },

src/views/businessManager/orderManager/income.vue

@@ -94,10 +94,23 @@
         </el-form-item>
       </el-form>
       <!-- 列表 -->
+      <!-- totalUserBalance: 20452784.02
+      totalExpectAmount: 0
+      totalActualAmount: 0
+      totalAdvanceAmount: 0
+      totalRevenueAmount: 0 -->
       <div style="font-size: 14px; color: #F85043; padding-bottom: 10px;">
-        应收总金额：{{ totalExpectAmount }}元 &nbsp;&nbsp;&nbsp;&nbsp;
+        <!-- 应收总金额：{{ totalExpectAmount }}元 &nbsp;&nbsp;&nbsp;&nbsp;
         现金实收总额：{{ totalActualAmount }}元 &nbsp;&nbsp;&nbsp;&nbsp;
-        余额实收总额：{{ Number((totalExpectAmount - totalActualAmount).toFixed(2)) }}元 
+        余额实收总额：{{ Number((totalExpectAmount - totalActualAmount).toFixed(2)) }}元 -->
+        <!-- 营收金额=2-3
+        实收金额=应收总额（包含余额支付）
+        预收金额=充值总额（发生消费，记负数）
+        预收余额=充值总余额 -->
+        营收金额：{{ totalRevenueAmount }}元<i style="width: 10px; display: inline-block"></i>
+        实收金额：{{ totalActualAmount }}元<i style="width: 10px; display: inline-block"></i>
+        预收金额：{{ totalAdvanceAmount }}元<i style="width: 10px; display: inline-block"></i>
+        预收余额：{{ totalUserBalance }}元
       </div>
       <div class="tableWrap">
         <el-table :data="tableList" :header-cell-style="{background:'#EDEEF0',color:'#444'}">
@@ -181,8 +194,10 @@ export default {
         total: 0, // 总条数
         page_size: [10, 20, 40, 50] // 选择限制显示条数
       },
-      totalExpectAmount: 0, //应收总金额
-      totalActualAmount: 0 //实收总金额
+      totalUserBalance: 0,
+      totalActualAmount: 0,
+      totalAdvanceAmount: 0,
+      totalRevenueAmount: 0,
     };
   },
   mounted() {
@@ -318,12 +333,10 @@ export default {
         if (res.code == 200) {
           this.tableList = result.rows;
           this.pageInfo.total = result.total;
-          this.totalExpectAmount = result.totalExpectAmount
-            ? result.totalExpectAmount
-            : 0;
-          this.totalActualAmount = result.totalActualAmount
-            ? result.totalActualAmount
-            : 0;
+          this.totalUserBalance = result.totalUserBalance ? result.totalUserBalance : 0
+          this.totalActualAmount = result.totalActualAmount ? result.totalActualAmount : 0
+          this.totalAdvanceAmount = result.totalAdvanceAmount ? result.totalAdvanceAmount : 0
+          this.totalRevenueAmount = result.totalRevenueAmount ? result.totalRevenueAmount : 0
         }
       });
     },

src/views/businessManager/orderManager/incomeOne.vue

@@ -84,9 +84,10 @@
       </el-form>
       <!-- 列表 -->
       <div style="font-size: 14px; color: #F85043; padding-bottom: 10px;">
-          应收总金额：{{ totalExpectAmount }}元 &nbsp;&nbsp;&nbsp;&nbsp;
-          现金实收总额：{{ totalActualAmount }}元 &nbsp;&nbsp;&nbsp;&nbsp;
-          余额实收总额：{{ Number((totalExpectAmount - totalActualAmount).toFixed(2)) }}元 
+        营收金额：{{ totalRevenueAmount }}元<i style="width: 10px; display: inline-block"></i>
+        实收金额：{{ totalActualAmount }}元<i style="width: 10px; display: inline-block"></i>
+        预收金额：{{ totalAdvanceAmount }}元<i style="width: 10px; display: inline-block"></i>
+        预收余额：{{ totalUserBalance }}元
       </div>
       <div class="tableWrap">
         <el-table :data='tableList'
@@ -212,8 +213,10 @@ export default {
         total: 0, // 总条数
         page_size: [10, 20, 40, 50] // 选择限制显示条数
       },
-      totalExpectAmount: 0, //应收总金额
-      totalActualAmount: 0, //实收总金额
+      totalUserBalance: 0,
+      totalActualAmount: 0,
+      totalAdvanceAmount: 0,
+      totalRevenueAmount: 0,
     }
   },
   mounted () {
@@ -330,8 +333,10 @@ this.orderDate.push(endDate)
         if (res.code == 200) {
           this.tableList = result.rows
           this.pageInfo.total = result.total
-          this.totalExpectAmount = result.totalExpectAmount ? result.totalExpectAmount : 0
+          this.totalUserBalance = result.totalUserBalance ? result.totalUserBalance : 0
           this.totalActualAmount = result.totalActualAmount ? result.totalActualAmount : 0
+          this.totalAdvanceAmount = result.totalAdvanceAmount ? result.totalAdvanceAmount : 0
+          this.totalRevenueAmount = result.totalRevenueAmount ? result.totalRevenueAmount : 0
         }
       })
     },

src/views/businessManager/orderManager/incomeOut.vue

@@ -98,9 +98,10 @@
       </el-form>
       <!-- 列表 -->
       <div style="font-size: 14px; color: #F85043; padding-bottom: 10px;">
-        应收总金额：{{ totalExpectAmount }}元 &nbsp;&nbsp;&nbsp;&nbsp;
-        现金实收总额：{{ totalActualAmount }}元 &nbsp;&nbsp;&nbsp;&nbsp;
-        <!-- 余额实收总额：{{ Number((totalExpectAmount - totalActualAmount).toFixed(2)) }}元  -->
+        营收金额：{{ totalRevenueAmount }}元<i style="width: 10px; display: inline-block"></i>
+        实收金额：{{ totalActualAmount }}元<i style="width: 10px; display: inline-block"></i>
+        预收金额：{{ totalAdvanceAmount }}元<i style="width: 10px; display: inline-block"></i>
+        预收余额：{{ totalUserBalance }}元
       </div>
       <div class="tableWrap">
         <el-table :data="tableList" :header-cell-style="{background:'#EDEEF0',color:'#444'}">
@@ -189,8 +190,10 @@ export default {
         total: 0, // 总条数
         page_size: [10, 20, 40, 50] // 选择限制显示条数
       },
-      totalExpectAmount: 0, //应收总金额
-      totalActualAmount: 0 //实收总金额
+      totalUserBalance: 0,
+      totalActualAmount: 0,
+      totalAdvanceAmount: 0,
+      totalRevenueAmount: 0,
     };
   },
   mounted() {
@@ -327,12 +330,10 @@ export default {
         if (res.code == 200) {
           this.tableList = result.rows;
           this.pageInfo.total = result.total;
-          this.totalExpectAmount = result.totalExpectAmount
-            ? result.totalExpectAmount
-            : 0;
-          this.totalActualAmount = result.totalActualAmount
-            ? result.totalActualAmount
-            : 0;
+          this.totalUserBalance = result.totalUserBalance ? result.totalUserBalance : 0
+          this.totalActualAmount = result.totalActualAmount ? result.totalActualAmount : 0
+          this.totalAdvanceAmount = result.totalAdvanceAmount ? result.totalAdvanceAmount : 0
+          this.totalRevenueAmount = result.totalRevenueAmount ? result.totalRevenueAmount : 0
         }
       });
     },

src/views/businessManager/orderManager/incomeTwo.vue

@@ -84,9 +84,10 @@
       </el-form>
       <!-- 列表 -->
       <div style="font-size: 14px; color: #F85043; padding-bottom: 10px;">
-          应收总金额：{{ totalExpectAmount }}元 &nbsp;&nbsp;&nbsp;&nbsp;
-          现金实收总额：{{ totalActualAmount }}元 &nbsp;&nbsp;&nbsp;&nbsp;
-          余额实收总额：{{ Number((totalExpectAmount - totalActualAmount).toFixed(2)) }}元 
+        营收金额：{{ totalRevenueAmount }}元<i style="width: 10px; display: inline-block"></i>
+        实收金额：{{ totalActualAmount }}元<i style="width: 10px; display: inline-block"></i>
+        预收金额：{{ totalAdvanceAmount }}元<i style="width: 10px; display: inline-block"></i>
+        预收余额：{{ totalUserBalance }}元
       </div>
       <div class="tableWrap">
         <el-table :data='tableList'
@@ -201,8 +202,10 @@ export default {
         total: 0, // 总条数
         page_size: [10, 20, 40, 50] // 选择限制显示条数
       },
-      totalExpectAmount: 0, //应收总金额
-      totalActualAmount: 0, //实收总金额
+      totalUserBalance: 0,
+      totalActualAmount: 0,
+      totalAdvanceAmount: 0,
+      totalRevenueAmount: 0,
     }
   },
   mounted () {
@@ -306,8 +309,10 @@ this.orderDate.push(endDate)
         if (res.code == 200) {
           this.tableList = result.rows
           this.pageInfo.total = result.total
-          this.totalExpectAmount = result.totalExpectAmount ? result.totalExpectAmount : 0
+          this.totalUserBalance = result.totalUserBalance ? result.totalUserBalance : 0
           this.totalActualAmount = result.totalActualAmount ? result.totalActualAmount : 0
+          this.totalAdvanceAmount = result.totalAdvanceAmount ? result.totalAdvanceAmount : 0
+          this.totalRevenueAmount = result.totalRevenueAmount ? result.totalRevenueAmount : 0
         }
       })
     },