页面修改

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

@@ -32,28 +32,17 @@
 </style>
 <template>
   <div>
-    <template v-if="userInfo.IsCourseConsultant == 1">
-      <q-btn label="新增" color="accent q-mb-lg" size="sm" v-if="userInfo.IsCourseConsultant == 1"
-        @click="isShowAdd = true" />
-      <span class="text-grey-4" v-else>抱歉，你没有权限邀请其他服务人员</span>
+    <!--课程顾问 或有教师权限-->
+    <template v-if="userInfo.IsCourseConsultant == 1||isHaveTeacherEdit">
+      <q-btn label="新增" color="accent q-mb-lg" size="sm" @click="isShowAdd = true" />
+    </template>
+    <template v-else>
+      <span class="text-grey-4">抱歉，你没有权限邀请其他服务人员</span>
     </template>
-    <q-btn label="新增" color="accent q-mb-lg" size="sm" v-if="isHaveTeacherEdit"
-      @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" />
     <template v-if="isShowAdd">
-      <div class="row wrap" v-if="isHaveTeacherEdit">
-        <q-select filled stack-label option-label="Name" @input="getRole" v-model="AssitMsg.AssistType"
-          option-value="Id" :options="AssistTeacherDropList" 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-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 />
-      </div>
-      <div class="row wrap" v-else>
+      <div class="row wrap">
         <q-select filled stack-label option-label="Name" @input="getRole" v-model="AssitMsg.AssistType"
           option-value="Id" :options="AssistDropList" label="角色" dense class="col-6 q-pb-lg q-pr-lg" emit-value
           map-options />
@@ -62,43 +51,44 @@
         <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 />
-
         <i class="iconfont icon-close delAssist"></i>
       </div>
       <div class="row wrap" style="margin-bottom:10px;float:right;">
         <q-btn label="保存" color="accent q-mb-lg" size="md" @click="saveAssit()" />
       </div>
     </template>
+
     <div v-if="dataList.length > 0">
       <table class="studentAssitTable" style="border:1px solid #f2f2f2;border-collapse:collapse;" cellspacing="0"
         cellpadding="0">
         <tr>
           <th style="width:180px;">角色</th>
           <th style="width:180px;">人员</th>
-          <th v-if="userInfo.IsCourseConsultant == 1||isHaveTeacherEdit">操作</th>
+          <th>操作</th>
         </tr>
         <tr v-for="(item, index) in dataList" :key="index">
           <td>{{ item.AssistTypeName }}</td>
           <td>{{ item.AssistName }}</td>
-          <td v-if="isHaveTeacherEdit">
-            <div>
-              <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="删除"
-                @click="deleteAssits(item.Id)" />
-            </div>
-          </td>
-          <td v-if="userInfo.IsCourseConsultant == 1">
-            <div v-if="item.AssistType != 2 && item.AssistType != 4">
-              <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="删除"
-                @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>
+          <td>
+            <template v-if="userInfo.IsCourseConsultant == 1||isHaveTeacherEdit">
+              <div v-if="userInfo.IsCourseConsultant == 1&&item.AssistType != 2 && item.AssistType != 4">
+                <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="删除"
+                  @click="deleteAssits(item.Id)" />
+              </div>
+              <div v-if="isHaveTeacherEdit &&item.AssistType ==4">
+                <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="删除"
+                  @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>
@@ -115,7 +105,9 @@
   import {
     queryEmployee
   } from "../../../api/users/user";
-  import { mapState } from "vuex";
+  import {
+    mapState
+  } from "vuex";
 
   export default {
     meta: {
@@ -148,7 +140,6 @@
         dataList: [],
         page_Count: 0,
         AssistDropList: [], //下拉数据
-        AssistTeacherDropList:[],
         RoleListData: [], //课程顾问下拉数据
         employeeList: [],
         myEmployeeList: [],
@@ -194,11 +185,18 @@
           if (res.Code == 1) {
             let template = res.Data;
             template.forEach(x => {
-              if (x.Id != 1) {
-                this.AssistDropList.push(x);
-              }
-              if (x.Id ==4 ){
-                this.AssistTeacherDropList.push(x);
+              if (this.userInfo.IsCourseConsultant == 1 && this.isHaveTeacherEdit) {
+                if (x.Id != 1) {
+                  this.AssistDropList.push(x);
+                }
+              } else if (this.userInfo.IsCourseConsultant == 1 && !this.isHaveTeacherEdit) {
+                if (x.Id != 1 && x.Id != 4) {
+                  this.AssistDropList.push(x);
+                }
+              } else if (this.userInfo.IsCourseConsultant == 0 && this.isHaveTeacherEdit) {
+                if (x.Id == 4) {
+                  this.AssistDropList.push(x);
+                }
               }
             });
           }