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

src/components/school/student/stulist.vue

@@ -302,9 +302,9 @@ export default {
           align: "left"
         },
         {
-          name: "StuRealMobile",
+          name: "StuTel",
           label: "电话",
-          field: "StuRealMobile",
+          field: "StuTel",
           align: "left"
         },
         {

src/components/work/commission.vue

@@ -400,7 +400,7 @@
     }
 
     .progress-box {
-      width: 39vw;
+      width: 38vw;
       height: 20px;
       margin: 10px auto;
       border-radius: 2px;
@@ -453,7 +453,7 @@
     }
 
     .commission-table {
-      width: 39vw;
+      width: 38vw;
       height: 375px;
       margin: 0 auto;
       border-top: 1px solid #EAEBF0;

src/components/work/index.vue

@@ -186,6 +186,11 @@ export default {
         }
       });
     }
+    if((this.IsQueryAuth||this.CurrentUserInfo.IsMarket==1)||(this.IsQueryAuth||this.CurrentUserInfo.IsCourseConsultant==1)){
+      this.viewMode=1
+    }else{
+      this.viewMode=2
+    }
 
     this.getUserList();
     let str=Encrypt("2")

src/components/work/todayData.vue

@@ -35,7 +35,7 @@
     cursor: pointer;
   }
 
-  .ckedClass {
+  .toDayCkclass {
     font-weight: 500;
     color: rgba(0, 0, 0, .9);
   }
@@ -137,13 +137,20 @@
     flex: 1 1 0%;
     color: #fa5151;
     display: inline-block;
-    width: 40px;
+    width: 60px;
   }
 
   .greenClass {
     color: #00ce8b !important;
     display: inline-block;
-    width: 40px;
+    width: 60px;
+  }
+  .topselect {
+    ::v-deep {
+      .el-input__inner {
+        height: 40px!important;
+      }
+    }
   }
 </style>
 <template>
@@ -153,10 +160,10 @@
         平台数据
       </div>
       <div style="display:flex;">
-        <el-date-picker v-model="dateList" style="width:380px;" type="daterange" align="right" value-format="yyyy-MM-dd" @change="searchData"
+        <el-date-picker v-model="dateList" style="width:380px;" type="daterange" :picker-options="pickerOptions0" align="right" value-format="yyyy-MM-dd" @change="searchData"
           unlink-panels range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
         </el-date-picker>
-        <el-select v-if="IsShowEmpQuery" v-model="msg.empList" @change="searchData"
+        <el-select v-if="IsShowEmpQuery" class="topselect" v-model="msg.empList" @change="searchData"
           style="width:180px;margin-left:10px;" collapse-tags multiple filterable placeholder="请选择">
           <el-option v-for="item in myEmployeeList" :key="item.Id" :label="item.EmployeeName" :value="item.Id">
           </el-option>
@@ -165,10 +172,10 @@
     </div>
     <div class="Check_Content" v-if="(IsQueryAuth||CurrentUserInfo.IsMarket==1)||(IsQueryAuth||CurrentUserInfo.IsCourseConsultant==1)">
       <div class="Check_ListContent">
-        <div class="Check_Item" v-if="IsQueryAuth||CurrentUserInfo.IsMarket==1" @click="comType=1,searchData() "
-          :class="{'ckedClass':comType==1}">市场部数据统计</div>
+        <div class="Check_Item" v-if="IsQueryAuth||CurrentUserInfo.IsMarket==1" @click="getSwitch(1)"
+          :class="{'toDayCkclass':comType==1}">市场部数据统计</div>
         <div class="Check_Item" v-if="IsQueryAuth||CurrentUserInfo.IsCourseConsultant==1"
-          @click="comType=2,searchData()" :class="{'ckedClass':comType==2}">课程顾问部统计</div>
+          @click="getSwitch(2)" :class="{'toDayCkclass':comType==2}">课程顾问部统计</div>
       </div>
     </div>
     <div v-show="comType==1">
@@ -556,16 +563,20 @@
             <div class="Data_Inner">
               <div class="Data_Title">本周签约金额</div>
               <div class="Data_Time">{{ConsultObj.DayStr}} {{ConsultObj.WeekStr}}</div>
-              <div class="Data_wrapper">
+              <div style="margin-top:20px;">
+                <span class="Data_Span">{{ConsultObj.CurWeekOrderSale}}</span>
+                <span class="Data_Ci">元</span>
+              </div>
+              <div class="Data_wrapper" style="height:25px;">
                 <div class="Data_Left">
-                  <span class="Data_Span">{{ConsultObj.CurWeekOrderSale}}</span>
-                  <span class="Data_Ci">元</span>
+                  <span class="Data_Span"></span>
+                  <span class="Data_Ci"></span>
                 </div>
