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

src/api/finance/index.js

@@ -605,6 +605,17 @@ export function getTeacherContributeConfig(data) {
     data
   });
 }
+/**
+ * 获取业绩提成排名
+ *
+ */
+export function GetSellAchievementsRankStat_V2(data) {
+  return request({
+    url: '/SellAchievements/GetSellAchievementsRankStat_NewV2',
+    method: 'post',
+    data
+  })
+}
 
 /**
  * 获取人头奖金配置分页列表

src/components/teacher/assess-form.vue

@@ -38,7 +38,7 @@
             <q-btn size="10px" @click="addChild()" round color="primary" icon="iconfont icon-img_haha" />
           </div>
         </div>
-        <div v-for="(item,index) in addMsg.SubtypeList" class="row wrap childConfig">
+        <div v-for="(item,index) in addMsg.SubtypeList" class="row wrap childConfig" :key="index">
           <q-btn size="10px" @click="delChild(item,index)" class="SubChild" round color="red"
             icon="iconfont icon-guanbi1" />
           <div class="col-12 q-pr-lg q-pb-lg">
@@ -47,7 +47,7 @@
           <div class="q-pb-lg">
             <q-btn size="10px" @click="addSun(index)" round color="primary" icon="iconfont icon-img_haha" />
           </div>
-          <div class="row wrap" style="position:relative;" v-for="(subItem,subIndex) in item.OptionList">
+          <div class="row wrap" style="position:relative;" v-for="(subItem,subIndex) in item.OptionList" :key="subIndex">
             <div class="col-4 q-pr-lg q-pb-lg">
               <q-input filled v-model="subItem.LevelTitle" dense ref="SubTypeName" label="标题"></q-input>
             </div>

src/pages/financial/returnPassbook/ReturnperiodsList.vue

@@ -42,7 +42,6 @@
   .el-table th {
     padding: 5px 0;
   }
-
 </style>
 <template>
   <div class="page-body ReturnperiodsList">
@@ -56,7 +55,7 @@
             </el-date-picker>
           </div>
           <div>
-            <q-btn v-if='isgenerate==true' :loading="loading1"  color="primary"  size="11px"  label="生成返佣"
+            <q-btn v-if='isReturnperiods' :loading="loading1"  color="primary"  size="11px"  label="生成返佣"
                @click="scCommission"  style="height:28px" />
             <div style="font-size: 11px;color: #666;">*默认生成上月返佣</div>
           </div>
@@ -69,7 +68,7 @@
 
         <el-table-column prop="BatchName" label="周期"></el-table-column>
         <el-table-column v-if="isReturnperiods" prop="TotalMoney" label="累计金额"> </el-table-column>
-        <el-table-column v-if="isReturnperiods"prop="TotalEmployee" label="个人直客累计金额"> </el-table-column>
+        <el-table-column v-if="isReturnperiods" prop="TotalEmployee" label="个人直客累计金额"> </el-table-column>
         <el-table-column prop="TotalCustomer" label="同业录入累计金额"> </el-table-column>
         <el-table-column v-if="isReturnperiods" prop="TotalInternal" label="内部介绍累计金额"> </el-table-column>
         <el-table-column v-if="isReturnperiods" prop="TotalTrans" label="学员转介绍累计金额"> </el-table-column>
@@ -78,7 +77,8 @@
         <el-table-column v-if="isReturnperiods" label="财务单据">
           <template slot-scope="scope">
             <template v-if="scope.row.FinanceIdList" v-for="item in scope.row.FinanceIdList">
-              <a @click="goDetails(item)" style="cursor:pointer;color:blue;text-decoration:underline;display:inline-block;margin-right:10px;">{{item}}</a>
+              <a @click="goDetails(item)"
+                style="cursor:pointer;color:blue;text-decoration:underline;display:inline-block;margin-right:10px;">{{item}}</a>
             </template>
           </template>
         </el-table-column>
@@ -89,12 +89,12 @@
                 <i class="iconfont icon-sousuo" @click="goUrl(scope.row.Id)"></i>
               </el-tooltip>
 
-             <templat v-if="isReturnperiods">
-              <el-tooltip class="item" effect="dark" v-if="scope.row.FinanceIds==''||scope.row.FinanceIds==null"
-                content="生成财务单据" placement="top">
-                <i class="iconfont icon-add" @click="setCommissionFinanace(scope.row.Id)"></i>
-              </el-tooltip>
-             </templat>
+              <templat v-if="isReturnperiods">
+                <el-tooltip class="item" effect="dark" v-if="scope.row.FinanceIds==''||scope.row.FinanceIds==null"
+                  content="生成财务单据" placement="top">
+                  <i class="iconfont icon-add" @click="setCommissionFinanace(scope.row.Id)"></i>
+                </el-tooltip>
+              </templat>
             </div>
           </template>
         </el-table-column>
@@ -120,7 +120,7 @@
     getSellAchievementsSendEmployeeList,
     setSellAchievementsSendEmployee
   } from '../../../api/finance/index'
-    import {
+  import {
     mapState
   } from "vuex";
   export default {
@@ -165,7 +165,7 @@
         CheckID: 0,
       }
     },
-     computed: mapState({
+    computed: mapState({
       //是否有下载权限
       isReturnperiods(state) {
         if (state.user.userInfo && state.user.userInfo.ActionMenuList && state.user.userInfo.ActionMenuList.length >
@@ -229,13 +229,13 @@
         SetCommissionPeriodsFinanace(this.msgFinance).then(res => {
           if (res.Code == 1) {
             this.getList();
-              this.$q.notify({
-                icon: 'iconfont icon-chenggong',
-                color: 'accent',
-                timeout: 2000,
-                message: res.Message,
-                position: 'top'
-              })
+            this.$q.notify({
+              icon: 'iconfont icon-chenggong',
+              color: 'accent',
+              timeout: 2000,
+              message: res.Message,
+              position: 'top'
+            })
           }
           this.loading1 = false;
         }).catch(err => {
@@ -297,9 +297,7 @@
       },
     },
   }
-
 </script>
 <style lang="sass">
   @import url('~assets/css/table.sass')
-
-</style>
+</style>
\ No newline at end of file

src/pages/sale/studentTracking.vue

@@ -800,7 +800,7 @@
             this.dataList = res.Data.PageData;
             this.PageCount = res.Data.PageCount;
             this.titlelist = [];
-            for (let i = 0; i < this.RListlength; i++) {
+            for (let i = 0; i < this.RList.length; i++) {
               let obj = [{
                 Name: '月份/续费/转介',
                 Id: 1,

src/pages/teacher/appraisalList.vue

@@ -44,7 +44,7 @@
             <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" @click="showForm(props.row,2)"
               label="建议" /> -->
             <q-btn v-if="isHaveEdit" flat size="xs" icon="edit" color="accent" style="font-weight:400"
-              @click="goAssessTable(props.row)" label="修改" />
+              @click="goAssessTable(props.row)" label="编辑" />
             <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" @click="gotoDetail(props.row)"
               label="详情" />
           </q-td>
@@ -164,12 +164,12 @@
       this.msg.MonthStr = (today.getMonth() + 1).toString();
       this.queryDate = this.msg.YearStr + '-' + this.msg.MonthStr;
       this.findData();
+    },
+    mounted() {
       if (!this.isHaveEdit) {
         let userinfo = this.getLocalStorage();
         this.msg.TeacherAccountId = userinfo.Id;
       }
-    },
-    mounted() {
       this.getTeacherAssessmentPage()
     },
     methods: {
@@ -211,6 +211,7 @@
         var qObj = {};
         if (item) {
           qObj.Id = item.Id;
+          qObj.TeacherAccountId = item.TeacherAccountId;
         }
         this.OpenNewUrl('/teacher/jobEvaluation', qObj);
       },

src/pages/teacher/jobEvaluation.vue

@@ -123,8 +123,13 @@
       this.GetTeacherList();
     },
     mounted() {
-      if (this.$route.query && this.$route.query.Id) {
-        this.saveObj.Id = this.$route.query.Id;
+      if (this.$route.query) {
+        if (this.$route.query.Id) {
+          this.saveObj.Id = this.$route.query.Id;
+        }
+        if (this.$route.query.TeacherAccountId) {
+          this.saveObj.TeacherAccountId = this.$route.query.TeacherAccountId
+        }
         this.getInfo();
       }
     },
@@ -165,7 +170,7 @@
           TeacherAccountId: this.saveObj.TeacherAccountId,
           YearStr: this.saveObj.YearStr,
           MonthStr: this.saveObj.MonthStr,
-          Id:this.saveObj.Id,
+          Id: this.saveObj.Id,
         };
         queryTeacherAssessmentInfo(qMsg).then(res => {
           if (res.Code == 1) {
@@ -208,7 +213,19 @@
               color: 'accent',
               timeout: 2000,
               message: '数据保存成功！',
-              position: 'top'
+              position: 'top',
+              actions: [{
+                label: "点击查看",
+                color: "primary",
+                handler: () => {
+                  this.$router.push({
+                    path: "/teacher/appraisalList",
+                    query: {
+                   
+                    }
+                  });
+                }
+              }],
             })
           }
         }).catch(() => {

src/pages/teacher/teacherAssessment.vue

@@ -210,7 +210,6 @@
       this.getInfo();
     },
     methods: {
-
       //获取教师下拉
       GetTeacherList() {
         var qMsg = {

src/pages/teacher/teacherTrack.vue

@@ -347,7 +347,6 @@
   } from '../../api/course/index'
   import {
     queryEmployee,
-
   } from "../../api/users/user";
   import {
     queryGuestStateList,