Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/api/course/class.js

@@ -218,3 +218,33 @@ export function getTeachingPerfPageList(data) {
     data
   });
 }
+/**
+ * 教师绩效 设置备注
+ */
+export function setTeachingPerfRemark(data) {
+  return request({
+    url: '/TeachingRewards/SetTeachingPerfRemark',
+    method: 'post',
+    data
+  });
+}
+/**
+ * 教师绩效 设置状态
+ */
+export function setTeachingPerfState(data) {
+  return request({
+    url: '/TeachingRewards/SetTeachingPerfState',
+    method: 'post',
+    data
+  });
+}
+/**
+ * 教师绩效 设置状态
+ */
+export function setTeachingPerfFinance(data) {
+  return request({
+    url: '/TeachingRewards/SetTeachingPerfFinance',
+    method: 'post',
+    data
+  });
+}

src/api/finance/index.js

+import request from '../../utils/request'
+/**
+ * 获取收支明细数据
+ * 
+ */
+export function GetClassBalanceSheet(data) {
+    return request({
+        url: '/Finance/GetClassBalanceSheet',
+        method: 'post',
+        data
+    })
+}
\ No newline at end of file

src/components/sale/myOrder-form.vue

@@ -157,7 +157,7 @@
         <div class="row " style="align-items: center;margin-bottom: 20px;" >
           <div style="width: 3px;height: 15px;background: #3FC4FF;margin-right: 10px"></div>收款单
         </div>
-        <q-table :pagination="msg" :loading="floading" no-data-label="暂无相关数据" flat class="sticky-tow-column-table"
+        <q-table :pagination="financiaMsg" :loading="floading" no-data-label="暂无相关数据" flat class="sticky-tow-column-table"
                  :hide-pagination="true"
                   :data="dataList" :columns="columnsf" row-key="name">
 
@@ -218,7 +218,7 @@
         <div class="row " style="align-items: center;margin: 20px 0;" >
           <div style="width: 3px;height: 15px;background: #3FC4FF;margin-right: 10px"></div>付款单
         </div>
-        <q-table :pagination="msg" :loading="floading" no-data-label="暂无相关数据" flat class="sticky-tow-column-table"
+        <q-table :pagination="financiaMsg" :loading="floading" no-data-label="暂无相关数据" flat class="sticky-tow-column-table"
                  :hide-pagination="true"
                  :data="dataListP" :columns="columnsf" row-key="name">
 
@@ -437,6 +437,7 @@
             msg:{
               PageIndex: 1,
               PageSize: 12,
+              rowsPerPage:12,
               OrderId: 0,
               ClassId: 0,
               GuestName: '',
@@ -448,6 +449,7 @@
             msg2:{
               PageIndex: 1,
               PageSize: 6,
+              rowsPerPage:6,
               OrderId:0,
             },
             loading2:false,
@@ -456,11 +458,13 @@
             msg3:{
               PageIndex: 1,
               PageSize: 6,
+              rowsPerPage:6,
               SourceId:0,
             },
             financiaMsg:{
               pageIndex: 1,
               pageSize: 999,
+              rowsPerPage:999,
               TCID:0,
               OrderID:0,
               Type:1,

src/pages/course/classHourReward.vue

@@ -23,7 +23,7 @@
       </div>
     </div>
     <div class="page-content">
-      <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-tow-column-table"
+      <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table"
                separator="none" title="" :data="data" :columns="columns" row-key="name">
         <template v-slot:top="props">
           <div class="page-option" style="width:100%;">
@@ -122,7 +122,7 @@
         </q-card-section>
         <q-separator />
         <q-card-actions align="right" class="bg-white">
-          <q-btn label="取消" flat color="grey-10" style="font-weight:400 !important" @click="ISsystem=false,Resetsystem()" />
+          <q-btn label="取消" flat color="grey-10" style="font-weight:400 !important" @click="ISsystem=false,Resetsystem()" v-if="!Floading"/>
           <q-btn label="立即制单" color="accent" class="q-px-md" style="font-weight:400 !important" :loading="Floading"
                  @click="savesystem()" />
         </q-card-actions>
@@ -190,6 +190,7 @@
             msg:{
               pageIndex:1,
               pageSize:10,
+              rowsPerPage:10,
               Month:'',
               TeacherId:0,
               State:0,
@@ -292,6 +293,7 @@
             getTeachingBonusPageList(this.msg).then(res => {
               this.loading = false
               this.data = res.Data.PageData
+              console.log(this.data)
               this.pageCount = res.Data.PageCount;
 
 

src/pages/course/classManage.vue

@@ -73,7 +73,7 @@
           <q-td :props="props">
             <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="订单中心"
               @click="gotoOrder(props.row)"></q-btn>
-            <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="收支明细"></q-btn>
+            <q-btn flat size="xs" icon="edit" color="accent" @click="goPayment(props.row)" style="font-weight:400" label="收支明细"></q-btn>
             <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
               @click="EditCourse(props.row)" />
           </q-td>
@@ -198,6 +198,17 @@
           path: tempStr
         });
       },
+      //跳转到收支明细
+      goPayment(item){
+        this.$router.push({ 
+          path:'paymentDetail',
+          query:{
+             ClassId:item.ClassId,
+             School_Id:item.School_Id, 
+             blank:'y'
+          }
+        })
+      },
       //获取校区列表
       getSchool() {
         getSchoolDropdown({}).then(res => {

src/pages/course/rewardDetailed.vue

@@ -153,6 +153,7 @@
         data: [],
         loading: true,
         msg: {
+          rowsPerPage:999,
           BonusId:0,
           TeacherId:0,
           Type:0

src/pages/sale/japaneseTrain.vue

@@ -482,7 +482,15 @@
               position: 'top'
             })
             this.getList()
-            this.dialog = false
+            this.dialog = false;
+            this.enrollMsg={//清空数据
+              ClassId:0,
+                GuestNum:1,
+                Unit_Price:0,//成交单价
+                PreferPrice:0,//应收总额
+                OrderSource:0,//客人来源 枚举
+                SaleRemark:'',//备注
+            }
           }
         }).catch(() => {
 

src/pages/sale/studentList.vue

@@ -164,6 +164,7 @@
         msg: {
           pageIndex: 1,
           pageSize: 12,
+          rowsPerPage:12,
           OrderId: 0,
           ClassId: 0,
           GuestName: '',

src/router/routes.js

@@ -107,6 +107,11 @@ const routes = [{
         component: () =>
         import("pages/course/baseSet.vue")
       },
+      {
+        path: "/course/paymentDetail", //收支明细
+        component: () =>
+        import("pages/course/paymentDetail.vue")
+      },
       {
         path: "/course/classorder", //班级订单
         component: () =>