Преглед на файлове

各列表记录合计字段名更改

chenrui преди 4 години
родител
ревизия
19ba84c641

+ 4 - 4
src/views/FinancialManagement/PaySettlementRecords.vue

@@ -29,7 +29,7 @@
     </div>
     </div>
     <!-- 合计 -->
     <!-- 合计 -->
     <a-alert type="info" showIcon style="margin-bottom:15px">
     <a-alert type="info" showIcon style="margin-bottom:15px">
-      <div class="ftext" slot="message">共<span>{{ orderTotal }}</span>单,实收<span>¥{{ amountTotal }}</span>元</div>
+      <div class="ftext" slot="message">共<span>{{ orderTotal }}</span>单,实收<span>¥{{ amount }}</span>元</div>
     </a-alert>
     </a-alert>
     <!-- 列表 -->
     <!-- 列表 -->
     <div>
     <div>
@@ -118,13 +118,13 @@ export default {
         width: '150px',
         width: '150px',
         align: 'center'
         align: 'center'
       },
       },
-	{
+      {
 	  title: '销售合作商',
 	  title: '销售合作商',
 	  dataIndex: 'salesChannelName',
 	  dataIndex: 'salesChannelName',
 	  width: '150px',
 	  width: '150px',
 	  align: 'center'
 	  align: 'center'
-	},
-			
+      },
+
       {
       {
         title: '结算时间',
         title: '结算时间',
         dataIndex: 'settleDate',
         dataIndex: 'settleDate',

+ 2 - 2
src/views/Service/PurchasedServiceList.vue

@@ -70,7 +70,7 @@
     </div>
     </div>
     <!-- 合计 -->
     <!-- 合计 -->
     <a-alert type="info" showIcon style="margin-bottom:15px">
     <a-alert type="info" showIcon style="margin-bottom:15px">
-      <div class="ftext" slot="message">共<span>{{ orderTotal || 0 }}</span>单,收款金额<span>¥{{ totalAmounts || 0 }}</span>元</div>
+      <div class="ftext" slot="message">共<span>{{ orderTotal || 0 }}</span>单,收款金额<span>¥{{ payedAmount || 0 }}</span>元</div>
     </a-alert>
     </a-alert>
     <div class="card-container">
     <div class="card-container">
       <s-table
       <s-table
@@ -400,7 +400,7 @@ export default {
   },
   },
   mounted () {
   mounted () {
     this.getSalesChannel()
     this.getSalesChannel()
-	this.getTotal()
+    this.getTotal()
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
     next(vm => {
     next(vm => {

+ 1 - 1
src/views/SetmealSales/PurchasedSetmeal.vue

@@ -75,7 +75,7 @@
     <div class="total">
     <div class="total">
       <a-icon type="info-circle" class="iconImg" />
       <a-icon type="info-circle" class="iconImg" />
       <strong>总计:</strong><span v-model="orderTotal">{{ orderTotal || 0 }} 单</span>
       <strong>总计:</strong><span v-model="orderTotal">{{ orderTotal || 0 }} 单</span>
-      <strong style="margin-left: 15px;">收款金额:</strong><span v-model="totalAmounts">{{ totalAmounts || 0 }} 元</span>
+      <strong style="margin-left: 15px;">收款金额:</strong><span v-model="payedAmount">{{ payedAmount || 0 }} 元</span>
     </div>
     </div>
     <!-- 列表 -->
     <!-- 列表 -->
     <s-table
     <s-table