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) {
+
+      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/studentFU-form.vue

 <template>
-  <q-dialog
-    v-model="persistent"
-    full-height
-    maximized
-    position="right"
-    persistent
-    @hide="closeCutomer"
-    transition-show="slide-left"
-  >
+  <q-dialog v-model="persistent" full-height maximized position="right" persistent @hide="closeCutomer"
+    transition-show="slide-left">
     <div class="customMain">
       <div class="custom_Top">
         <div class="custom_HLeft">
           <div class="nameplate_avatar">
-            <img
-              v-if="baseObj.StuIcon"
-              style="width:100%;height:100%;"
-              :src="baseObj.StuIcon"
-              alt
-            />
+            <img v-if="baseObj.StuIcon" style="width:100%;height:100%;" :src="baseObj.StuIcon" alt />
             <div class="student_Name" v-else>
               <span v-if="baseObj.StuName">{{
                 baseObj.StuName.substring(0, 1)
@@ -28,21 +16,15 @@
             <div class="F_16">{{ baseObj.StuName }}</div>
           </div>
         </div>
-      
       </div>
       <div class="custom_Bottom">
-       
         <div class="detail-travel">
           <div class="detail_first">
-           
             <div class="operate_Content" style="flex:1;">
               <div class="detail_Main">
-                
-               
                 <!-- 操作 -->
-                <template >
+                <template>
                   <div class="operate_Content" style="margin-top:20px;">
-                   
                     <div style="display:flex;flex:1;flex-direction: column;overflow:hidden;">
                       <div class="TimeLineDiv">
                         <q-timeline color="primary">
@@ -50,7 +32,6 @@
                             <template v-slot:title>
                               <div class="visit_Cont">
                                 <div class="Log_Content" v-html="tItem.Remark"></div>
-                                  
                               </div>
                             </template>
                             <template v-slot:subtitle>
@@ -64,14 +45,8 @@
                       </div>
                     </div>
                     <div style="margin-bottom:20px;">
-                        <q-pagination
-                            class="full-width justify-end"
-                            v-model="msg.pageIndex"
-                            color="primary"
-                            :max="page_Count"
-                            input
-                            @input="changePage"
-                        />
+                      <q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary"
+                        :max="page_Count" input @input="changePage" />
                     </div>
                   </div>
                 </template>
@@ -87,15 +62,22 @@
   </q-dialog>
 </template>
 <script>
-import { queryEmployee } from "../../../api/users/user";
-import { ForwardStudent ,queryStudentFollowPage} from "../../../api/customerstudent/customerstudent";
-import {
+  import {
+    queryEmployee
+  } from "../../../api/users/user";
+  import {
+    ForwardStudent,
+    queryStudentFollowPage
+  } from "../../../api/customerstudent/customerstudent";
+  import {
     getStudentInfo, //获取学员客户信息
     queryStuStageList //获取客户阶段列表
-} from "../../../api/school/index";
-import studentGenjin from "../student/student-genjin";
-import { SetStudentAssistBatch } from "../../../api/sale/sale";
-export default {
+  } from "../../../api/school/index";
+  import studentGenjin from "../student/student-genjin";
+  import {
+    SetStudentAssistBatch
+  } from "../../../api/sale/sale";
+  export default {
     meta: {
       title: "学员管理"
     },
@@ -107,48 +89,25 @@ export default {
         type: Object,
         default: null
       },
-    isJudgeTrans: {
-      type: Number,
-      default: null
-    },
-    BelongType: {
-      type: Number,
-      default: null
-    }
     },
     data() {
       return {
         persistent: true,
-      ckedTab: "1",
-      secondType: 1,
-      pushing: false,
         msg: {
           pageIndex: 1,
           pageSize: 12,
           StuId: 0
         },
         baseObj: {},
-      transMsg: {
-        StuId: 1,
-        CreateBy: ""
-      },
-      //员工列表
-      employeeList: [],
-      myEmployeeList: [],
-      isShowTrans: false,
-      customStateList: [],
-      stateId: 0,
-      stuData: {},
         userInfo: {},
         dataList: [],
-    page_Count:0,
-
+        page_Count: 0,
       };
     },
     created() {
       this.msg.StuId = this.saveObj.StuId;
-       this.msg.STime = this.saveObj.STime?this.saveObj.STime:'';
-       this.msg.ETime = this.saveObj.ETime?this.saveObj.ETime:'';
+      this.msg.STime = this.saveObj.STime ? this.saveObj.STime : '';
+      this.msg.ETime = this.saveObj.ETime ? this.saveObj.ETime : '';
       this.getList()
       this.userInfo = this.getLocalStorage();
     },
@@ -178,32 +137,28 @@ export default {
         this.msg.pageIndex = val;
         this.getList();
       },
-  
-
       closeCutomer() {
         this.$emit("close");
       },
-    
-   
     }
-};
+  };
 </script>
 <style scoped>
-.custom_RModel {
+  .custom_RModel {
     width: 500px;
     height: 100%;
-}
+  }
 
-.customMain {
+  .customMain {
     width: 600px !important;
     display: flex;
     flex-direction: column;
     height: 100 vh;
     padding: 15px 17px 0 17px;
     background-color: #f4f4f6;
-}
+  }
 
-.custom_Top {
+  .custom_Top {
     width: 100%;
     padding: 22px;
     background: #fff;
@@ -211,47 +166,47 @@ export default {
     display: flex;
     justify-content: space-between;
     align-items: center;
-}
+  }
 
-.custom_HLeft {
+  .custom_HLeft {
     display: flex;
-}
+  }
 
-.nameplate_avatar {
+  .nameplate_avatar {
     width: 60px;
     height: 60px;
     flex-shrink: 0;
     margin-right: 14px;
     border-radius: 5px;
     overflow: hidden;
-}
+  }
 
-.F_16 {
+  .F_16 {
     font-size: 16px;
-}
+  }
 
-.Name_List {
+  .Name_List {
     display: flex;
     flex-direction: column;
     justify-content: space-around;
     overflow: hidden;
-}
+  }
 
-.wechat_Name {
+  .wechat_Name {
     color: #9999a8;
     display: flex;
     font-size: 14px;
-}
+  }
 
-.custom_Bottom {
+  .custom_Bottom {
     margin-top: 17px;
     flex: 1;
     display: flex;
     margin-top: 17px;
     overflow: hidden;
-}
+  }
 
-.detail-info {
+  .detail-info {
     flex-shrink: 0;
     box-sizing: border-box;
     display: flex;
@@ -263,13 +218,13 @@ export default {
     background: #fff;
     border-radius: 8px 8px 0 0;
     overflow: auto;
-}
+  }
 
-.detail-info::-webkit-scrollbar {
+  .detail-info::-webkit-scrollbar {
     display: none;
-}
+  }
 
-.detail-travel {
+  .detail-travel {
     width: 100%;
     flex-grow: 1;
     display: flex;
@@ -278,26 +233,26 @@ export default {
     background: #fff;
     border-radius: 8px 8px 0 0;
     overflow: hidden;
-}
+  }
 
-.edit_bar {
+  .edit_bar {
     display: flex;
     justify-content: space-between;
     align-items: center;
     padding: 12px 22px;
-}
+  }
 
-.edit_info_wrap {
+  .edit_info_wrap {
     padding: 0 22px 12px;
-}
+  }
 
-.custom_Line {
+  .custom_Line {
     width: calc(100% - 44px);
     margin: 16px 22px;
     border-bottom: 1px solid #d7d7d7;
-}
+  }
 
-.custom_Edit {
+  .custom_Edit {
     display: flex;
     justify-content: center;
     align-items: center;
@@ -308,63 +263,63 @@ export default {
     border-radius: 4px;
     font-size: 12px;
     cursor: pointer;
-}
+  }
 
-.tripTypeContent {
+  .tripTypeContent {
     display: flex;
     overflow-x: auto;
     white-space: nowrap;
-}
+  }
 
-.StuCkedType {
+  .StuCkedType {
     color: #3470ff;
     font-weight: 700;
-}
+  }
 
-.tripTypeContent div {
+  .tripTypeContent div {
     margin-right: 20px;
     cursor: pointer;
-}
+  }
 
-.q-timeline__title {
+  .q-timeline__title {
     margin-bottom: 5px;
-}
+  }
 
-.customUpdateTime {
+  .customUpdateTime {
     display: flex;
     justify-content: space-between;
     font-size: 14px;
     color: #9696a6;
-}
+  }
 
-.q-timeline__subtitle {
+  .q-timeline__subtitle {
     opacity: 1;
     font-weight: normal;
-}
+  }
 
-.follow_Component {
+  .follow_Component {
     padding: 0 22px;
     margin-top: 10px;
     width: 100%;
     background-color: #f6f6f6;
     border-radius: 5px;
-}
+  }
 
-.detail_first {
+  .detail_first {
     margin: 0 22px;
     display: flex;
     flex-direction: column;
     height: 100%;
-}
+  }
 
-.detail_Main {
+  .detail_Main {
     display: flex;
     flex-direction: column;
     width: 100%;
     height: 100%;
-}
+  }
 
-.student_Name {
+  .student_Name {
     width: 100%;
     height: 100%;
     background: #004d40;
@@ -372,53 +327,53 @@ export default {
     text-align: center;
     line-height: 60px;
     font-size: 20px;
-}
+  }
 
-.TimeLineDiv {
+  .TimeLineDiv {
     height: 620px;
     flex: 1;
     height: 100%;
     padding-right: 20px;
-}
+  }
 
-.Time_TopList {
+  .Time_TopList {
     display: flex;
     justify-content: space-between;
-}
+  }
 
-.visit_Cont {
+  .visit_Cont {
     font-size: 14px;
-}
+  }
 
-.visit_delete {
+  .visit_delete {
     font-size: 14px;
     cursor: pointer;
     width: 30px;
-}
+  }
 
-.operate_Content {
+  .operate_Content {
     overflow: auto;
     /* padding-right: 20px; */
-}
+  }
 
-.operate_Content::-webkit-scrollbar {
+  .operate_Content::-webkit-scrollbar {
     width: 6px;
     height: 8px;
-}
+  }
 
-.operate_Content::-webkit-scrollbar-thumb {
+  .operate_Content::-webkit-scrollbar-thumb {
     border-radius: 4px;
     -webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
     background: #c9c9c9;
-}
+  }
 
-.operate_Content::-webkit-scrollbar-thumb {
+  .operate_Content::-webkit-scrollbar-thumb {
     -webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
     border-radius: 4px;
     background: #ededed;
-}
+  }
 
-.Log_Content {
+  .Log_Content {
     padding: 10px;
     border-radius: 5px;
     background-color: #f4f4f6;
@@ -426,42 +381,42 @@ export default {
     line-height: 2;
     margin-top: 10px;
     word-break: break-all;
-}
+  }
 
-.stu_ComFeed {
+  .stu_ComFeed {
     color: #3470ff;
     cursor: pointer;
     margin-left: 20px;
-}
+  }
 
-.StuCom_Remark {
+  .StuCom_Remark {
     display: flex;
-}
+  }
 
-.StuCom_Inner {
+  .StuCom_Inner {
     width: 100%;
-}
+  }
 
-.StuCom_Left {
+  .StuCom_Left {
     flex-shrink: 0;
     width: 57px;
     text-align-last: justify;
-}
+  }
 
-.Stu_OrderId {
+  .Stu_OrderId {
     color: #2961fe;
     font-weight: bold;
     text-decoration: underline;
     cursor: pointer;
-}
+  }
 
-.Stu_HtLeft {
+  .Stu_HtLeft {
     width: 57px;
     display: inline-block;
     text-align-last: justify;
-}
+  }
 
-.fullscreen {
+  .fullscreen {
     z-index: 3000;
-}
+  }
 </style>
\ No newline at end of file

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/school/student/transfer-order.vue

 <template>
   <div class="transfer-order">
-    <q-dialog
-      v-model="persistent"
-      persistent
-      content-class="bg-grey-1"
-      transition-show="scale"
-      transition-hide="scale"
-      @hide="$emit('close')"
-    >
+    <q-dialog v-model="persistent" persistent content-class="bg-grey-1" transition-show="scale" transition-hide="scale"
+      @hide="$emit('close')">
       <q-card style="width: 800px;max-width:800px;">
         <q-card-section class="row items-center q-pb-none">
           <div class="text-h6">转订单</div>
@@ -24,57 +18,23 @@
                 <div class="page-search row items-center">
                   <div class="col row wrap q-mr-lg q-col-gutter-md">
                     <div class="col-3">
-                      <q-select
-                        @input="resetSearch"
-                        filled
-                        option-value="SId"
-                        option-label="SName"
-                        v-model="courseMsg.School_Id"
-                        :options="schoolList"
-                        emit-value
-                        map-options
-                        label="关联校区"
-                        clearable
-                      />
+                      <q-select @input="resetSearch" filled option-value="SId" option-label="SName"
+                        v-model="courseMsg.School_Id" :options="schoolList" emit-value map-options label="关联校区"
+                        clearable />
                     </div>
 
                     <div class="col-3">
-                      <q-input
-                        @change="resetSearch"
-                        clearable
-                        filled
-                        v-model="courseMsg.ClassNo"
-                        label="班号"
-                        @clear="resetSearch"
-                        maxlength="20"
-                      />
+                      <q-input @change="resetSearch" clearable filled v-model="courseMsg.ClassNo" label="班号"
+                        @clear="resetSearch" maxlength="20" />
                     </div>
                     <div class="col-6">
-                      <q-input
-                        @change="resetSearch"
-                        clearable
-                        filled
-                        v-model="courseMsg.ClassName"
-                        label="班级名称"
-                        @clear="resetSearch"
-                        maxlength="20"
-                      />
+                      <q-input @change="resetSearch" clearable filled v-model="courseMsg.ClassName" label="班级名称"
+                        @clear="resetSearch" maxlength="20" />
                     </div>
                     <div class="col-6">
-                      <q-select
-                        @input="resetSearch"
-                        @filter="filterCourseFn"
-                        use-input
-                        filled
-                        option-value="CourseId"
-                        option-label="CourseName"
-                        v-model="courseMsg.CouseId"
-                        :options="myClassList"
-                        emit-value
-                        map-options
-                        label="学习课程"
-                        clearable
-                      >
+                      <q-select @input="resetSearch" @filter="filterCourseFn" use-input filled option-value="CourseId"
+                        option-label="CourseName" v-model="courseMsg.CouseId" :options="myClassList" emit-value
+                        map-options label="学习课程" clearable>
                         <template v-slot:no-option>
                           <q-item>
                             <q-item-section class="text-grey">
@@ -84,31 +44,15 @@
                         </template>
                       </q-select>
                     </div>
-
                     <div class="col-6">
                       <div class="col-3 Sysuser_Date">
                         <q-field filled>
                           <template v-slot:control>
-                            <el-date-picker
-                              v-model="courseMsg.StartTime"
-                              type="date"
-                              placeholder="开学日期"
-                              size="small"
-                              style="width:47%;"
-                              @change="resetSearch"
-                              clear-icon="iconfont icon-guanbi"
-                            >
-                            </el-date-picker
-                            >至
-                            <el-date-picker
-                              v-model="courseMsg.EndTime"
-                              type="date"
-                              placeholder="结束日期"
-                              size="small"
-                              style="width:47%;"
-                              @change="resetSearch"
-                              clear-icon="iconfont icon-guanbi"
-                            >
+                            <el-date-picker v-model="courseMsg.StartTime" type="date" placeholder="开学日期" size="small"
+                              style="width:47%;" @change="resetSearch" clear-icon="iconfont icon-guanbi">
+                            </el-date-picker>至
+                            <el-date-picker v-model="courseMsg.EndTime" type="date" placeholder="结束日期" size="small"
+                              style="width:47%;" @change="resetSearch" clear-icon="iconfont icon-guanbi">
                             </el-date-picker>
                           </template>
                         </q-field>
@@ -116,60 +60,25 @@
                     </div>
                   </div>
                 </div>
-                <Course
-                  :dataList="courseData"
-                  @select="selectClass"
-                  :select="defaultCourse"
-                ></Course>
-                <q-pagination
-                  class="full-width justify-end"
-                  v-model="courseMsg.pageIndex"
-                  color="primary"
-                  :max="coursePageCount"
-                  :input="true"
-                  @input="changePage"
-                />
+                <Course :dataList="courseData" @select="selectClass" :select="defaultCourse"></Course>
+                <q-pagination class="full-width justify-end" v-model="courseMsg.pageIndex" color="primary"
+                  :max="coursePageCount" :input="true" @input="changePage" />
               </template>
               <template v-if="mode == 2">
                 <yueke @select="selectCourse" :select="defaultCourse"></yueke>
               </template>
             </q-step>
             <q-step :name="3" title="确认" icon="settings" :done="step > 3">
-              <orderForm
-                ref="orderForm"
-                :mode="mode"
-                :schoolList="schoolList"
-                :save-obj="saveObj"
-                :stuData="stuData"
-                :modityOrderType="1"
-                @success="$emit('close')"
-                @cancelloading="cancelloading"
-              ></orderForm>
+              <orderForm ref="orderForm" :mode="mode" :schoolList="schoolList" :save-obj="saveObj" :stuData="stuData"
+                :modityOrderType="1" @success="$emit('close')" @cancelloading="cancelloading"></orderForm>
             </q-step>
           </q-stepper>
         </q-card-section>
         <q-card-actions align="right" class="bg-white q-mx-md ">
-          <q-btn
-            label="取消"
-            flat
-            color="grey-10"
-            style="font-weight:400 !important"
-            v-close-popup
-          />
-          <q-btn
-            @click="$refs.stepper.previous()"
-            color="primary"
-            label="上一步"
-            v-if="step > 1"
-          />
+          <q-btn label="取消" flat color="grey-10" style="font-weight:400 !important" v-close-popup />
+          <q-btn @click="$refs.stepper.previous()" color="primary" label="上一步" v-if="step > 1" />
           <q-btn @click="next" color="primary" label="下一步" v-if="step < 3" />
-          <q-btn
-            label="保存"
-            color="primary"
-            :loading="loading1"
-            @click="saveOrderForm"
-            v-if="step == 3"
-          />
+          <q-btn label="保存" color="primary" :loading="loading1" @click="saveOrderForm" v-if="step == 3" />
         </q-card-actions>
       </q-card>
     </q-dialog>
@@ -177,24 +86,24 @@
 </template>
 
 <script>
-import {
+  import {
     getClassPruductList, //获取日语培训列表
     setClassOrder, //新增 修改订单
     getOrderGuestRenewState
-} from "../../../api/sale/sale";
-import {
+  } from "../../../api/sale/sale";
+  import {
     getSchoolDropdown, //获取校区列表
     getTeacherDropDownList
-} from "../../../api/school/index";
-import {
+  } from "../../../api/school/index";
+  import {
     queryCourseDropdownList,
     getCourseSubject
-} from "../../../api/course/index";
-import Mode from "./transfer-order/tickMode";
-import Course from "./transfer-order/courselist";
-import orderForm from "./transfer-order/order-form";
-import yueke from "./transfer-order/yueke";
-export default {
+  } from "../../../api/course/index";
+  import Mode from "./transfer-order/tickMode";
+  import Course from "./transfer-order/courselist";
+  import orderForm from "./transfer-order/order-form";
+  import yueke from "./transfer-order/yueke";
+  export default {
     props: {
       select: {
         type: Array,
@@ -368,7 +277,7 @@ export default {
           this.saveObj = val[0];
           this.saveObj.Unit_Price = this.saveObj.SellPrice;
           this.defaultCourse = val;
-      }else{
+        } else {
           this.saveObj = {};
           this.saveObj.Unit_Price = 0;
           this.defaultCourse = [];
@@ -376,12 +285,11 @@ export default {
       },
       // 选择课程
       selectCourse(val) {
-         console.log("tag2", val);
         if (val.length > 0) {
           this.saveObj = val[0];
           this.saveObj.Unit_Price = this.saveObj.SellPrice;
           this.defaultCourse = val;
-      }else{
+        } else {
           this.saveObj = {};
           this.saveObj.Unit_Price = 0;
           this.defaultCourse = [];
@@ -469,15 +377,15 @@ export default {
         this.loading1 = false;
       }
     }
-};
+  };
 </script>
 <style scoped>
-/deep/.el-input__inner {
+  /deep/.el-input__inner {
     background-color: transparent;
     border: none;
-}
+  }
 
-/deep/.q-stepper__step-inner {
+  /deep/.q-stepper__step-inner {
     padding: 0 24px;
-}
+  }
 </style>
\ No newline at end of file

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 => {