业绩提成规则 新增部门有效到访奖励

src/components/school/student/stulist.vue

@@ -63,7 +63,9 @@
       :class="{ 'my-sticky-header-table': height != 'unset' }" separator="none" :data="dataList" :columns="columns"
       row-key="StuId" hide-bottom>
       <template v-if="showHeader" v-slot:top>
-        <div class="col-2 q-table__title">学员信息</div>
+        <div class="col-2 q-table__title">学员信息
+          <template v-if="Count>0">(共{{Count}}条)</template>
+        </div>
         <q-space />
         <div class="page-option" v-if="!pushMode">
           <q-btn color="accent" v-if="IsTrasferAll()" outline class="q-mr-md" size="sm" icon="swap_horiz" label="批量转交"
@@ -297,6 +299,10 @@
 
   export default {
     props: {
+      Count: {
+        type: Number,
+        default: null
+      },
       //数据列表
       dataList: {
         type: Array,
@@ -562,7 +568,7 @@
           }
         });
       }
-        
+
       this.formatAssistList();
     },
     mounted() {
@@ -589,7 +595,7 @@
           }
           SetStudentSureConsult(msg).then(res => {
             if (res.Code == 1) {
-              
+
             }
           });
         }).onCancel(() =>{
@@ -599,7 +605,7 @@
             return row.IsSureConsultTime = 1
           }
         })
-        
+
       },
       //是否有下载客户资料权限
       IsDownLoadStu() {
@@ -968,4 +974,4 @@
       }
     }
   };
-</script>
+</script>
\ No newline at end of file

src/pages/financial/market/AchievementsUserDetailList.vue

@@ -168,8 +168,11 @@
             <div
               v-if="scope.row.OrderId"
               style="cursor: pointer;text-decoration: underline;"
-              @click="goUrlorderList(scope.row.ClassType == -1 ?'/sale/studyOrderStatistics' : '/sale/orderStatistics', scope.row)"
-            >{{ scope.row.OrderId }}</div>
+              @click="goUrlorderList(scope.row.OrderId==-1?'/school/student'
+              :scope.row.OrderId!=-1&&scope.row.ClassType == -1 ?'/sale/studyOrderStatistics'
+              :scope.row.OrderId!=-1?'/sale/orderStatistics':'',
+               scope.row)"
+            >{{ scope.row.OrderId!=-1?scope.row.OrderId:'有效到访奖励' }}</div>
           </template>
         </el-table-column>
         <el-table-column prop="IssueNum" label="发放次数" width="94">
@@ -184,7 +187,7 @@
 
         <el-table-column width="130" prop="TotalCommissionMoney" label="订单发放信息">
           <template slot-scope="scope">
-           
+
              <div v-if="scope.row.TotalCommissionMoney" style="color: rgb(255, 156, 0);cursor: pointer;text-decoration: underline;" @click="getmingxi(scope.row)">
               应发:{{scope.row.TotalCommissionMoney}}
               <q-popup-proxy transition-show="flip-up" transition-hide="flip-down">
@@ -244,6 +247,7 @@
   </div>
 </template>
 <script>
+  import { date } from 'quasar'
 import {
   GetClassTypePageList,
 } from '../../../api/system/index';
