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

src/components/school/student/student-left.vue

@@ -69,6 +69,10 @@
     height: 80px;
     position: relative;
   }
+  .stage_value .q-field__native span{
+    width:100%;
+    overflow:hidden;
+  }
 </style>
 <template>
   <div>
@@ -157,7 +161,7 @@
           </div>
         </div>
       </div>
-      <template v-if="BelongType != 3">
+      <template v-if="IsShowStuSourceIdName(customObj)">
         <div class="customer_info_component">
           <div class="customer_info_Stage">
             <div class="stage_label">
@@ -321,13 +325,6 @@
               :disable="noEdit" option-value="Id" emit-value map-options />
           </div>
         </div>
-        <!-- <div class="info_item">
-          <div class="item_label">创建人</div>
-          <div class="item_value">
-            <q-select filled v-model="customObj.CreateBy" dense disable @filter="filterEmployee" use-input
-              :options="myEmployeeList" option-label="EmployeeName" option-value="Id" emit-value map-options />
-          </div>
-        </div> -->
         <div class="info_item" v-if="!noEdit">
           <q-btn color="accent" class="q-mr-md" label="保存" @click="saveStu()" />
         </div>
@@ -381,6 +378,7 @@
         type: Number,
         default: null
       },
+      //1-当前登录人自己创建,3-不是当前登录人创建
       BelongType: {
         type: Number,
         default: null
@@ -442,12 +440,14 @@
           QQ: "",
           WeChatNo: ""
         },
-        NeedData: [],
-        noEdit: false,
-        isHaveOrder: false
+        NeedData: [],//客户需求列表
+        noEdit: false,//是否可以修改编辑客户信息
+        isHaveOrder: false, //学员是否有订单
+        userInfo: {}, //当前登录人员
       };
     },
     created() {
+      this.userInfo = this.getLocalStorage();
       this.getStuStageList();
       this.getBasicList();
       this.queryGuestEducationEnumList();
@@ -459,16 +459,16 @@
       this.getCustomTypeList();
       this.getStudentDorpDown();
       this.getGetNeedsList();
-      this.getStuOrderPage();
-      if (this.saveObj && this.saveObj.StuId > 0) {
-        this.customMsg.StuId = this.saveObj.StuId;
-        this.checkMsg.StuId = this.saveObj.StuId;
+
+      if (this.saveObj) {
+        if (this.saveObj.StuId > 0) {
+          this.customMsg.StuId = this.saveObj.StuId;
+          this.checkMsg.StuId = this.saveObj.StuId;
+        }
         if (this.saveObj.noEdit && this.saveObj.noEdit == true) {
           this.noEdit = true;
         }
-      }
-      if (this.BelongType == 3) {
-        // this.noEdit = true;
+      
       }
     },
     watch: {
@@ -477,6 +477,23 @@
       }
     },
     methods: {
+      //是否显示关联来源人信息
+      IsShowStuSourceIdName(item) {
+        var isHaveAuth = false;
+        if (this.userInfo && this.userInfo.ActionMenuList && this.userInfo.ActionMenuList.length >
+          0) {
+          this.userInfo.ActionMenuList.forEach((x) => {
+            if (x.FunctionCode == "Look_StuSourceId") {
+              isHaveAuth = true;
+            }
+          });
+        }
+        if (item.CreateBy == this.userInfo.Id || isHaveAuth) {
+          return true;
+        } else {
+          return false;
+        }
+      },
       uploadFile(files) {
         UploadSelfFile("studentIcon", files, res => {
           if (res.Code == 1) {
@@ -722,7 +739,6 @@
           );
         });
       },
-
       init() {
         const tempDate = this.stuData;
         this.customObj.StuId = tempDate.StuId;
@@ -746,12 +762,11 @@
         this.customObj.QQ = tempDate.QQ;
         this.customObj.WeChatNo = tempDate.WeChatNo;
         this.customObj.StuNeeds = tempDate.StuNeeds;
-        this.customObj.StuTel=tempDate.StuTel;
-  
-        if (this.customObj.StuId > 0) {
+        this.customObj.StuTel = tempDate.StuTel;
+          //有订单
+        if (tempDate.OrderCount && tempDate.OrderCount > 0) {
           this.isHaveOrder = true;
         }
-
       },
       //新增协助人员
       addAssist() {
@@ -801,27 +816,6 @@
         this.customObj.StuSourceId = "";
         this.customObj.PlatformName = "";
       },
-      getStuOrderPage() {
-        let customMsg = {
-          pageIndex: 1,
-          pageSize: 10,
-          StuId: 0
-        };
-        if (this.saveObj) {
-          customMsg.StuId = this.saveObj.StuId;
-        }
-        queryStuOrderPage(customMsg).then(res => {
-          if (res.Code == 1) {
-            if (this.customObj.StuId > 0) {
-              if (res.Data.PageData.length > 0) {
-                this.isHaveOrder = true;
-              } else {
-                this.isHaveOrder = false;
-              }
-            }
-          }
-        });
-      }
     }
   };
 </script>

src/components/school/student/studentAdd-form.vue

@@ -32,9 +32,6 @@
     data() {
       return {
         persistent: true,
-        msg: {
-
-        },
         baseObj: {},
       }
     },

src/components/school/student/studentRight-form.vue

@@ -151,6 +151,7 @@
         type: Object,
         default: null
       },
