样式调整

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

@@ -18,8 +18,7 @@
   <div class="stuGenJin">
     <div class="row wrap">
       <q-btn label="新增" color="accent q-mb-lg" size="sm"
-        v-if="!saveObj.IsHaveCurseManager || userInfo.IsCourseConsultant == 1" @click="isShowAdd = true" />
-      <span v-else class="text-grey-4">学员已推送课程顾问，只能进行查看</span>
+        @click="isShowAdd = true" />
       <q-btn label="取消" style="margin-left:20px;" v-if="isShowAdd" flat color="grey-10 q-mb-lg" size="sm"
         @click="isShowAdd = false" />
     </div>
@@ -28,7 +27,8 @@
         <q-select filled v-model="flowMsg.PurposeType" dense :options="PurposeTypeList" option-label="ConfigName"
           option-value="Id" emit-value map-options label="意向度" class="col-6 q-pb-lg q-pr-lg" />
         <q-select filled v-model="flowMsg.ConsultCourseIdList" dense :options="CourseList" option-label="CourseName"
-          option-value="CourseId" emit-value map-options label="咨询课程" class="col-6 q-pb-lg" multiple />
+          option-value="CourseId" emit-value map-options label="咨询课程" class="col-6 q-pb-lg" multiple use-input
+          @filter="filterCourse" />
         <q-input filled stack-label maxlength="50" dense v-model="flowMsg.ConsultKeyWords" class="col-6 q-pb-lg q-pr-lg"
           label="关键词" />
         <q-field filled class="col-6 q-pb-lg" dense>
@@ -159,6 +159,7 @@
         userInfo: {},
         PurposeTypeList: [], //意向度下拉列表
         CourseList: [], //课程下拉列表