@@ -294,7 +298,7 @@ export default {
   created() { },
   mounted() {
     if (this.$route.query && this.$route.query.userId) {
-      this.msg.UserId = this.$route.query.userId
+      this.msg.UserId = Number(this.$route.query.userId)
     }
     if (this.$route.query && this.$route.query.preriodId) {
       this.msg.PeriodId = this.$route.query.preriodId
@@ -450,10 +454,23 @@ export default {
       this.$router.go(-1);
     },
     goUrlorderList(path, row) {//订单跳转
-      this.OpenNewUrl(path, {
-        OrderId: row.OrderId,
-        // EnterID:row.UserId
-      });
+      if(row.OrderId!=-1){
+        this.OpenNewUrl(path, {
+          OrderId: row.OrderId,
+          // EnterID:row.UserId
+        });
+      }else{
+        // row.IsDept==2
+        let newDate = row.Periods.split('-')
+        let MonthDayNum = new Date(newDate[0], newDate[1], 0).getDate(); //计算当月的天数
+        this.OpenNewUrl(path, {
+          OrderId: row.OrderId,
+          startTime: row.Periods+'-01',
+          endTime: row.Periods+'-'+MonthDayNum,
+          createBy: row.UserId
+        });
+      }
+
     },
     goUrlclass(path, Names) {//班级
       let Name = encodeURI(Names)

src/pages/financial/market/commissionRule.vue

@@ -39,7 +39,7 @@
     display: flex;
     align-items: center;
     justify-content: space-between;
-    
+
 }
 </style>
 <template>
@@ -113,7 +113,7 @@
             <td>
               <span >{{ item.CourseRate + '%' }}</span>
             </td>
-            
+
             <td style="padding: 0 10px;">
               <span v-for="( son , sIndex ) in item.EmpList" :key="sIndex">
                 <span v-if="sIndex<8">{{ son.EmployeeName }}{{item.EmpList.length==sIndex+1?'':'、'}}</span>
@@ -128,7 +128,7 @@
                 <el-button slot="reference" style="border: none;" type="text">查看更多</el-button>
               </el-popover>
             </td>
-            
+
             <td style="padding: 0 10px;">
               <span v-for="( son , sIndex ) in item.ChildEmpList" :key="sIndex">
                 <span v-if="sIndex<8">{{ son.EmployeeName }}{{item.ChildEmpList.length==sIndex+1?'':'、'}}</span>
@@ -182,7 +182,7 @@
             cellspacing="0"
             cellpadding="0"
           >
-           
+
             <tr>
               <td rowspan="2" width="100" style="min-width: 100px;">提成比例</td>
               <th style="min-width: 220px;"
@@ -192,7 +192,7 @@
             </tr>
             <tr style="">
               <td style="min-width: 220px;" v-for="( son , sIndex ) in item.RateList" :key="sIndex">{{ son.Rate }}%</td>
-       
+
             </tr>
           </table>
           <table v-if="item.SendType=='2'"
@@ -201,7 +201,7 @@
             cellspacing="0"
             cellpadding="0"
           >
-           
+
             <tr>
               <td rowspan="2" width="100" style="min-width: 100px;">固定金额</td>
               <th style="min-width: 220px;"
@@ -214,14 +214,33 @@
               <td style="min-width: 220px;">{{ item.ExtraMoney }}</td>
             </tr>
           </table>
+          <table v-if="item.EnableZGAward=='1'"
+            class="po_content singeRowTable"
+            style="border:1px solid #E6E6E6;"
+            cellspacing="0"
+            cellpadding="0"
+          >
+
+            <tr>
+              <td rowspan="2" width="100" style="min-width: 100px;">有效到访奖励</td>
+              <th style="min-width: 220px;"
+                v-for="( son , sIndex ) in item.ZGAwardList"
+                :key="sIndex"
+              >{{ son.StartValue }} <span>{{son.EndValue && son.EndValue!=-1?'<=有效到访<':'<有效到访'}}</span><span v-if="son.EndValue && son.EndValue!=-1">{{ son.EndValue }}</span></th>
+            </tr>
+            <tr style="">
+              <td style="min-width: 220px;" v-for="( son , sIndex ) in item.ZGAwardList" :key="sIndex">{{ son.Rate }}</td>
+
+            </tr>
+          </table>
         </div>
-        
+
       </div>
       <div
         v-if="dataList.length == 0"
         style="width: 100%;border:1px solid #E6E6E6;display: flex;align-items: center;justify-content: center;height: 60px;"
       >暂无数据</div>
-     
+
     </template>
     <marketCommissionfrom
       v-if="persistent"
@@ -320,7 +339,7 @@ export default {
               })
             }
           })
-          
+
         }
         this.loading = false
       })
@@ -347,7 +366,7 @@ export default {
       getSchoolDropdown({}).then(res => {
         if (res.Code == 1) {
           this.SchoolList = res.Data;
-         
+
         }
       })
     },
