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

package.json

@@ -14,10 +14,11 @@
     "@riophae/vue-treeselect": "^0.4.0",
     "ali-oss": "^6.12.0",
     "axios": "^0.18.1",
-    "browser-md5-file": "^1.1.1",
+    "browser-md5-file": "^1.0.0",
     "co": "^4.6.0",
     "core-js": "^3.6.5",
     "cos-js-sdk-v5": "^1.1.5",
+    "echarts": "^5.1.2",
     "element-ui": "^2.14.1",
     "html2canvas": "^1.0.0-rc.7",
     "js-md5": "^0.7.3",
@@ -31,7 +32,7 @@
     "relation-graph": "^1.0.8",
     "v-viewer": "^1.5.1",
     "vue-amap": "^0.5.10",
-    "vue-draggable-resizable": "^1.7.5",
+    "vue-draggable-resizable": "^1.7.2",
     "vue-easytable": "^1.7.2",
     "vue-i18n": "^8.0.0",
     "vue-inline-svg": "^2.0.0",

src/App.vue

@@ -13,7 +13,9 @@ export default {
 <style>
 @import url('~assets/css/font.css');
 @import url('//at.alicdn.com/t/font_2077629_1f7iels6h8w.css');
-
+.q-scrollarea__thumb{
+    z-index: 999999!important;
+}
 html,
 body,
 #q-app {

src/api/classroom/index.js

@@ -30,7 +30,7 @@ export function getSchoolAndRoomNav(data) {
  */
 export function getClassRoomTimeList(data) {
     return request({
-        url: '/ClassRoom/GetClassRoomTimeList',
+        url: '/ClassRoom/GetNewClassRoomTimeList',
         method: 'post',
         data
     })

src/api/users/user.js

@@ -124,3 +124,49 @@ export function getEmployeeAddrBook(data)
       })
     }
   
+
+      /**
+ * 获取我的提成折线图
+ */
+    export function getUserSellCommission(data)
+    {
+      return request({
+        url: '/UserInfo/GetUserSellCommission',
+        method: 'post',
+        data
+      })
+    }
+      /**
+ * 获取我的奖金折线图
+ */
+  export function getTeacherSellCommission(data)
+  {
+    return request({
+      url: '/UserInfo/GetTeacherSellCommission',
+      method: 'post',
+      data
+    })
+  }
+      /**
+ * 个人中心 我的奖金确认  
+ */
+  export function updateSureTeachingBonusDetail(data)
+  {
+    return request({
+      url: '/UserInfo/UpdateSureTeachingBonusDetail',
+      method: 'post',
+      data
+    })
+  }
+
+      /**
+ * 个人中心 我的提成确认  
+ */
+  export function updatSureSellCommission(data)
+  {
+    return request({
+      url: '/UserInfo/UpdatSureSellCommission',
+      method: 'post',
+      data
+    })
+  }
\ No newline at end of file

src/components/course/classstu-form.vue

@@ -61,7 +61,11 @@
       <template v-slot:body-cell-IsRenew="props">
         <q-td auto-width :props="props">
           <span style="color:red;" v-if="props.row.IsRenew==0">否</span>
-          <span style="color:green;" v-if="props.row.IsRenew==1">是</span>
+          <span style="color:green;" v-if="props.row.IsRenew==1">是
+            <q-tooltip :offset="[10, 10]">
+              原订单:{{props.row.RenewOrderId}}
+            </q-tooltip>
+          </span>
         </q-td>
       </template>
       <template v-slot:body-cell-GuestName="props">
@@ -168,7 +172,7 @@
           },
           {
             name: 'IsRenew',
-            label: '续费课程',
+            label: '续费订单',
             field: 'IsRenew',
             align: 'left'
           }

src/components/global/user-right-box.vue

