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

src/api/finance/index.js

@@ -203,5 +203,16 @@ export function setSellCommissionSendEmployee(data) {
 }
 
 
+//  获取月度班级收支统计
+export function getAllClassNowMonthStatistics(data) {
+  return request({
+    url: '/finance/GetAllClassNowMonthStatistics',
+    method: 'post',
+    data
+  });
+}
+
+
+
 
 

src/components/course/lesson-form.vue

@@ -310,7 +310,7 @@
           </template>
           <template v-slot:body-cell-optioned="props">
             <q-td :props="props" style="width:130px;">
-              <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
+              <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400;display:none;" label="编辑"
                 @click="getInfo(props.row)">
                 <q-popup-proxy>
                   <q-banner v-if="isShowEdit">
@@ -410,7 +410,7 @@
                 <div class="calendarTop">
                   <div>{{item.RoomName}}</div>
                   <div>
-                    <i class="iconfont icon-edit Lessicon_Edit" @click.stop="getInfo(item)">
+                    <i class="iconfont icon-edit Lessicon_Edit" style="display:none;" @click.stop="getInfo(item)">
                       <q-popup-proxy>
                         <q-banner v-if="isShowEdit">
                           <div class="calenderDialog">
@@ -574,6 +574,7 @@
               <el-select v-model="props.row.IsCheck" style="width:80px;" size="small" placeholder="小时">
                 <el-option label="出勤" :value="0"></el-option>
                 <el-option label="缺勤" :value="1"></el-option>
+                <el-option label="请假" :value="2"></el-option>
               </el-select>
             </q-td>
           </template>

src/pages/course/monthLessonCost.vue

@@ -238,9 +238,10 @@
                 });
             },
             gourlteacher2(path,row,item) {
+                let StudentName = encodeURI(row.StudentName)
                 this.OpenNewUrl('/financial/'+path, {
                     ClassId: this.ClassId,
-                    StudentName:row.StudentName,
+                    StudentName:StudentName,
                     datetype:'2',
                     StartMonth:item.Month,
                     EndMonth:item.Month,

src/pages/financial/TeamRevenueReport.vue

@@ -1425,7 +1425,7 @@
       }
       let userInfo = this.getLocalStorage();
       if (this.$route.query.BranchId) {
-        this.msg.SchoolId = this.$route.query.BranchId != undefined ? this.$route.query.BranchId : '';
+        this.msg.SchoolId = this.$route.query.BranchId != undefined ? Number( this.$route.query.BranchId ): '';
 
       } else {
         if (userInfo.School_Id > 0) {

src/pages/financial/cycleList.vue

@@ -105,13 +105,13 @@
             <el-table-column  prop="UserName" label="销售" > </el-table-column>
             <el-table-column  width='170' prop="ClassName" label="班级信息" > 
                 <template slot-scope="scope">
-                    <div>{{scope.row.ClassName}} {{scope.row.ClassTypeName}}<span style="color: #409EFF;" v-if='scope.row.IsContinueClass==1'>(续)</span></div>
+                    <div><span style="cursor: pointer;text-decoration: underline;" @click="goUrlclass('/course/classManage',scope.row.ClassName)">{{scope.row.ClassName}}</span> {{scope.row.ClassTypeName}}<span style="color: #409EFF;" v-if='scope.row.IsContinueClass==1'>(续)</span></div>
                     <div>学生数量:{{scope.row.StudentCount}}人</div>
                  </template>
             </el-table-column>
             <el-table-column prop="OrderId" label="订单号" >
                 <template slot-scope="scope">
-                    <div style="cursor: pointer;" >{{scope.row.OrderId}} </div>
+                    <div style="cursor: pointer;text-decoration: underline;" @click="goUrlorderList('/sale/orderStatistics',scope.row.OrderId)">{{scope.row.OrderId}} </div>
                     
                  </template>
             </el-table-column>
@@ -394,7 +394,18 @@
         tcexport(){//导出
             var msg = JSON.parse(JSON.stringify(this.msg));
             EduDownLoad("/SellCommission/GetSellCommissionStatisticsToExcel", msg, "提成统计.xls")
-        }
+        },
+        goUrlclass(path,Names){//班级
+          let Name = encodeURI(Names)
+          this.OpenNewUrl(path, {
+            ClassName: Name,
+          });
+        },
+        goUrlorderList(path,ID){//订单跳转
+          this.OpenNewUrl(path, {
+            OrderId: ID,
+          });
+        },
       },
     }
   

src/pages/financial/cycleOrderList.vue

@@ -60,14 +60,14 @@
         </el-table-column>
         <el-table-column width='170' prop="ClassName" label="班级信息">
           <template slot-scope="scope">
-            <div>{{scope.row.ClassName}} {{scope.row.ClassTypeName}}<span style="color: #409EFF;"
+            <div><span style="cursor: pointer;text-decoration: underline;" @click="goUrlclass('/course/classManage',scope.row.ClassName)">{{scope.row.ClassName}}</span> {{scope.row.ClassTypeName}}<span style="color: #409EFF;"
                 v-if='scope.row.IsContinueClass==1'>(续)</span></div>
             <div>学生数量:{{scope.row.StudentCount}}人</div>
           </template>
         </el-table-column>
         <el-table-column prop="OrderId" label="订单号">
           <template slot-scope="scope">
-            <div style="cursor: pointer;">{{scope.row.OrderId}} </div>
+            <div style="cursor: pointer;text-decoration: underline;" @click="goUrlorderList('/sale/orderStatistics',scope.row.OrderId)">{{scope.row.OrderId}} </div>
 
           </template>
         </el-table-column>
@@ -265,7 +265,18 @@
       },
       goreturn() {
         this.$router.go(-1);
-      }
+      },
+      goUrlclass(path,Names){//班级
+        let Name = encodeURI(Names)
+        this.OpenNewUrl(path, {
+          ClassName: Name,
+        });
+      },
+      goUrlorderList(path,ID){//订单跳转
+        this.OpenNewUrl(path, {
+          OrderId: ID,
+        });
+      },
 
 
 

