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

src/components/school/student/stulist.vue

@@ -29,7 +29,7 @@
 </style>
 <template>
   <div class="stuList">
-    <q-table :pagination="pageMsg" :loading="loading" no-data-label="暂无相关数据" flat selection="multiple"
+    <q-table :pagination="pageMsg" :loading="loading" no-data-label="暂无相关数据" flat selection="single"
       :selected.sync="selection" class="sticky-right-column-table sticky-tow-column-table" separator="none"
       :data="dataList" :columns="columns" row-key="StuId" hide-bottom>
       <template v-slot:top>

src/components/school/student/transfer-order/courselist.vue

 <template>
-  <div class="orderCourse">
-    <q-table
-      :pagination="msg"
-      selection="single"
-      :selected.sync="selection"
-      no-data-label="暂无相关数据"
-      flat
-      class="sticky-tow-column-table "
-      separator="none"
-      :data="dataList"
-      :columns="columns"
-      row-key="ClassId"
-      title="日语培训产品列表"
-      @update:selected ="emitSel"
-    >
-      <!-- <template v-slot:body-cell-ClassName="props">
-          <q-td :props="props">
-            {{ props.row.ClassName }} 
-          </q-td>
-        </template> -->
-      <template v-slot:bottom> </template>
-    </q-table>
-  </div>
+  <q-table :pagination="msg" selection="single" :selected.sync="selection" no-data-label="暂无相关数据" flat
+    class="sticky-tow-column-table sticky-two-header-table" separator="none" :data="dataList" :columns="columns"
+    row-key="ClassId" @update:selected="emitSel" table-class="table" hide-bottom>
+  </q-table>
 </template>
 
 <script>
