Browse Source

添加信息

lex-xin 5 years ago
parent
commit
c7b96216d7
4 changed files with 22 additions and 13 deletions
  1. 0 0
      dist/index.html
  2. 0 0
      dist/static/js/app.3361a7c0.js
  3. 20 11
      src/views/orderAccount/index.vue
  4. 2 2
      vue.config.js

File diff suppressed because it is too large
+ 0 - 0
dist/index.html


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.3361a7c0.js


+ 20 - 11
src/views/orderAccount/index.vue

@@ -41,14 +41,14 @@
                  @click="resetStudentList">重置</el-button>
       <el-button plain
                  @click="exportis">导出</el-button>
-
-        <span style="padding-left: 12px;">
-            总金额:
-            课程:
-            商品:
-            教辅:
-            手续费:
-        </span>
+      <br />
+        <p>
+            <span style="padding-right: 12px;">总金额:{{ amountAll.amount }}元</span>
+            <span style="padding-right: 12px;">课程:{{ amountAll.tuiFeeAmount }}元</span>
+            <span style="padding-right: 12px;">商品:{{ amountAll.goodsFeeAmount }}元</span>
+            <span style="padding-right: 12px;">教辅:{{ amountAll.sdFeeAmount }}元</span>
+            <span style="padding-right: 12px;">手续费:{{ amountAll.commissionAmount }}元</span>
+        </p>
     </el-form>
     <div class="tableWrap">
         <!-- height="calc(100vh - 174px)"
@@ -162,7 +162,8 @@ export default {
         },//cascader 数据格式化
         branchId: '',
         classId: '',
-        account: this.$route.query.account // 财务唯一标识
+        account: this.$route.query.account, // 财务唯一标识
+        amountAll: {}, // 金额集合
     }
   },
   computed: {
@@ -228,8 +229,16 @@ export default {
             type: params.money,
             startTime: startTime,
             endTime: endTime})).then(res => {
-            this.tableList = res.data.rows;
-            this.total = res.data.total;
+              let data = res.data
+              this.tableList = data.rows;
+              this.total = data.total;
+              this.amountAll = {
+                amount: data.amount,
+                tuiFeeAmount: data.tuiFeeAmount,
+                goodsFeeAmount: data.goodsFeeAmount,
+                sdFeeAmount: data.sdFeeAmount,
+                commissionAmount: data.commissionAmount
+              }
             // 回调函数
             if(callBack && typeof callBack == 'function') {
                 callBack()

+ 2 - 2
vue.config.js

@@ -15,8 +15,8 @@ const name = defaultSettings.title || '大雅报名管理'; // page title
 // port = 9528 npm run dev OR npm run dev --port = 9528
 const port = process.env.port || process.env.npm_config_port || 9528; // dev port
 // const targetUrl = 'http://testpay.dayaedu.com'
-const targetUrl = 'https://manage.dayaedu.com'
-// const targetUrl = 'http://192.168.3.27:8088'
+// const targetUrl = 'https://manage.dayaedu.com'
+const targetUrl = 'http://192.168.3.27:8088'
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
 	/**

Some files were not shown because too many files changed in this diff