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

src/components/flow/process-form.vue

@@ -184,7 +184,14 @@
               </q-select>
               <q-select class="col-6 q-pb" v-if="aItem.AuditType==4" clearable filled stack-label use-input
                 option-value="PostId" option-label="PostName" v-model="aItem.PostType" :options="PostList" label="选择角色"
-                :dense="false" emit-value map-options @input="changeType(aItem)">
+                :dense="false" emit-value map-options @filter="filterPost" @input="changeType(aItem)">
+                <template v-slot:no-option>
+                  <q-item>
+                    <q-item-section class="text-grey">
+                      未找到相关数据
+                    </q-item-section>
+                  </q-item>
+                </template>
               </q-select>
             </div>
             <q-toggle
@@ -264,6 +271,7 @@
         AllemployeeList: [], //所有员工列表
         EmployeeList: [], //员工列表
         PostList: [], //系统角色列表
+        AllPostList: [],
         //固定角色列表
         roleList: [{
             Name: '班级老师',
@@ -313,7 +321,11 @@
       queryPostList() {
         getPostList({}).then(res => {
           if (res.Code == 1) {
-            this.PostList = res.Data;
+            var jsonData = res.Data;
+            if (jsonData && jsonData.length > 0) {
+              this.AllPostList = JSON.parse(JSON.stringify(jsonData));
+              this.PostList = JSON.parse(JSON.stringify(jsonData));;
+            }
           }
         });
       },
@@ -405,6 +417,17 @@
           }
         })
       },
+      //筛选角色
+      filterPost(val, update){
+        update(() => {
+          if (val === '') {
+            this.PostList = JSON.parse(JSON.stringify(this.AllPostList))
+          } else {
+            const needle = val.toLowerCase();
+            this.PostList = this.AllPostList.filter(v => v.PostName.toLowerCase().indexOf(needle) > -1);
+          }
+        })
+      },
       //保存退课流程
       setBackClassFlow() {
         for (let i = 0; i < this.saveObj.FlowNodeList[this.NodeIndex].FlowAduitList.length; i++) {

src/components/sale/offertransorder-form.vue

@@ -276,6 +276,7 @@
           let val = item.ClassList.find(x => x.ClassId == item.ClassId);
           if (val) {
             item.ClassName = val.ClassName;
+            item.Teacher_Id = val.Teacher_Id;
           }
         } else {
           item.ClassName = ""
@@ -337,6 +338,16 @@
           OfferType: this.obj.OfferType,
           OfferDetails: this.model.OfferDetails
         };
+        for(var i=0;i<sMsg.OfferDetails.length;i++){
+          if(sMsg.OfferDetails[i].Teacher_Id==0){
+            this.$q.notify({
+              type: 'negative',
+              position: "top",
+              message: `请联系班级管理员，关联【${sMsg.OfferDetails[i].ClassName}】班级老师后转单`
+            })
+            return
+          }
+        }
         saveOfferToOrder(sMsg).then(res => {
           if (res.Code == 1) {
             this.$q.notify({

src/components/schedul/exorder-form.vue

@@ -135,6 +135,8 @@
         AllemployeeList: [], //所有员工列表
         CourseList: [], //课程列表
         courseObj: {}, //选择的课程
+        Teacher_Id:0,
+        ClassName:''
       }
     },
     created() {
@@ -159,6 +161,12 @@
       getClassList(ClassId) {
         this.OrderMsg.CourseId = '';
         this.CourseList = [];
+
+        let val = this.classList.find(x => x.ClassId == ClassId);
+        if (val) {
+          this.Teacher_Id = val.Teacher_Id;
+          this.ClassName = val.ClassName;
+        }
         var qMsg = {
           ClassId: ClassId
         };
@@ -302,6 +310,14 @@
       saveOrderInfo() {
         this.OrderMsg.PreferPrice = (this.OrderMsg.GuestNum * this.OrderMsg.Unit_Price) - this.OrderMsg.LessPrice;
         this.OrderMsg.VisitorReserveId = this.saveObj.Id;
+        if(this.Teacher_Id==0){
+          this.$q.notify({
+            type: 'negative',
+            position: "top",
+            message: `请联系班级管理员，关联【${this.ClassName}】班级老师后转单`
+          })
+          return
+        }
         setClassOrder(this.OrderMsg).then(res => {
           if (res.Code == 1) {
             this.$q.notify({

src/pages/sale/reserveClass.vue

@@ -44,6 +44,16 @@
           <q-btn color="accent" size="sm" class="q-mr-md" icon="add" label="添加试听" @click="editVisitor(null)" />
         </div>
       </template>
+      <template v-slot:body-cell-TeacherName="props">
+        <q-td>
+          <template v-if="props.row.TeacherId==0">
+            <span style="color:red">未指定</span>
+          </template>
+          <template>
+            {{props.row.TeacherName}}
+          </template>
+        </q-td>  
+      </template>
       <template v-slot:body-cell-ClassContent="props">
         <q-td :props="props">
           <div style="min-width: 150px;word-break: break-word;white-space: normal;">
@@ -226,7 +236,9 @@
       },
       //获取教师下拉
       GetTeacherList() {
-        getTeacherDropDownList({}).then(res => {
+        getTeacherDropDownList({
+          IsQLeave:0
+        }).then(res => {
           if (res.Code == 1) {
             this.TeacherList = res.Data;
           }

src/pages/teacher/changeClassManager.vue

@@ -61,7 +61,7 @@
           <q-td :props="props">
             <div class="bill_Rearsons">
               <template v-if="props.row.ReceiptType==1||props.row.ReceiptType==5">
-                <span>
+                <span v-if="props.row.DataObj&&props.row.DataObj.Remarks">
                   {{props.row.DataObj.Remarks}}
                   <q-tooltip :offset="[0, 10]">
                     {{props.row.DataObj.Remarks}}
@@ -302,7 +302,6 @@
         }
         this.showType = type;
         this.billObj = item;
-        console.log(item,'item');
       },
       //重新查询
       resetSearch() {