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

src/api/sale/sale.js

@@ -435,6 +435,14 @@ export function GetStudentAssistList(data) {
   });
 }
 
+// 获取协助老师信息 2024-09-04 add by:W
+export function GetVisitorReserveTeacherList(data) {
+  return request({
+    url: '/VisitorReserve/GetVisitorReserveTeacherList',
+    method: 'post',
+    data
+  });
+}
 // 保存协助数据
 export function SetStudentAssist(data) {
   return request({

src/components/sale/orderlist.vue

@@ -341,7 +341,7 @@
                       <q-item-label>销售备注</q-item-label>
                     </q-item-section>
                   </q-item>
-                  <q-item clickable v-close-popup v-if="AuthorityObj.isShowEducationRemark">
+                  <!-- <q-item clickable v-close-popup v-if="AuthorityObj.isShowEducationRemark">
                     <q-item-section @click="editOrderRemark(item, 2)">
                       <q-item-label>教务备注</q-item-label>
                     </q-item-section>
@@ -350,7 +350,7 @@
                     <q-item-section @click="editOrderRemark(item, 3)">
                       <q-item-label>校长备注</q-item-label>
                     </q-item-section>
-                  </q-item>
+                  </q-item> -->
                   <q-item clickable v-close-popup v-if="isEditOrder && comefrom == 0">
                     <q-item-section @click="editOrder(item)">
                       <q-item-label>总经理修改</q-item-label>
@@ -1532,7 +1532,6 @@
             this.authObj.isShowStudyRebate) {
             this.AuthorityObj.isShowStudyRebate = this.authObj.isShowStudyRebate;
           }
-
         }
       },
       //回归原班

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

@@ -173,7 +173,8 @@
     GetSelectClassOrderList //获取前置下拉
   } from "../../../../api/sale/sale";
   import {
-    GetStudentAssistList
+    GetStudentAssistList,
+    GetVisitorReserveTeacherList
   } from "../../../../api/sale/sale"; //获取协助人员
   import {
     queryEmployee
@@ -307,13 +308,13 @@
         SId: -1
       });
       this.initData();
-      this.getAssistList();
+      this.getVisitorReserveTeacherList();
       this.OrderMsg.EnterId = this.stuData.EnterId;
       this.EnterName = this.stuData.EnterName;
 
       // 判断是否续费协助老师赋值
       if (this.stuData.StuList[0].IsRenewGuest != 1) {
-        this.OrderMsg.HelpEnterId = this.stuData.StuList[0].STTeacherId;
+        this.OrderMsg.HelpEnterId = 0;//this.stuData.StuList[0].STTeacherId;
         this.AssistName = this.stuData.StuList[0].STTeacherName
       }
 
@@ -466,6 +467,63 @@
           }
         })
       },
+
+    
+       //获取协助人员
+       getVisitorReserveTeacherList() {
+        this.AssistList=[];
+        this.AllAssistList=[];
+        const ids = this.stuData.StuList.map(e => e.StuId).toString();
+        GetVisitorReserveTeacherList({
+          StuId: ids
+        }).then(res => {
+          if (res.Code == 1) {
+            res.Data.map(e => {
+                this.AssistList .push({
+                  Id: e.TeacherId,
+                  EmployeeName: e.TeacherName
+                });
+                this.AllAssistList.push({
+                  Id: e.TeacherId,
+                  EmployeeName: e.TeacherName
+                });
+                
+                this.HelpEnterDisable = true;
+            });
+            if (this.stuData.StuList[0].IsRenewGuest == 1&&res.Data&&res.Data.length>0) {
+                  this.OrderMsg.HelpEnterId = res.Data[0].TeacherId;
+                }
+            this.getQueryEmployee();
+          }
+          else{
+            this.getQueryEmployee();
+          }
+        });
+      },
+
+      getQueryEmployee(){
+        if (this.AssistList.length == 0) {
+          var qMsg = {
+            IsLeave: 1,
+            UserRole: 0,
+            AccountType:2,
+          };
+          queryEmployee(qMsg).then(res => {
+            if (res.Code == 1) {
+              res.Data.map(e => {
+                this.AssistList.push({
+                  Id: e.Id,
+                  EmployeeName: e.EmployeeName
+                });
+                this.AllAssistList.push({
+                  Id: e.Id,
+                  EmployeeName: e.EmployeeName
+                });
+              });
+            }
+          });
+        }
+      },
       //获取协助人员
       getAssistList() {
         const ids = this.stuData.StuList.map(e => e.StuId).toString();

src/pages/h5page/components/audition.vue

@@ -4,6 +4,10 @@
     border: 0;
   }
 
+  .divP p {
+    margin: 0px !important;
+  }
+
 </style>
 
 <template>
@@ -12,7 +16,10 @@
     <div class="row wrap">
       <div style="width:100%;margin-bottom:15px;">试听时间：<span
           style="color:red;">{{timeFormatSeconds(setClassMsg.ReservationDate)}}</span></div>
-      <div style="width:100%;margin-bottom:15px;">试听需求：<font style="color:red;" v-html="setClassMsg.Demand"></font></div>
+      <div style="width:100%;margin-bottom:15px;"> <span style="float:left;"> 试听需求：</span>
+        <div style="color:red;" class="divP" v-html="setClassMsg.Demand">
+        </div>
+      </div>
     </div>
     <q-card class="bg-white q-pa-md" flat>
       <div class="row studentDate">
@@ -197,24 +204,8 @@
           });
           return;
         }
-        if (!this.setClassMsg.ClassRoomId) {
-          this.$q.notify({
-            type: "negative",
-            position: "top",
-            timeout: 2000,
-            message: "请选择教室！"
-          });
-          return;
-        }
-        if (!this.setClassMsg.TrialLessonId) {
-          this.$q.notify({
-            type: "negative",
-            position: "top",
-            timeout: 2000,
-            message: "请选择课程！"
-          });
-          return;
-        }
+
+
         SetVisitorReserveClass(this.setClassMsg).then(res => {
           if (res.Code == 1) {
             if (this.type) {