1

src/api/course/index.js

@@ -621,6 +621,7 @@ export function SetImportCourse(data) {
     data
   })
 }
+
 /**
  * 保存选择 以导入
  * @param {JSON对象} data 
@@ -631,4 +632,16 @@ export function SetImportCourse(data) {
     method: 'post',
     data
   })
+}
+
+/**
+ * 获取返佣设置下拉
+ * @param {JSON对象} data 
+ */
+export function GetCourseRebateSetList(data) {
+  return request({
+    url: '/Course/GetCourseRebateSetList',
+    method: 'post',
+    data
+  })
 }
\ No newline at end of file

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

@@ -38,10 +38,13 @@
       @click="isShowAdd=false" />
     <template v-if="isShowAdd">
       <div class="row wrap">
-        <q-select filled stack-label option-label="Name" v-model="AssitMsg.AssistType" option-value="Id"
+        <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 />
-        <q-select filled dense v-model="AssitMsg.AssistId" @filter="filterEmployee" use-input :options="myEmployeeList"
+        <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 />
+
         <i class="iconfont icon-close delAssist"></i>
       </div>
       <div class="row wrap" style="margin-bottom:10px;float:right;">
@@ -100,8 +103,8 @@
         AssitMsg: {
           StuId: 1, //学员编号
           Id: 0, //编号
-          AssistId: 1, //员工编号
-          AssistType: 1 //类型
+          AssistId: '', //员工编号
+          AssistType: '' //类型
         },
         msg: {
           StuId: 1
@@ -110,6 +113,7 @@
         dataList: [],
         page_Count: 0,
         AssistDropList: [], //下拉数据
+        RoleListData:[], //课程顾问下拉数据
         employeeList: [],
         myEmployeeList: [],
       }
@@ -128,21 +132,38 @@
     methods: {
       //获取协助人员
       GetAssistTypeList() {
+        this.AssistDropList = [];
         GetAssistTypeList({}).then(res => {
           if (res.Code == 1) {
-            this.AssistDropList = res.Data;
+            let template = res.Data;
+            template.forEach(x=>{
+              if(x.Id!=1){
+                this.AssistDropList.push(x);
+              }
+            })
           }
         })
       },
       //获取员工列表
       getEmployeeList() {
         queryEmployee({
-          IsLeave: 1
+          IsLeave: 1,
+          UserRole: 0
         }).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) {
         update(() => {

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

@@ -15,7 +15,7 @@
             <!-- <div class="wechat_Name">张飞微信</div> -->
           </div>
         </div>
-        <div class="custom_HRight">
+        <div class="custom_HRight" v-if="getJudgeTrans()">
           <q-btn color="primary" size="sm" label="转交" @click="isShowTrans=true">
             <q-popup-proxy :offset="[10, 10]">
               <q-banner v-if="isShowTrans">
@@ -120,6 +120,10 @@
       saveObj: {
         type: Object,
         default: null
+      },
+      isJudgeTrans:{
+        type: Number,
+        default: null
       }
     },
     data() {
@@ -158,8 +162,23 @@
     mounted() {
       this.baseObj = this.saveObj;
       this.getEmployeeList();
+      console.log(this.baseObj,'baseObj');
     },
     methods: {
+      //判断是否显示转交
+      getJudgeTrans(){
+        let userInfo = this.getLocalStorage();
+        let Id = userInfo.Id;
+        if(this.isJudgeTrans==1){
+          if(this.baseObj.CreateBy==Id){
+            return true
+          }else{
+            return false
+          }
+        }else{
+          return true
+        }
+      },
       closeCutomer() {
         this.$emit('close')
       },

src/components/school/student/stulist.vue

@@ -100,7 +100,7 @@
     </q-table>
     <student-form v-if="isShowStuForm" :save-obj="stuOption" @close="closeStuForm" @success="refreshStuList">
     </student-form>
-    <studentRight-form v-if="isShowStuRight" :save-obj="stuOption" @close="closeStuForm" @success="refreshStuList">
+    <studentRight-form v-if="isShowStuRight" :isJudgeTrans="isJudgeTrans" :save-obj="stuOption" @close="closeStuForm" @success="refreshStuList">
     </studentRight-form>
     <studentAdd-form v-if="isShowAdd" :save-obj="stuOption" @close="closeStuForm" @success="refreshStuList">
     </studentAdd-form>
@@ -118,6 +118,10 @@
       dataList: {
         type: Array,
         default: null
+      },
+      isJudgeTrans:{
+        type: Number,
+        default: null
       }
     },
     components: {
@@ -260,8 +264,7 @@
         stuOption: null,
         isShowAdd: false,
         selection: [],
-        isShowTransfer: false,
-
+        isShowTransfer: false
       };
     },
     watch:{

src/pages/sale/mystu.vue

@@ -50,7 +50,7 @@
       </div>
     </div>
     <div class="page-content">
-      <stulist :dataList="data" @success="refreshPage" ref="stuList"> </stulist>
+      <stulist :dataList="data" @success="refreshPage" ref="stuList" :isJudgeTrans="isJudgeTrans"> </stulist>
       <div class="row" style="justify-content: flex-end;padding: 5px 20px">
         <q-pagination v-model="msg.pageIndex" :max="pageCount" @input="changePage" class="full-width justify-end"
           color="primary" :input="true">
@@ -130,6 +130,7 @@
             Name: "我协同的"
           },
         ],
+        isJudgeTrans:1 //用于判断转交是否有条件
       };
     },
     created() {