1

src/App.vue

@@ -12,7 +12,7 @@ export default {
 
 <style>
 @import url('~assets/css/font.css');
-@import url('//at.alicdn.com/t/font_2077629_tknu7rklxe.css');
+@import url('//at.alicdn.com/t/font_2077629_gab1nkk31vv.css');
 .q-scrollarea__thumb{
     z-index: 999999!important;
 }

src/components/sale/stopbill-form.vue

@@ -237,7 +237,7 @@
             <div class="replayReason">
               <div class="replay_Title">停课原因</div>
               <div style="color:#666666;margin-top:5px;">
-                {{setingObj.DataObj.Remarks}}
+                {{setingObj.DataObj.Remarks||'无'}}
               </div>
             </div> 
             <!-- <template v-if="setingObj.SpecialNode==1">

src/components/sale/temporaryClassbill-form.vue

@@ -195,9 +195,9 @@
                 class="sticky-column-table" separator="none" :data="setingObj.DataObj.ClassPlanTimeList"
                 :columns="columns" row-key="name">
                 <template v-slot:body-cell-time="props">
-                  <td class="flex items-center full-height" style="height:100%">
+                  <q-td >
                      {{props.row.StartTime}}-{{props.row.EndTime}}
-                  </td>
+                  </q-td>
                 </template>
                 <template v-slot:bottom>
                 </template>
@@ -221,7 +221,7 @@
           <div class="replayReason">
             <div class="replay_Title">申请原因</div>
             <div style="color:#666666;margin-top:5px;">
-              {{setingObj.DataObj.Remarks}}
+              {{setingObj.DataObj.Remarks||'无'}}
             </div>
           </div>
           <div v-if="showType==2">

src/components/teacher/provisionalInviteForm.vue

@@ -74,9 +74,9 @@
                 </q-item>
               </template>
             </q-select>
-            <q-input filled v-model="msg.GuestName" clearable class="col-6" label="学员姓名" maxlength="200">
-              <template v-slot:append>
-                <q-icon name="search" @click="getNotClassStudentList" @keyup.enter="getNotClassStudentList" />
+            <q-input filled v-model="msg.GuestName" clearable class="col-6" label="学员姓名" maxlength="200" @clear="getNotClassStudentList">
+              <template v-slot:append >
+                <q-icon name="search" style="cursor:pointer;" @click="getNotClassStudentList"/>
               </template>
             </q-input>
           </div>
@@ -199,7 +199,13 @@
         },
         stuList: [],
         selectedStu: [],
-        stuColumns: [{
+        stuColumns: [
+          {
+            name: 'Id',
+            label: '编号',
+            field: 'Id',
+            align: 'left'
+          },{
             name: 'GuestName',
             label: '姓名',
             field: 'GuestName',
@@ -372,7 +378,6 @@
           OrderGuestIds: stuIds,
           Remarks: this.msg.Remarks
         }
-        console.log(366,obj)
         this.saveLoading = true
         setStuInviteApply(obj).then(res => {
           this.saveLoading = false
@@ -394,7 +399,7 @@
             })
           }
         }).catch(err => {
-          this.saveLoading = true
+          this.saveLoading = flase
         })
       }
     },

src/router/routes.js

@@ -1022,6 +1022,10 @@ const routes = [{
     path: "/teacher/teacherSchedule",
     component: () =>
       import("pages/teacher/teacherSchedule")
+  }, {
+    path: "/stuMan/activeList",//学管   活动列表
+    component: () =>
+      import("pages/stuMan/activeList")
   }
   ],