src/pages/financial/studentsClassfee.vue

@@ -243,7 +243,7 @@
                 this.msg.ClassId = Number(this.$route.query.ClassId) 
             }
             if(this.$route.query && this.$route.query.StudentName){
-                this.msg.StudentName = this.$route.query.StudentName
+                this.msg.StudentName = decodeURI(this.$route.query.StudentName) 
             }
          
         },

src/pages/financial/userCommissionDetails.vue

@@ -73,7 +73,7 @@
         <el-table-column prop="UserName" label="销售"> </el-table-column>
         <el-table-column width='170' prop="ClassName" label="班级信息">
           <template slot-scope="scope">
-            <div>{{scope.row.ClassName}} {{scope.row.ClassTypeName}}<span style="color: #409EFF;"
+            <div> <span style="cursor: pointer;text-decoration: underline;" @click="goUrlclass('/course/classManage',scope.row.ClassName)">{{scope.row.ClassName}}</span>  {{scope.row.ClassTypeName}}<span style="color: #409EFF;"
                 v-if='scope.row.IsContinueClass==1'>(续)</span></div>
             <div>学生数量:{{scope.row.StudentCount}}人</div>
           </template>
@@ -242,7 +242,13 @@
       },
       goreturn() {
         this.$router.go(-1);
-      }
+      },
+      goUrlclass(path,Names){//班级
+        let Name = encodeURI(Names)
+        this.OpenNewUrl(path, {
+          ClassName: Name,
+        });
+      },
     },
   }
 </script>

src/pages/teacher/teachMonthLessonCost.vue

@@ -238,9 +238,10 @@
                 });
             },
             gourlteacher2(path,row,item) {
+                let StudentName = encodeURI(row.StudentName)
                 this.OpenNewUrl('/financial/'+path, {
                     ClassId: this.ClassId,
-                    StudentName:row.StudentName,
+                    StudentName:StudentName,
                     datetype:'2',
                     StartMonth:item.Month,
                     EndMonth:item.Month,

src/router/routes.js

@@ -537,6 +537,11 @@ const routes = [{
     component: () =>
       import("pages/financial/financalDocument/BasicDocuments.vue")
   },
+  {
+    path: "/financial/reportform/RecPayQueryTeam", //财务报表 月度班级收支统计
+    component: () =>
+      import("pages/financial/reportform/RecPayQueryTeam.vue")
+  },
   {
     path: "/administration/document", //行政公告
     component: () =>