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

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

@@ -298,7 +298,6 @@
             </q-field>
           </div>
         </div>
-
         <div class="info_item">
           <div class="item_label">日语基础</div>
           <div class="item_value">
@@ -448,7 +447,6 @@
       };
     },
     created() {
-      console.log("HHKHK")
       this.userInfo = this.getLocalStorage();
       this.getStuStageList();
       this.getBasicList();
@@ -470,7 +468,6 @@
         if (this.saveObj.noEdit && this.saveObj.noEdit == true) {
           this.noEdit = true;
         }
-
       }
     },
     watch: {
@@ -772,20 +769,6 @@
           this.isHaveOrder = true;
         }
       },
-      //新增协助人员
-      addAssist() {
-        let obj = {
-          Id: 0, //编号
-          AssistId: 1, //员工编号
-          AssistType: 1, //类型
-          StuId: 1 //学员编号
-        };
-        this.customObj.AssistList.push(obj);
-      },
-      //删除协助人员
-      delAssist(index) {
-        this.customObj.AssistList.splice(index, 1);
-      },
       //验证手机号
       CheckExistsStu(type) {
         if (type == 1) {

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

@@ -93,8 +93,8 @@
                   </student-Assit>
                 </template>
                 <template v-if="ckedTab == 6">
-                  <classRecord :save-obj="baseObj" @success="refreshStudentPage"></classRecord>
-                </template>
+                                    <classRecord :save-obj="baseObj" @success="refreshStudentPage"></classRecord>
+                                  </template>
               </div>
             </div>
           </div>
@@ -232,7 +232,7 @@
         });
       }
       this.getEmployeeList();
-      if(this.checkType&&this.checkType>0){
+      if (this.checkType && this.checkType > 0) {
         this.ckedTab = this.checkType;
       }
     },
@@ -264,8 +264,8 @@
       refreshStudentPage() {
         this.$emit("success");
       },
+      //客户情况信息的修改
       consultsuccess(data) {
-        //质询信息的修改
         this.$emit("success");
         this.isconsult = false;
         this.baseObj.PlanPrice = data.PlanPrice;
@@ -321,6 +321,7 @@
           this.customStateList = res.Data;
         });
       },
+      //查询学员(客户)详情
       queryStuInfo() {
         getStudentInfo({
           StuId: this.saveObj.StuId
@@ -333,6 +334,7 @@
           }
         });
       },
+      //批量推送课程顾问
       assistBatchHandler() {
         if (this.pushing || this.baseObj.IsHaveCurseManager) return;
         this.pushing = true;
@@ -345,6 +347,7 @@
           this.pushing = false;
         });
       },
+      //显示客户情况弹窗
       consultbtn() {
         this.isconsult = true;
       }

src/components/school/student/stulist.vue

@@ -252,10 +252,12 @@
   } from "../../../api/common/common";
   export default {
     props: {
+      //数据列表
       dataList: {
         type: Array,
         default: null
       },
+      //是否显示转交按钮
       isJudgeTrans: {
         type: Number,
         default: null

src/components/work/todayData.vue

@@ -646,6 +646,7 @@
               </div>
             </div>
           </div>
+          <!----
           <div class="Data_List2">
             <div class="Data_Inner">
               <div class="Data_Title">当月效能目标</div>
@@ -671,6 +672,7 @@
               </div>
             </div>
           </div>
+          -->
         </div>
       </div>
     </div>