@@ -144,9 +144,12 @@ export default {
             this.$emit('close')
         },
         goUrlgeren(){//个人资料
-            this.$router.push({
-                path: '/user/personalData',
-            })
+        this.$root.$emit("goworkobj")
+        this.$router.push({
+            path: '/user/personalData',
+        })
+            
+           
         },
         undefinedGongneng() {
            this.$q.dialog({

src/components/sale/orderlist.vue

@@ -62,6 +62,9 @@
             <td :rowspan="3" style="text-align: left">
               <div class="order_OfferId" @click="goOrderdetails(item,1)">{{item.OrderId}}
               </div>
+              <div class="order_OfferId" v-if="item.RenewOrderId&&item.RenewOrderId>0">
+                原订单:{{item.RenewOrderId}}
+              </div>
               <div>{{item.EnterName}}</div>
               <div style="margin-top: 10px">{{item.CreateTime}}</div>
               <template v-if="AuthorityObj.isShowName">
@@ -316,7 +319,8 @@
                             </template>
                             <template v-else>
                               <q-btn color="secondary" size="sm" @click="goContractMannage(subItem)" label="查看合同" />
-                              <q-btn style="margin-left:5px;" v-if="subItem.ContractStatus==0" color="purple" size="sm" @click="goContractAudit(subItem)" label="提交审核" />
+                              <q-btn style="margin-left:5px;" v-if="subItem.ContractStatus==0" color="purple" size="sm"
+                                @click="goContractAudit(subItem)" label="提交审核" />
                             </template>
                           </td>
                         </tr>
@@ -1345,8 +1349,8 @@
         });
       },
       //合同提交审核
