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

src/components/sale/temporaryClassbill-form.vue

@@ -191,7 +191,7 @@
               <div class="backinfo_Item" style="margin-bottom:20px">
                 <span class="role_Line" style="background-color:#02C499"></span>上课时间信息
               </div>
-              <q-table :pagination="msg"  no-data-label="暂无相关数据" flat
+              <q-table :pagination="msg"  no-data-label="暂无相关数据" flat style="border-bottom: 1px solid #DADBDC;"
                 class="sticky-column-table no-bottom-table" :data="setingObj.DataObj.ClassPlanTimeList"
                 :columns="columns" row-key="name">
                 <template v-slot:body-cell-time="props">
@@ -206,7 +206,7 @@
             <div class="backinfo_Item" style="margin-bottom:20px;margin-top:10px;">
               <span class="role_Line" style="background-color:#8175FB"></span>目标学员信息
             </div>
-            <q-table :pagination="msg"  no-data-label="暂无相关数据" flat
+            <q-table :pagination="msg"  no-data-label="暂无相关数据" flat style="border-bottom: 1px solid #DADBDC;"
                 class="sticky-column-table no-bottom-table" :data="setingObj.DataObj.OrderGuestList"
                 :columns="columns2" row-key="name">
                 <template v-slot:body-cell-process="props">

src/components/teacher/provisionalInviteForm.vue

@@ -74,11 +74,7 @@
                 </q-item>
               </template>
             </q-select>
-            <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>
           <div class="row items-center q-ma-sm">
           </div>
@@ -97,8 +93,17 @@
               </q-table>
             </div>
           </q-expansion-item>
+
           <!-- <div class="text-caption q-mb-lg q-px-md text-grey-6">学员列表</div> -->
           <q-expansion-item expand-separator label="学员列表" :value="true">
+            <div class="row q-mb-md q-col-gutter-lg">
+              <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>
             <div class="row items-center">
               <div class="col">
                 <q-table no-data-label="暂无相关数据" flat :pagination="pages"
@@ -199,13 +204,12 @@
         },
         stuList: [],
         selectedStu: [],