@@ -380,7 +399,7 @@ export default {
       this.persistent = true;
       this.selectData = item
       this.isAdd = false;
-      
+
     },
     RemoveTask(Id){//删除
       let delMsg = {

src/pages/financial/market/marketStatistics.vue

@@ -135,9 +135,14 @@
         </el-table-column>
         <el-table-column prop="OrderId" label="订单号">
           <template slot-scope="scope">
-            <div style="cursor: pointer;text-decoration: underline;"
-              @click="goUrlorderList(scope.row.ClassType == -1 ?'/sale/studyOrderStatistics' : '/sale/orderStatistics',scope.row)">
-              {{scope.row.OrderId}} </div>
+            <div
+              v-if="scope.row.OrderId"
+              style="cursor: pointer;text-decoration: underline;"
+              @click="goUrlorderList(scope.row.OrderId==-1?'/school/student'
+              :scope.row.OrderId!=-1&&scope.row.ClassType == -1 ?'/sale/studyOrderStatistics'
+              :scope.row.OrderId!=-1?'/sale/orderStatistics':'',
+               scope.row)">
+               {{ scope.row.OrderId!=-1?scope.row.OrderId:'有效到访奖励' }} </div>
           </template>
         </el-table-column>
         <el-table-column width='130' prop="TotalCommissionMoney" label="订单发放信息">
@@ -467,9 +472,21 @@
         });
       },
       goUrlorderList(path, row) { //订单跳转
-        this.OpenNewUrl(path, {
-          OrderId: row.OrderId,
-        });
+        if(row.OrderId!=-1){
+          this.OpenNewUrl(path, {
+            OrderId: row.OrderId,
+          });
+        }else{
+          // row.IsDept==2
+          let newDate = row.Periods.split('-')
+          let MonthDayNum = new Date(newDate[0], newDate[1], 0).getDate(); //计算当月的天数
+          this.OpenNewUrl(path, {
+            OrderId: row.OrderId,
+            startTime: row.Periods+'-01',
+            endTime: row.Periods+'-'+MonthDayNum,
+            createBy: row.UserId
+          });
+        }
       },
       getmingxi(row) { //明细
         getSellAchievementsChangeLog({
@@ -488,4 +505,4 @@
 </script>
 <style lang="sass">
   @import url('~assets/css/table.sass')
-</style>
+</style>
\ No newline at end of file

src/pages/sale/mystu.vue

@@ -79,7 +79,7 @@
     </div>
     <div class="page-content">
       <stulist :dataList="data" @reload="getStudent" @success="refreshPage" :loading="loading" ref="stuList"
-        :isJudgeTrans="isJudgeTrans">
+        :isJudgeTrans="isJudgeTrans" :Count="Count">
       </stulist>
       <div class="row" style="justify-content: flex-end;padding: 5px 20px">
         <q-pagination v-model="msg.pageIndex" :max="pageCount" @input="changePage" class="full-width justify-end"
@@ -128,6 +128,7 @@
     },
     data() {
       return {
+        Count:0,
         currentUrl: "",
         data: [],
         loading: true,
@@ -348,6 +349,7 @@
             this.loading = false;
             this.data = res.Data.PageData;
             this.pageCount = res.Data.PageCount;
+            this.Count = res.Data.Count
             this.data.forEach(x => {
               if (x.CreateBy != this.userInfo.Id) {
                 x.BelongType = 3;
@@ -399,4 +401,4 @@
     background-color: transparent;
     border: none;
   }
-</style>
+</style>
\ No newline at end of file

src/pages/school/student.vue

@@ -63,14 +63,19 @@
         </div>
         <div class="col-3">
           <q-select filled stack-label option-value="Id" @input="resetSearch" dense option-label="Name"
-            v-model="msg.StuChannel" ref="AdvisorStatus" :options="channelList" clearable label="渠道"
+            v-model="msg.StuChannel" :options="channelList" clearable label="渠道"
+            class="col-6 q-pb-lg" emit-value map-options />
+        </div>
+        <div class="col-3">
+          <q-select filled stack-label option-value="Id" @input="resetSearch" dense option-label="Name"
+            v-model="msg.IsSureConsultTime" :options="visitList" clearable label="有效到访"
             class="col-6 q-pb-lg" emit-value map-options />
         </div>
       </div>
     </div>
     <div class="page-content">
       <stulist :dataList="data" @success="refreshPage" :loading="loading" ref="stuList" :authObj="AuthObj"
-        :queryMsg="msg">
+        :queryMsg="msg" :Count="AuthObj.Count">
       </stulist>
       <div class="row" style="justify-content: flex-end;padding: 5px 20px">
         <q-pagination v-model="msg.pageIndex" :max="pageCount" @input="changePage" class="full-width justify-end"
@@ -139,6 +144,7 @@
           CreateType: "", //来源类型
           StuSourceId: "", //来源人编号
           CategoryId: "", //同行编号
+          IsSureConsultTime: 1,// 0不限 1有效到访 2无效到访
         },
         dateArray: [], //日期数组
         pageCount: 0,
@@ -149,8 +155,14 @@
         customTypeList: [], //客户类型
         AuthObj: {
           isShowDownload: true,
+          Count: 0
         },
         consultList: [],
+        visitList: [
+          {Name:'不限',Id:0},
+          {Name:'只看有效到访',Id:1},
+          {Name:'只看无效到访',Id:2},
+        ],
         //渠道列表
         channelList: [],
       }
@@ -269,6 +281,7 @@
           this.loading = false;
           this.data = res.Data.PageData
           this.pageCount = res.Data.PageCount
+          this.AuthObj.Count = res.Data.Count
           this.data.forEach(x => {
             if (x.CreateBy != this.userInfo.Id) {
               x.BelongType = 3;
@@ -288,4 +301,4 @@
 </script>
 <style lang="sass">
   @import url('~assets/css/table.sass')
-</style>
+</style>
\ No newline at end of file