+        AllCourseList: [], //所有课程列表
       };
     },
     created() {
@@ -181,13 +182,26 @@
       this.getCourseList();
     },
     methods: {
+      //筛选课程
+      filterCourse(val, update) {
+        update(() => {
+          if (val === '') {
+            this.CourseList = JSON.parse(JSON.stringify(this.AllCourseList))
+          } else {
+            const needle = val.toLowerCase()
+            this.CourseList = this.AllCourseList.filter(v => v.CourseName.toLowerCase().indexOf(needle) > -1)
+          }
+        })
+      },
       //获取课程列表
       getCourseList() {
         queryCourseDropdownList({
-          IsQPrice: 0
+          IsQPrice: 0,
+          SaleState: 1,
         }).then(res => {
           if (res.Code == 1) {
             this.CourseList = res.Data;
+            this.AllCourseList=res.Data;
           }
         })
       },

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

 <style></style>
 <template>
   <div>
-    <studyabroad :saveObj="saveObj" @close="closeReserveForm" @success="closeReserveForm"
-      v-if="!saveObj.IsHaveCurseManager || userInfo.IsCourseConsultant == 1"></studyabroad>
+    <studyabroad :saveObj="saveObj" @close="closeReserveForm" @success="closeReserveForm"></studyabroad>
     <div style="display:flex;flex:1;flex-direction: column;overflow:hidden;">
       <div class="TimeLineDiv">
         <q-timeline color="primary">
@@ -10,11 +9,8 @@
             <template v-slot:title>
               <div class="visit_Cont">
                 <div class="Log_Content">
-                
-                  <div >
-                    留学需求：{{ tItem.Remark }} 
+                  <div v-html="tItem.Remark">
                   </div>
-                  
                 </div>
                 <div @click="DeleteVisitorReserve(tItem.Id)" style="margin-top:10px;"
                   class="visit_delete text-negative">
@@ -40,17 +36,10 @@
 </template>
 <script>
   import {
-    SetVisitorReserve,
     queryVisitorReservePage,
     RemoveVisitorReserve
   } from "../../../api/scheduling/schedu";
-
-  import {
-    getTeacherDropDownList,
-    queryClassRoomList,
-    GetTrialLessonList
-  } from "../../../api/school/index";
-   import studyabroad from "./studyabroad";
+  import studyabroad from "./studyabroad";
   export default {
     meta: {
       title: ""
@@ -71,7 +60,7 @@
           pageIndex: 1,
           pageSize: 12,
           Visitor_Id: 0,
-          IsReserve:2,
+          IsReserve: 2,
         },
         dataList: [],
         page_Count: 0,
@@ -89,32 +78,32 @@
     },
     methods: {
       //获得年月日时分秒
-//传入日期//例：2020-10-27T14:36:23
-  timeFormatSeconds(time,type) {
-    let timeStr="";
-    var d = time ? new Date(time) : new Date();
-    var year = d.getFullYear();
-    var month = d.getMonth() + 1;
-    var day = d.getDate();
-    if (month < 10) month = '0' + month;
-    if (day < 10) day = '0' + day;
-    if(type==2){
-      var hours = d.getHours();
-      var min = d.getMinutes();
-      var seconds = d.getSeconds();
-      if (hours < 0) hours = '0' + hours;
-      if (min < 10) min = '0' + min;
-      if (seconds < 10) seconds = '0' + seconds;
-      timeStr+= ' ' + hours + ':' + min + ':' + seconds;
-    }
-   
-    timeStr=year + '-' + month + '-' + day +timeStr;
-return timeStr;
-   
-  
+      //传入日期//例：2020-10-27T14:36:23
+      timeFormatSeconds(time, type) {
+        let timeStr = "";
+        var d = time ? new Date(time) : new Date();
+        var year = d.getFullYear();
+        var month = d.getMonth() + 1;
+        var day = d.getDate();
+        if (month < 10) month = '0' + month;
+        if (day < 10) day = '0' + day;
+        if (type == 2) {
+          var hours = d.getHours();
+          var min = d.getMinutes();
+          var seconds = d.getSeconds();
+          if (hours < 0) hours = '0' + hours;
+          if (min < 10) min = '0' + min;
+          if (seconds < 10) seconds = '0' + seconds;
+          timeStr += ' ' + hours + ':' + min + ':' + seconds;
+        }
+
+        timeStr = year + '-' + month + '-' + day + timeStr;
+        return timeStr;
 
-   // return (year + '-' + month + '-' + day + ' ' + hours + ':' + min + ':' + seconds);
-},
+
+
+        // return (year + '-' + month + '-' + day + ' ' + hours + ':' + min + ':' + seconds);
+      },
       //获取试听列表
       getList() {
         queryVisitorReservePage(this.qMsg).then(res => {

src/components/school/student/studyabroad.vue

@@ -12,42 +12,24 @@
       <q-btn label="新增留学需求" color="accent q-mb-lg" size="sm" @click="isShowReserve = true" />
     </div>
     <template v-if="isShowReserve">
-      
-    
-      <div class="row studentDate" >
-        <q-input
-        style="width:257px;"
-          v-model="addMsg.Remark"
-          placeholder="留学需求"
-          filled
-          type="textarea"
-        />
-  </div>
-     
+      <div class="row studentDate">
+        <UeEditor v-model="addMsg.Remark" class="q-pb-sm" :config="config"></UeEditor>
+      </div>
       <div class="row wrap justify-end q-pr-lg" style="margin-bottom:10px;">
         <q-btn label="关闭" flat color="accent q-mb-lg" size="md" style="margin-right:10px;" @click="closeClassForm" />
         <q-btn label="保存" color="accent q-mb-lg" size="md" @click="saveAppointForm()" />
       </div>
     </template>
-   
-
   </div>
 </template>
 <script>
+  import UeEditor from "../../editor/UeEditor";
   import {
     SetStudyAbroad
   } from "../../../api/scheduling/schedu";
-  import {
-    getTeacherDropDownList,
-    queryClassRoomList,
-    GetTrialLessonList
-  } from "../../../api/school/index";
-  // import auditionForm from "../../schedul/audition-form";
-  
   export default {
     components: {
-      // auditionForm,
-      
+      UeEditor
     },
     props: {
       saveObj: {
@@ -57,6 +39,10 @@
     },
     data() {
       return {
+        config: {
+          initialFrameWidth: null,
+          initialFrameHeight: 90
+        },
         isShowReserve: false,
         addMsg: {
           Id: 0, //编号
@@ -71,17 +57,17 @@
           TrialLessonId: "",
           ReserveType: 0,
           ClassPlanId: 0,
-          Demand:"",
+          Demand: "",
         },
         isShowTeacher: false, //是否显示试听课弹窗
-        showObj:{
-          className:"",
-          courseName:"",
+        showObj: {
+          className: "",
+          courseName: "",
         }
       };
     },
     created() {
-      
+
     },
     mounted() {
       if (this.saveObj) {
@@ -95,7 +81,6 @@
         this.isShowReserve = false;
         this.$emit("success");
       },
-      
       //清除
       clearMsg() {
         this.addMsg.Id = 0;
@@ -109,7 +94,7 @@
         this.addMsg.TrialLessonId = "";
         this.addMsg.ReserveType = 0;
         this.addMsg.ClassPlanId = 0;
-        this.addMsg.Demand="";
+        this.addMsg.Demand = "";
       },
       //保存
       saveAppointForm() {
@@ -123,26 +108,26 @@
           return;
         }
         SetStudyAbroad(this.addMsg).then(res => {
-            if (res.Code == 1) {
-              this.$q.notify({
-                icon: "iconfont icon-chenggong",
-                color: "accent",
-                timeout: 2000,
-                message: res.Message,
-                position: "top"
-              });
-              this.$emit("success");
-            } else {
-              this.$q.notify({
-                type: "negative",
-                position: "top",
-                timeout: 2000,
-                message: res.Message
-              });
-            }
-            this.clearMsg();
-            this.isShowReserve = false;
-          });
+          if (res.Code == 1) {
+            this.$q.notify({
+              icon: "iconfont icon-chenggong",
+              color: "accent",
+              timeout: 2000,
+              message: res.Message,
+              position: "top"
+            });
+            this.$emit("success");
+          } else {
+            this.$q.notify({
+              type: "negative",
+              position: "top",
+              timeout: 2000,
+              message: res.Message
+            });
+          }
+          this.clearMsg();
+          this.isShowReserve = false;
+        });
       },
       closeAuditForm() {
         this.isShowTeacher = false;
@@ -160,7 +145,6 @@
           this.addMsg.EndTime = obj.EndTime;
           this.addMsg.ClassContent = obj.ClassContent;
           this.addMsg.TrialLessonId = obj.TrialLessonId;
-         
           this.isShowReserve = true;
         }
       }

src/components/school/student/stulist.vue

@@ -367,11 +367,6 @@
             align: "left",
             field: row => row.StuName
           },
-          {
-            name: "CurseManager",
-            label: "课程顾问",
-            align: "left"
-          },
           {
             name: "TeacherManager",
             label: "协助老师",