-        stuColumns: [
-          {
+        stuColumns: [{
             name: 'Id',
             label: '编号',
             field: 'Id',
             align: 'left'
-          },{
+          }, {
             name: 'GuestName',
             label: '姓名',
             field: 'GuestName',
@@ -389,8 +393,9 @@
               message: '操作成功！',
               position: 'top'
             })
-            this.persistent=false
+            this.persistent = false
             this.$emit('success')
+            this.$emit('close')
           } else {
             this.$q.notify({
               type: 'negative',
@@ -407,6 +412,6 @@
 
 </script>
 
-<style>
+<style >
 
 </style>

src/pages/activity/activeSummary.vue

@@ -200,8 +200,8 @@ import Ueditor from "../../components/editor/UeEditor";
         getDetail(){
             this.apipostDS("/api/Education/GetActivity",{ Id:this.msg.Id},(res)=>{
                 if(res.data.resultCode===1){
-                    this.msg.Summary=res.data.data.Summary
-                    this.setVal(res.data.data.Summary);
+                    this.msg.Summary=res.data.data.Summary||''
+                    this.setVal(this.msg.Summary);
                 }
             })
         },

src/pages/stuMan/activeList.vue

@@ -177,11 +177,6 @@
         row-key="name">
         <template v-slot:top="props">
           <div class="col-2 q-table__title">活动列表</div>
-          <q-space />
-          <div class="page-option">
-            <q-btn color="accent" size="sm" class="q-mr-md" icon="add" label="新增"
-              @click="goUrl('/activity/activeDetail',null)" />
-          </div>
         </template>
         <template v-slot:body-cell-activeName="props">
           <q-td :props="props">
@@ -191,7 +186,6 @@
               </div>
               {{props.row.ActivityName}}
             </div>
-
           </q-td>
         </template>
         <template v-slot:body-cell-ActivityTime="props">
@@ -208,9 +202,6 @@
         <template v-slot:body-cell-AgeAndPeopleNum="props">
           <q-td :props="props">
             <div>
-              <!-- <div>{{props.row.AgeLimit ==1?'不区分年龄':'区分年龄'}}</div>
-              <div v-if="props.row.AgeLimit==0">范围:{{props.row.StartAge}}岁~{{props.row.EndAge}}岁</div>-->
-              <!-- <div>报名人数</div> -->
               <div v-if="props.row.Distinguish ==1">总人数:{{props.row.ManNum}}人</div>
               <div v-if="props.row.Distinguish ==0">男性:{{props.row.ManNum}}人 <span
                   style="margin-left:10px">女性:{{props.row.WoManNum}}人</span> </div> 
@@ -225,7 +216,6 @@
             <div>
               <div v-if="props.row.IsFree==1" style="color:green;">免费</div>
               <div v-if="props.row.IsFree==2" style="color:red;">现金价格:{{props.row.Price}}元</div>
-              <!-- <div v-if="props.row.IsFree==2" style="color:red;">现金点数:{{props.row.PointNum}}点</div> -->
               <div>报名取消确认:{{props.row.IsCancelConfirm==1?'是':'否'}}</div>
               <div>内部限制:{{props.row.IsCancelConfirm==1?'是':'否'}}</div>
             </div>
@@ -238,37 +228,13 @@
             </div>
           </q-td>
         </template>
-        <!-- <template v-slot:body-cell-JoinNum="props">
-          <q-td :props="props">
-              <div>
-                        {{props.row.JoinNum}} 人
-              </div>
-          </q-td>
-        </template> -->
         <template v-slot:body-cell-optioned="props">
           <q-td :props="props">
             <div>
-              <q-btn flat size="xs" color="accent" style="font-weight:400" label="复制"
-                @click="goUrl('/activity/copyActive',props.row)" />
-              <!-- <q-btn  flat size="xs" icon="edit"
-                color="accent" style="font-weight:400" label="删除" @click="delActive(props.row)" /> -->
+              <q-btn flat size="xs" color="accent" style="font-weight:400" label="报名列表"
+                @click="goUrl1('/activity/activeSignUpList',props.row)" />
               <q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;">
                 <q-list>
-                  <q-item clickable v-close-popup @click="delActive(props.row)">
-                    <q-item-section>
-                      <q-item-label>删除</q-item-label>
-                    </q-item-section>
-                  </q-item>
-                  <q-item clickable v-close-popup @click="goUrl1('/activity/activeSignUpList',props.row)">
-                    <q-item-section>
-                      <q-item-label>报名列表</q-item-label>
-                    </q-item-section>
-                  </q-item>
-                  <q-item clickable v-close-popup @click="goUrl('/activity/payment',props.row)">
-                    <q-item-section>
-                      <q-item-label>活动收支</q-item-label>
-                    </q-item-section>
-                  </q-item>
                   <q-item clickable v-close-popup @click="goUrl('/activity/activeDetail',props.row)">
                     <q-item-section>
                       <q-item-label>活动详情</q-item-label>

src/pages/teacher/studentManager.vue

@@ -111,7 +111,7 @@
         </template>
       </q-table>
        <StopLesson-form  v-if="isShowStopLesson" :setObj="stuObj" @success="reloadPage" @close="closeMenuSaveForm"/>
-        <ProvisionalInvite-form v-if="isShowProvisionalInvite" @close="closeMenuSaveForm"/>
+       <ProvisionalInvite-form v-if="isShowProvisionalInvite" @close="closeMenuSaveForm"/>
     </div>
 
    
@@ -133,9 +133,6 @@
   import {
     GetStuPageList
   } from "../../api/teacher/student"
-  //   import classForm from '../../components/course/class-form';
-  //   import classinfoForm from '../../components/course/classinfo-form';
-  //   import othercourseForm from '../../components/course/othercourse-form';
   import StopLessonForm from '../../components/teacher/stopLessonForm'
   import ProvisionalInviteForm from '../../components/teacher/provisionalInviteForm'
   export default {

src/router/routes.js

@@ -1026,7 +1026,17 @@ const routes = [{
     path: "/stuMan/activeList",//学管   活动列表
     component: () =>
       import("pages/stuMan/activeList")
-  }
+  },
+  {
+    path: "/stuMan/classPlan",//学管   上课计划
+    component: () =>
+      import("pages/stuMan/classPlan")
+  },
+  {
+    path: "/stuMan/classRecord",//学管   上课记录
+    component: () =>
+      import("pages/stuMan/classRecord")
+  },
   ],
 
 },