添加财务数据

src/views/order/index.vue

@@ -15,15 +15,6 @@
                      :label="item.label"
                      :value="item.value"></el-option>
         </el-select>
-        <!-- :props='props' -->
-        <!-- <el-cascader :options="brancheList"
-                     clearable
-                     placeholder="请选择分部已经乐团"
-                     v-model="topForm.team"
-                     :props='props'
-                     @active-item-change="handleItemChange"
-                     @change="handleChange">
-        </el-cascader> -->
       </el-form-item>
       <el-form-item label="收费类型">
         <el-select v-model="topForm.money"

src/views/orderAccount/index.vue

@@ -2,7 +2,22 @@
   <div class='container'>
     <el-form :inline="true"
              v-model="topForm">
-    
+
+        <el-form-item label="乐团">
+            <el-select v-model="topForm.team" @change="handleItemChange"  placeholder="请选择分部名称">
+                <el-option v-for='(item,index) in brancheList'
+                        :key='index'
+                        :label="item.label"
+                        :value="item.value"></el-option>
+            </el-select>
+            <!-- <el-select v-model="topForm.instruments"  placeholder="请选择乐团名称">
+                <el-option v-for='(item,index) in instrumentList'
+                        :key='index'
+                        :label="item.label"
+                        :value="item.value"></el-option>
+            </el-select> -->
+        </el-form-item>
+
       <el-form-item label="支付时间">
         <el-date-picker
             v-model="paymentTime"
@@ -26,13 +41,21 @@
                  @click="resetStudentList">重置</el-button>
       <el-button plain
                  @click="exportis">导出</el-button>
+
+        <span style="padding-left: 12px;">
+            总金额：
+            课程：
+            商品：
+            教辅：
+            手续费：
+        </span>
     </el-form>
     <div class="tableWrap">
-      <el-table :data='tableList'
-                id='tableid'
-                height="calc(100vh - 174px)"
+        <!-- height="calc(100vh - 174px)"
                 show-summary
-                :summary-method="getSummaries">
+                :summary-method="getSummaries" -->
+      <el-table :data='tableList'
+                id='tableid'>
         <el-table-column type="index"
                            width="55"></el-table-column>
         <el-table-column align="center"
@@ -61,6 +84,9 @@
                          label="教辅费用"
                          prop="sdFee"></el-table-column>
         <el-table-column align="center"
+                         label="手续费"
+                         prop="commission"></el-table-column>
+        <el-table-column align="center"
                          label="专业"
                          prop="voicyPart"></el-table-column>
         <el-table-column align="left"
@@ -86,7 +112,7 @@
   </div>
 </template>
 <script>
-import { orderListPage, getMusicTeams } from "@/api/table";
+import { getBranches, orderListPage, getMusicTeams } from "@/api/table";
 import qs from "qs";
 import { scrollTo } from '@/utils/scroll-to'
 export default {
@@ -151,6 +177,7 @@ export default {
   },
   mounted() {
       if(this.account) {
+        this.getBranches();
         this.getstudentList()
     }
   },
@@ -160,6 +187,22 @@ export default {
     //   this.rows = pageSize;
       this.getstudentList();
     },
+    // 获取选项卡
+    getBranches () {
+      getBranches().then(res => {
+        if (res.code == 200) {
+          let arr = [];
+          res.data.map(item => {
+            arr.push({
+              value: item.branchId,
+              label: item.branchName,
+              children: []
+            })
+          })
+          this.brancheList = arr
+        }
+      });
+    },
     getstudentList (rows, callBack) {
         if(!this.account) {
             this.$message.error('您没有权限')
@@ -307,28 +350,25 @@ export default {
         if (!val) {
             return false
         }
-        getMusicTeams(qs.stringify({ branchId: val })).then(res => {
-            this.topForm.instruments = ''
-            // res.data.rows
-            // 1.格式化数据
-            // 2.追加数据到相应的位置 
-            if (res.code == 200) {
-                let arr = [];
-                res.data.rows.map(item => {
-                    arr.push({
-                        label: item.name,
-                        value: item.id
-                    })
-                })
-                this.instrumentList = arr
-                // for (let item in this.brancheList) {
-                //     if (this.brancheList[item].value == val) {
-                //         this.brancheList[item].children = arr;
-                //     }
-                // }
-            }
+        // getMusicTeams(qs.stringify({ branchId: val })).then(res => {
+        //     this.topForm.instruments = ''
+        //     if (res.code == 200) {
+        //         let arr = [];
+        //         res.data.rows.map(item => {
+        //             arr.push({
+        //                 label: item.name,
+        //                 value: item.id
+        //             })
+        //         })
+        //         this.instrumentList = arr
+        //         for (let item in this.brancheList) {
+        //             if (this.brancheList[item].value == val) {
+        //                 this.brancheList[item].children = arr;
+        //             }
+        //         }
+        //     }
 
-        })
+        // })
     },
     handleChange (val) {
       if (val) {