-export default {
-  props: {
-    dataList: {
-      type: Array,
-      default: () => []
-    },
-    select:{
-      type: Array,
-      default: () => []
-    }
-  },
-  data() {
-    return {
-      selection: [],
-      msg: {
-        pageIndex: 1,
-        rowsPerPage: 0
+  export default {
+    props: {
+      dataList: {
+        type: Array,
+        default: () => []
       },
-      columns: [
-        {
-          name: "ClassName",
-          label: "班级",
-          align: "left",
-          field: "ClassName"
-        },
-        {
-          name: "CourseName",
-          label: "课程",
-          field: "CourseName",
-          align: "left"
-        },
-        {
-          name: "TeacherName",
-          label: "老师",
-          field: "TeacherName",
-          align: "left"
+      select: {
+        type: Array,
+        default: () => []
+      }
+    },
+    data() {
+      return {
+        selection: [],
+        msg: {
+          pageIndex: 1,
+          rowsPerPage: 0
         },
-        {
-          name: "OpenTime",
-          label: "上课时间",
-          field: "OpenTime",
-          align: "left"
-        }
-      ]
-    };
-  },
-  mounted() {
-    this.selection=this.select
-  },
-  methods: {
-      emitSel(val){
-           this.$emit("select",val)
+        columns: [{
+            name: "ClassName",
+            label: "班级",
+            align: "left",
+            field: "ClassName"
+          },
+          {
+            name: "CourseName",
+            label: "课程",
+            field: "CourseName",
+            align: "left"
+          },
+          {
+            name: "TeacherName",
+            label: "老师",
+            field: "TeacherName",
+            align: "left"
+          },
+          {
+            name: "OpenTime",
+            label: "上课时间",
+            field: "OpenTime",
+            align: "left"
+          }
+        ]
+      };
+    },
+    mounted() {
+      this.selection = this.select
+    },
+    methods: {
+      emitSel(val) {
+        this.$emit("select", val)
       },
-  }
-};
+    }
+  };
+
 </script>
-<style >
-.orderCourse .q-table__bottom {
-  min-height: 0;
-}
+<style>
+  .table {
+    max-height: 400px;
+  }
+
+  .table::-webkit-scrollbar {
+    width: 5px;
+    height: 5px;
+  }
+
+  .table::-webkit-scrollbar-track {
+    background: #fff;
+    border-radius: 2px;
+  }
+
+  .table::-webkit-scrollbar-thumb {
+    background: #444;
+    border-radius: 10px;
+  }
+
+  .table::-webkit-scrollbar-thumb:hover {
+    background: #999;
+  }
+
+  .table::-webkit-scrollbar-corner {
+    background: #204754;
+  }
+
 </style>

src/components/school/student/transfer-order/order-form.vue

@@ -210,7 +210,7 @@
           label="客人来源"
         />
         <q-select
-          :disable="modityOrderType == 2 || OrderMsg.JoinType == 3"
+          :disable="(modityOrderType == 2 || OrderMsg.JoinType == 3)||HelpEnterDisable"
           v-model="OrderMsg.HelpEnterId"
           :options="EmployeeList"
           filled
@@ -233,7 +233,7 @@
           </template>
         </q-select>
         <q-select
-          :disable="modityOrderType == 2 || OrderMsg.JoinType == 3"
+          :disable="(modityOrderType == 2 || OrderMsg.JoinType == 3)||CourseConsultantDisable"
           v-model="OrderMsg.CourseConsultantId"
           :options="EmployeeList"
           filled
@@ -293,6 +293,15 @@
           label="少价金额(每人)"
           :hint="'总少价金额：' + OrderMsg.PerLessMoney * OrderMsg.GuestNum"
         />
+        <q-input
+          disable
+          v-if="OrderMsg.EnterId >0"
+          filled
+          stack-label
+          v-model="EnterName"
+          class="col-6 q-py-sm"
+          label="市场人员"
+        />
         <q-input
           filled
           stack-label
@@ -322,9 +331,10 @@ import {
   queryChaClassInfo,
   GetSelectClassOrderList, //获取前置下拉
 } from "../../../../api/sale/sale";
+import {
+    GetStudentAssistList,
+  } from '../../../../api/sale/sale'//获取协助人员
 import { queryEmployee } from "../../../../api/users/user"; //获取员工
-import { mapState } from "vuex";
-
 export default {
   props: {
     saveObj: {
@@ -384,9 +394,11 @@ export default {
         CustomerId: 0, //同行
         OrderIdentify: 2, //标识参数，  1产品下单   2客户转订单
         StuIds: "",
+        EnterId:0,//市场人员
         //  NormalCommission:'',//正常返佣金额
         //  RenewCommission:"",// 预计返佣金额
       },
+      EnterName:'',//市场人员
       Unit_PriceRemark: "", //单价规则
       IsShowUpPrice: false, //是否显示高于定价
       UnitPrice: 0,
@@ -396,6 +408,8 @@ export default {
       CourseList: [], //课程列表
       courseObj: {}, //选择的课程
       beforeOrderList: [], //前置订单数据
+      HelpEnterDisable:false,//是否可选择协助教师
+      CourseConsultantDisable:false,//是否可选择课程顾问
     };
   },
   created() {
@@ -409,9 +423,30 @@ export default {
   },
   mounted() {
     this.initData();
+    this.getAssistList();
+    this.OrderMsg.EnterId=this.stuData.EnterId
+    this.EnterName=this.stuData.EnterName
   },
-  watch: {},
   methods: {
+    //获取协助人员
+      getAssistList() {
+       const ids = this.stuData.StuList.map(e => e.StuId).toString();
+        GetStudentAssistList({StuId: ids}).then(res => {
+          if (res.Code == 1) {
+            console.log(422,res.Data)
+            res.Data.map(e=>{
+              if(e.AssistType==4){
+                this.OrderMsg.HelpEnterId=e.AssistId
+                this.HelpEnterDisable=true
+              }
+              if(e.AssistType==2){
+                this.OrderMsg.CourseConsultantId=e.AssistId
+                this.CourseConsultantDisable=true
+              }
+            })
+          }
+        })
+      },
     //获取班级课程信息
     initConfig() {
       var qMsg = {
@@ -438,7 +473,6 @@ export default {
     },
     //计算课程单价和应收金额
     calcPrice() {
-      console.log("this.OrderMsg",this.OrderMsg)
       var guestNum = 0;
       if (this.OrderMsg.GuestNum && this.OrderMsg.GuestNum > 0) {
         guestNum = Number(this.OrderMsg.GuestNum);
@@ -675,7 +709,7 @@ export default {
     //修改订单
     saveOrderInfo() {
       //插班验证课程和生效时间
-      console.log(783,this.OrderMsg)
+      console.log("OrderMsg",this.OrderMsg)
       if (this.OrderMsg.IsChaBan == 1) {
         this.$refs.CourseId.validate();
         this.$refs.EffectTime.validate();