+      //是否显示转交
       isJudgeTrans: {
         type: Number,
         default: null
@@ -554,7 +555,6 @@
 
   .operate_Content {
     overflow: auto;
-    /* padding-right: 20px; */
   }
 
   .operate_Content::-webkit-scrollbar {

src/components/school/student/stulist.vue

@@ -105,6 +105,16 @@
           <q-badge :color="props.value == 1 ? 'negative' : 'primary'" :label="props.value == 1 ? '女' : '男'" />
         </q-td>
       </template>
+      <template v-slot:body-cell-CreateTypeStr="props">
+        <q-td :props="props">
+          <div v-if="IsShowStuSourceIdName(props.row)">
+            {{ props.row.CreateTypeStr }}
+          </div>
+          <div v-else>
+            -
+          </div>
+        </q-td>
+      </template>
       <template v-slot:body-cell-StuSourceIdName="props">
         <q-td :props="props">
           <div v-if="IsShowStuSourceIdName(props.row)">
@@ -116,6 +126,16 @@
           </div>
         </q-td>
       </template>
+      <template v-slot:body-cell-StuChannelName="props">
+        <q-td :props="props">
+          <div v-if="IsShowStuSourceIdName(props.row)">
+            {{ props.row.StuChannelName }}
+          </div>
+          <div v-else>
+            -
+          </div>
+        </q-td>
+      </template>
       <template v-slot:body-cell-AdvisorWinRate="props">
         <q-td :props="props">{{props.row.AdvisorWinRate}}%</q-td>
       </template>
@@ -156,7 +176,6 @@
       <template v-slot:body-cell-CurseManager="props">
         <q-td :props="props" v-html="getCurseManager(props.row)"></q-td>
       </template>
-
       <template v-slot:body-cell-OrderCount="props">
         <q-td :props="props" v-if="props.row.OrderCount == 0" class="text-grey-4">未报名</q-td>
         <q-td :props="props" v-if="props.row.OrderCount > 0" class="bg-negative text-white"
@@ -413,7 +432,6 @@
             field: "StuChannelName",
             align: "left"
           },
-
           {
             name: "CreateTimeStr",
             label: "创建时间",
@@ -436,13 +454,13 @@
         stuOption: null,
         isShowAdd: false,
         selection: [],
-        isShowTransfer: false,
+        isShowTransfer: false,//是否显示转订单弹窗
         BelongType: 1,
-        pushMode: false,
+        pushMode: false,//是否显示推送按钮
         pushing: false,
         assistListFormat: [],
-        checkType: 1,
-        isShowAbroad: false,
+        checkType: 1, //打开右侧弹窗类型
+        isShowAbroad: false, //是否显示转留学就业订单弹窗
         userInfo: {}, //当前登录人员
       };
     },
@@ -458,13 +476,13 @@
     created() {
       this.userInfo = this.getLocalStorage();
       this.formatAssistList();
-      this.initAuth();
     },
     mounted() {},
     computed: {
       ...mapGetters(["logo", "name"])
     },
     methods: {
+      //是否有查看客户来源和来源关联人权限
       IsShowStuSourceIdName(item) {
         var isHaveAuth = false;
         if (this.userInfo && this.userInfo.ActionMenuList && this.userInfo.ActionMenuList.length >
@@ -490,8 +508,7 @@
           "客户资料.xls"
         );
       },
-      //初始化权限
-      initAuth() {},
+      //服务人员转化
       formatAssistList() {
         this.assistListFormat = [];
         this.dataList.forEach(x => {
@@ -611,6 +628,7 @@
             obj.Status = obj.Status == 1 ? 0 : 1;
           });
       },
+      //刷新列表
       refreshStuList() {
         this.$emit("success");
         this.selection = [];

src/components/stuMan/subscribe/changeCourse.vue

@@ -127,14 +127,12 @@ export default {
               e.SubList.map((_e,_i)=>{
                 if(_e.GuestList&&_e.GuestList.length>0){
                   let ids=_e.GuestList.map(x=>x.AppointmentId).toString()
-                  console.log(130,ids.indexOf(this.saveObj.ids))
                   if(ids.indexOf(this.saveObj.ids)>-1){
                     this.dataList[i].SubList.splice(_i,1)
                   }
                 }
               })
             }
-
           })
         }
       });

src/components/stuMan/subscribe/subscribeForm.vue

@@ -468,7 +468,6 @@ export default {
         const totalTime = this.courseCheckList.reduce((pre, cur) => {
           return (pre += cur.Minutes);
         }, 0);
-        console.log(452, this.courseCheckList, totalTime);
         if (this.checkChapter.StudyMinutes !== totalTime) {
           this.$q.notify({
             message: "课时不匹配，请重新上课时段",

src/pages/stuMan/stuList.vue

@@ -233,9 +233,7 @@
           </q-select>
         </div>
         <div class="col-3">
-          <q-select @input="
-              (msg.StuSourceId = ''), (msg.StuChannelId = ''), resetSearch()
-            " :dense="false" clearable filled option-value="Id" option-label="Name" v-model="msg.CreateType"
+          <q-select @input="getShaixuanFrom()" :dense="false" clearable filled option-value="Id" option-label="Name" v-model="msg.CreateType"
             :options="customFromList" emit-value map-options label="客户来源" />
         </div>
         <div class="col-3" v-if="msg.CreateType == 1">
@@ -792,7 +790,6 @@
       this.GetStuChannelList();
       this.GetCustomerList();
       this.getEmployeeList();
-      this.getStudentDorpDown();
     },
     methods: {
       //获取收客渠道
@@ -869,6 +866,15 @@
           );
         });
       },
+      //筛选客户来源
+      getShaixuanFrom(){
+        this.msg.StuSourceId = ''
+        this.msg.StuChannelId = ''
+        if(this.msg.CreateType==4){
+          this.getStudentDorpDown();
+        }
+        this.resetSearch()
+      },
       //获取转介人下拉
       getStudentDorpDown() {
         getStudentDorpDownList().then(res => {