-      goContractAudit(subItem){
-         let msg = {
+      goContractAudit(subItem) {
+        let msg = {
           ContractId: subItem.ContractId,
           State: 1
         }

src/components/school/teacher/teacher-form.vue

@@ -286,6 +286,9 @@
           this.objOption.BaseStuNum = this.saveObj.BaseStuNum;
           this.objOption.BaseHourFee = this.saveObj.BaseHourFee;
           this.objOption.Specialty = this.saveObj.Specialty;
+
+          this.objOption.EnableTime = this.saveObj.EnableTime;
+          this.objOption.BaseHoursEnabled = this.saveObj.BaseHoursEnabled;
           if (this.saveObj.ChooseSpecialty && this.saveObj.ChooseSpecialty.length > 0) {
             this.chooseSpecialty = this.saveObj.ChooseSpecialty;
           }

src/layouts/MainLayout.vue

@@ -68,7 +68,7 @@
           </div>
         </div>
         <div class="col" style="background: #f2f4f7;">
-          <q-scroll-area class="fit" :thumb-style="thumbStyle" :bar-style="barStyle" visible style="">
+          <q-scroll-area :thumb-style="thumbStyle" :bar-style="barStyle" visible class="fit content-scroll full-width full-height">
             <router-view />
           </q-scroll-area>
         </div>
@@ -178,15 +178,10 @@
       if (this.userInfo && this.userInfo.MenuList) {
         this.secondNavs = this.userInfo.MenuList.length > 0 ? this.userInfo.MenuList[i].SubList : []
       }
-      // this.MsgBus.$on('add',(payload) => {
-      //   let that= this
-      //   that.userInfo.AccountName = payload.EmployeeName
-      //   that.userInfo.UserIcon = payload.UserIcon
-      //   that.userInfo.Email = payload.Email
-      //   that.userInfo.SchoolName = payload.SchoolName
-      //   // location.reload();
-        
-      // });
+      this.$root.$on("goworkobj", (data)=>{
+        // this.setNavs(0)
+        this.secondNavs=[]
+      });
       this.getLogList();
       this.getMsg();
     },
@@ -307,7 +302,7 @@
 <style>
   @import url('~assets/css/common.css');
 
-  .full-width {
+  .content-scroll>.scroll>.full-width {
     height: 100%;
   }
 

src/pages/activity/activityList.vue

@@ -167,7 +167,7 @@
         <div class="col-3 ">
           <q-select @input="resetSearch" standout="bg-primary text-white" v-model="msg.SelectIsEnd"
             class="col-6 q-pr-lg q-pr-lg" :options="statusOpts" emit-value map-options label="状态"
-            @change="resetSearch" />
+             />
         </div>
       </div>
     </div>
@@ -208,12 +208,15 @@
         <template v-slot:body-cell-AgeAndPeopleNum="props">
           <q-td :props="props">
             <div>
-              <div>{{props.row.AgeLimit ==1?'不区分年龄':'区分年龄'}}</div>
-              <div v-if="props.row.AgeLimit==0">范围:{{props.row.StartAge}}岁~{{props.row.EndAge}}岁</div>
-              <div>报名人数</div>
+              <!-- <div>{{props.row.AgeLimit ==1?'不区分年龄':'区分年龄'}}</div>
+              <div v-if="props.row.AgeLimit==0">范围:{{props.row.StartAge}}岁~{{props.row.EndAge}}岁</div>-->
+              <!-- <div>报名人数</div> -->
               <div v-if="props.row.Distinguish ==1">总人数:{{props.row.ManNum}}人</div>
               <div v-if="props.row.Distinguish ==0">男性:{{props.row.ManNum}}人 <span
-                  style="margin-left:10px">女性:{{props.row.WoManNum}}人</span> </div>
+                  style="margin-left:10px">女性:{{props.row.WoManNum}}人</span> </div> 
+              <div >
+                已报入:{{props.row.JoinNum}}人
+              </div>
             </div>
           </q-td>
         </template>
@@ -368,7 +371,7 @@
           },
           {
             name: "AgeAndPeopleNum",
-            label: "年龄和报名人数",
+            label: "总人数/已报入",
             align: "left"
           },
           {

src/pages/administration/document.vue

@@ -479,7 +479,7 @@
       //分页改变
       changePage(val) {
         this.msg.PageIndex = val;
-        this.getSchool()
+        this.getList()
       },
       getChild(deptArray) {
         var tempStr = "";

src/pages/classroom/Scheduling.vue

@@ -46,9 +46,9 @@
                           height="75px"
                           class=" text-white shadow-1 rounded-borders"
                           arrows
-                          control-color="grey-4"
+                          control-color="grey-1"
                           control-text-color="primary"
-                          control-type="regular"
+                          control-type="unelevated"
                         >
                           <q-carousel-slide v-for="(slide,slideIndex) in _item.TimeList" :key="slideIndex" :name="slideIndex" >
                             <div class="info-box">

src/pages/classroom/components/mateitem.vue

+<style>
+
+</style>
+<template>
+  <div>
+    <el-collapse v-if="dayData&&dayData.SubList&&dayData.SubList.length>0">
+      <el-collapse-item v-for="(subItem,subIndex) in dayData.SubList" :key="subIndex" :name="subIndex">
+        <template slot="title">
+          <div class="plan_Tdiv">
+            <span v-if="subItem.TimeStr==='早上'" class="commonTimeStr greenTime">{{subItem.TimeStr}}</span>
+            <span v-if="subItem.TimeStr==='下午'" class="commonTimeStr blueTime">{{subItem.TimeStr}}</span>
+            <span v-if="subItem.TimeStr==='晚上'" class="commonTimeStr orangeTime">{{subItem.TimeStr}}</span>
+            <span v-if="subItem.Type===0&&subItem.ClassType==2">试听课</span>
+            <span style="color:red;margin:0 5px;">{{subItem.TeacherName}}</span>
+            <span>[{{subItem.RoomName}}]</span>
+          </div>
+        </template>
+        <div @click="goUrl(subItem)">
+          <div class="plan_Inner">
+            <div class="plan_LeftTitle">上课时间：</div>
+            <div class="plan_RightInner">{{subItem.StartTime}}-{{subItem.EndTime}}</div>
+          </div>
+          <div class="plan_Inner" v-if="subItem.ClassName">
+            <div class="plan_LeftTitle">班级：</div>
+            <div class="plan_RightInner">{{subItem.ClassName}}</div>
+          </div>
+          <div class="plan_Inner">
+            <div class="plan_LeftTitle">课程名称：</div>
+            <div class="plan_RightInner">{{subItem.CourseName}}</div>
+          </div>
+          <div class="plan_Inner" v-if="subItem.GuestList&&subItem.GuestList.length>0">
+            <div class="plan_LeftTitle">学生名称：</div>
+            <div class="plan_RightInner">
+              <span style="margin-right:10px;" v-for="tItem in subItem.GuestList">{{tItem.GuestName}}</span>
+            </div>
+          </div>
+          <div class="plan_Inner" style="align-items:center;" v-if="subItem.CompleteProgress>=0">
+            <div class="plan_LeftTitle">课程进度：</div>
+            <div class="plan_RightInner">
+              <el-progress :percentage="subItem.CompleteProgress"></el-progress>
+            </div>
+          </div>
+        </div>
+
+      </el-collapse-item>
+    </el-collapse>
+    <div class="text-grey-6" v-else>
+      暂无课程安排
+    </div>
+  </div>
+</template>
+<script>
+  export default {
+    props: {
+      dayData: {
+        type: Object,
+        default: null
+      },
+      fatherMethod: {
+        type: Function,
+        default: null
+      }
+    },
+    data() {
+      return {
+
+      }
+    },
+    methods: {
+      goUrl(item) {
+        if (item.Type === 0 && item.ClassType === 1) {
+          this.$router.push({
+            path: "/classroom/courseInfo",
+            query: {
+              id: item.Id
+            }
+          })
+        }else if(item.Type >0){
+           this.$emit('unusual',item);
+        }
+      }
+    }
+  }
+
+</script>

src/pages/course/classorder.vue

@@ -4,7 +4,7 @@
       <div class="row col" style="justify-content: space-between;align-items: center;margin-bottom: 10px">
         <div>
           <template v-if="data&& data.ClassInfo">
-            {{data.ClassInfo.ClassName}}
+            {{data.ClassInfo.ClassName}} <span v-if='data.ClassInfo.ClassNo!=null' style="cursor: pointer;text-decoration: underline;" @click='gojapaneseTrain(data.ClassInfo.ClassNo)'>({{data.ClassInfo.ClassNo}})</span>
           </template>
         </div>
         <div class="row" style="align-items: center">
@@ -118,6 +118,12 @@
       //刷新页面
       refreshClassOrder() {
         this.getList();
+      },
+      gojapaneseTrain(ClassNo){//跳转到产品列表
+        var tempStr = '/sale/japaneseTrain?ClassNo=' + ClassNo;
+        this.$router.push({
+          path: tempStr
+        });
       }
     }
   }

src/pages/financial/teacherclassfee.vue

@@ -224,6 +224,8 @@
             if(this.$route.query && this.$route.query.ClassName){
                 let Name = decodeURI(this.$route.query.ClassName)
                 this.ClassName = [Name]
+                console.log(Name)
+                this.msg.pageSize = 1000
             }
             
         },

src/pages/sale/japaneseTrain.vue

@@ -363,6 +363,9 @@
       if (this.$route.query && this.$route.query.ClassName) {
         this.msg.ClassName = this.$route.query.ClassName;
       }
+      if (this.$route.query && this.$route.query.ClassNo) {
+        this.msg.ClassNo = this.$route.query.ClassNo;
+      }
       let nowDay = new Date();
       var year = nowDay.getFullYear(); //年
       var month = nowDay.getMonth() + 1; //月

src/pages/test.vue

@@ -97,7 +97,7 @@
     },
     data() {
       return {
-        ActionStr: "/Class/InitClassCheck",
+        ActionStr: "/Class/InitData",
         parameterList: [{
           Name: "",
           Value: ""
@@ -156,6 +156,7 @@
             tempStr = "{" + tempStr.substring(1, tempStr.length) + "}";
             data = JSON.parse(tempStr);
           }
+
           var tempMsg = {
             Msg: data
           };

src/pages/user/personalData.vue

@@ -51,6 +51,7 @@
         padding-left: 39px;
         /* margin-top: 55px; */
         margin-top: 8px;
+        cursor: pointer;
     }
 
     .personalData .box_l_cen {
@@ -63,6 +64,7 @@
         color: #3F4254;
         padding-left: 39px;
         margin-top: 8px;
+        cursor: pointer;
         justify-content: space-between;
     }
 
@@ -115,7 +117,7 @@
                     <div class="text-muted" style="font-size:14px;margin-top: 12px;">
                         {{showObj.SchoolName}}·{{showObj.PostName}}</div>
                     <div class="q-mt-xs">
-                        <q-btn style="background: var(--q-color-negative);color: white;" @click="logout">退出登录</q-btn>
+                        <q-btn style="background: var(--q-color-negative);color: white;margin-top: 10px;" size="sm" @click="logout">退出登录</q-btn>
                     </div>
                 </div>
             </div>
@@ -131,9 +133,8 @@
                 <span class="box_l_t_l">部门：</span>
                 <span>{{showObj.DeptName}}</span>
             </div>
-            <!-- <div class="box_l_title" style="margin-top: 55px;">概要信息</div> -->
-            <!-- <div :class="rightType==0?'box_l_title':'box_l_cen'" @click='rightType=0'>概要信息</div>
-            <div :class="rightType==3?'box_l_title':'box_l_cen'" @click='rightType=3'>预警信息</div> -->
+            <div :class="rightType==0?'box_l_title':'box_l_cen'" @click='rightType=0'>概要信息</div>
+            <!-- <div :class="rightType==3?'box_l_title':'box_l_cen'" @click='rightType=3'>预警信息</div> -->
             <div :class="rightType==1?'box_l_title':'box_l_cen'" @click='rightType=1'>账户资料</div>
             <div :class="rightType==2?'box_l_title':'box_l_cen'" @click='rightType=2'>密码修改</div>
         </div>
@@ -238,7 +239,7 @@
                 loading1: false,
                 loading2:false,
                 showObj: {},
-                rightType: 1,//右边显示类型
+                rightType: 0,//右边显示类型
                 datamodify: {},
                 CompanyList: [],
                 passwordMsg:Object.assign({},defaultpassword),