页面修改

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

@@ -43,11 +43,14 @@
       @click="isShowAdd = false" />
     <template v-if="isShowAdd">
       <div class="row wrap">
-        <q-select filled stack-label option-label="Name" @input="getRole" v-model="AssitMsg.AssistType"
+        <q-select filled stack-label option-label="Name" @input="changeData" v-model="AssitMsg.AssistType"
           option-value="Id" :options="AssistDropList" label="角色" dense class="col-6 q-pb-lg q-pr-lg" emit-value
           map-options />
         <q-select filled dense v-if="AssitMsg.AssistType == 2" v-model="AssitMsg.AssistId" :options="RoleListData"
           option-label="EmployeeName" class="col-6 q-pb-lg" option-value="Id" emit-value map-options />
+        <q-select filled dense v-if="AssitMsg.AssistType == 6||AssitMsg.AssistType == 4" v-model="AssitMsg.AssistId"
+          :options="TeacherList" option-label="EmployeeName" class="col-6 q-pb-lg" option-value="Id" emit-value
+          map-options />
         <q-select filled dense v-else v-model="AssitMsg.AssistId" @filter="filterEmployee" use-input
           :options="myEmployeeList" option-label="EmployeeName" class="col-6 q-pb-lg" option-value="Id" emit-value
           map-options />
@@ -71,7 +74,7 @@
           <td>{{ item.AssistName }}</td>
           <td>
             <template v-if="userInfo.IsCourseConsultant == 1||isHaveTeacherEdit||isHaveXueManager">
-              <div v-if="userInfo.IsCourseConsultant == 1&&item.AssistType != 2 && item.AssistType != 4">
+              <div v-if="userInfo.IsCourseConsultant == 1&&(item.AssistType == 2 ||item.AssistType == 3)">
                 <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="修改"
                   @click="getEditInfo(item)"></q-btn>
                 <q-btn flat size="xs" icon="delete" color="negative" style="font-weight:400" label="删除"
@@ -89,12 +92,7 @@
                 <q-btn flat size="xs" icon="delete" color="negative" style="font-weight:400" label="删除"
                   @click="deleteAssits(item.Id)" />
               </div>
-              <div v-if="isShowBian(item)">
-                <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="修改"
-                  @click="getGuwenEditInfo(item)"></q-btn>
-              </div>
             </template>
-
           </td>
         </tr>
       </table>
@@ -147,6 +145,7 @@
         page_Count: 0,
         AssistDropList: [], //下拉数据
         RoleListData: [], //课程顾问下拉数据
+        TeacherList: [], //教师列表
         employeeList: [],
         myEmployeeList: [],
         userInfo: {}
@@ -199,7 +198,6 @@
     mounted() {
       this.getList();
       this.GetAssistTypeList();
-      this.getEmployeeList();
     },
     methods: {
       //获取协助人员
@@ -209,12 +207,11 @@
           if (res.Code == 1) {
             let template = res.Data;
             template.forEach(x => {
-              if (this.userInfo.IsCourseConsultant == 1 && this.isHaveTeacherEdit) {
+              if (this.userInfo.IsCourseConsultant == 1) {
                 if (x.Id != 1) {
                   this.AssistDropList.push(x);
                 }
-              } else if (this.userInfo.IsCourseConsultant == 1 && !this.isHaveTeacherEdit) {
-                if (x.Id != 1 && x.Id != 4) {
+                if (x.Id == 4 && this.isHaveTeacherEdit) {
                   this.AssistDropList.push(x);
                 }
               } else if (this.userInfo.IsCourseConsultant == 0) {
@@ -229,28 +226,35 @@
                   }
                 }
               }
+              1
             });
           }
         });
       },
-      //获取员工列表
-      getEmployeeList() {
-        queryEmployee({
+      changeData() {
+        var queryObj = {
           IsLeave: 1,
-          UserRole: 0
-        }).then(res => {
+          UserRole: 0,
+          AccountTypeStr: "",
+        };
+        if (this.AssitMsg.AssistType == 2) {
+          queryObj.UserRole = 2;
+          queryEmployee(queryObj).then(res => {
+            this.RoleListData = res.Data;
+          });
+        }
+        if (this.AssitMsg.AssistType == 6) {
+          queryObj.AccountTypeStr = "2"
+          queryEmployee(queryObj).then(res => {
+            this.TeacherList = res.Data;
+          });
+        } else {
+          queryObj.UserRole = 0;
+          queryEmployee(queryObj).then(res => {
             this.employeeList = res.Data;
             this.myEmployeeList = res.Data;
           });
-      },
-      //切换课程顾问
-      getRole() {
-        queryEmployee({
-          IsLeave: 1,
-          UserRole: 2
-        }).then(res => {
-          this.RoleListData = res.Data;
-        });
+        }
       },
       //筛选员工
       filterEmployee(val, update, abort) {
@@ -272,6 +276,7 @@
                 message: "数据保存成功！",
                 position: "top"
               });
+              this.$emit("success");
               this.getList();
               this.isShowAdd = false;
               this.clearMsg();
@@ -294,16 +299,6 @@
           })
           .catch(() => {});
       },
-      //课程顾问是本人 显示编辑按钮
-      isShowBian(item) {
-        let isShow = false;
-        if (item.AssistTypeName == '课程顾问') {
-          // if (this.userInfo.AccountName == item.AssistName) {
-          isShow = true
-          // }
-        }
-        return isShow;
-      },
       //删除协同
       deleteAssits(Id) {
         let that = this;

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

@@ -214,7 +214,7 @@
         stuData: {},
         userInfo: {},
         isconsult: false, //学生咨询弹窗
-        IsHaveCurseManager:false,//是否存在课程顾问
+        IsHaveCurseManager: false, //是否存在课程顾问
       };
     },
     created() {
@@ -264,7 +264,9 @@
       },
       //刷新列表
       refreshStudentPage() {
+        console.log("2222");
         this.$emit("success");
+
       },
       //客户情况信息的修改
       consultsuccess(data) {

src/pages/teacher/teacherTrack.vue

@@ -540,13 +540,12 @@
       this.getEmployeeList();
       this.getStudentDorpDown();
       this.queryGoalsList();
-      // this.downloadStudentFollow();
       this.findData();
     },
     methods: {
       findData() {
         queryEmployee({
-          AccountType: 2,
+          AccountTypeStr: "2",
           IsLeave: 1
         }).then(res => {
           if (res.Code == 1) {
@@ -569,7 +568,6 @@
       queryGoalsList() {
         getGuestLearningGoalsEnumList({}).then(res => {
           this.goalsList = res.Data;
-          // console.log(res.data)
         });
       },
       //获取收客渠道