-                <div class="Data_Right">
+                <div class="Data_Right" style="width:100%;">
                   <div class="Data_One">
                     <span class="label_Day">周</span>
-                    <span class="label_Cule">
-                      {{ConsultObj.LastWeekOrderSale}}%
+                    <span class="label_Cule" style="width:75px;">
+                      {{ConsultObj.LastWeekOrderSale}} 元
                     </span>
                   </div>
                 </div>
@@ -596,16 +607,20 @@
             <div class="Data_Inner">
               <div class="Data_Title">签约金额累计</div>
               <div class="Data_Time">{{ConsultObj.DayStr}} {{ConsultObj.WeekStr}}</div>
-              <div class="Data_wrapper">
+              <div style="margin-top:20px;">
+                <span class="Data_Span">{{ConsultObj.CurMonthOrderSale}}</span>
+                <span class="Data_Ci">元</span>
+              </div>
+              <div class="Data_wrapper" style="height:25px;">
                 <div class="Data_Left">
-                  <span class="Data_Span">{{ConsultObj.CurMonthOrderSale}}</span>
-                  <span class="Data_Ci">元</span>
+                  <span class="Data_Span"></span>
+                  <span class="Data_Ci"></span>
                 </div>
                 <div class="Data_Right">
                   <div class="Data_One">
                     <span class="label_Day">月</span>
                     <span class="label_Cule">
-                      {{ConsultObj.LastMonthOrderSale}}%
+                      {{ConsultObj.LastMonthOrderSale}} 元
                     </span>
                   </div>
                 </div>
@@ -616,12 +631,16 @@
             <div class="Data_Inner">
               <div class="Data_Title">当月效能目标</div>
               <div class="Data_Time">{{ConsultObj.DayStr}} {{ConsultObj.WeekStr}}</div>
-              <div class="Data_wrapper">
-                <div class="Data_Left">
-                  <span class="Data_Span">{{ConsultObj.CurMonthOrderGoal}}</span>
-                  <span class="Data_Ci">元</span>
+              <div style="margin-top:20px;">
+                <span class="Data_Span">{{ConsultObj.CurMonthOrderGoal}}</span>
+                <span class="Data_Ci">元</span>
+              </div>
+              <div class="Data_wrapper" style="height:25px;">
+                <div class="Data_Left" style="width:20px;">
+                  <span class="Data_Span"></span>
+                  <span class="Data_Ci"></span>
                 </div>
-                <div class="Data_Right" style="width:101px;">
+                <div class="Data_Right" style="width:122px;">
                   <div class="Data_One">
                     <span class="label_Day" style="width:56px;">完成进度</span>
                     <span class="label_Cule"
@@ -747,6 +766,11 @@
         IsQueryAuth: false, //是否有查询市场部和课程顾问部人员权限
         CurrentUserInfo: {}, //当前登录用户信息
         IsShowEmpQuery: false, //是否显示员工下拉框
+        pickerOptions0: {
+          disabledDate(time) {
+            return time.getTime() > Date.now() - 8.64e6
+          }
+        },  
       };
     },
     created() {
@@ -792,7 +816,12 @@
       this.searchData();
     },
     methods: {
-
+      //点击市场和课程顾问切换
+      getSwitch(type){
+        this.comType=type;
+        this.msg.empList=[];
+        this.searchData();
+      },
       //获取员工列表
       getEmployeeList() {
         var qMsg = {

src/pages/school/student.vue

@@ -75,6 +75,8 @@
     resetPassword
   } from '../../api/users/user.js'
   import stulist from '../../components/school/student/stulist'
+  import { mapGetters } from "vuex";
+
   export default {
     meta: {
       title: "客户管理"
@@ -110,6 +112,9 @@
         customTypeList: [] //客户类型
       }
     },
+    computed: {
+      ...mapGetters(["userInfo"])
+    },
     created() {
       this.getEmployeeList();
       this.getStuStageList();
@@ -177,6 +182,13 @@
           this.loading = false;
           this.data = res.Data.PageData
           this.pageCount = res.Data.PageCount
+          this.data.forEach(x => {
+            if (x.CreateBy != this.userInfo.Id) {
+              x.BelongType = 3;
+            } else {
+              x.BelongType = 1;
+            }
+          });
         }).catch(() => {
           this.loading = false
         })

src/pages/test.vue

@@ -97,7 +97,7 @@
     },
     data() {
       return {
-        ActionStr: "/UserCenter/CreateMarketData",
+        ActionStr: "/Login/Test",
         parameterList: [{
           Name: "",
           Value: ""