1

src/pages/course/makeup.vue

@@ -65,9 +65,9 @@
         <template v-slot:body-cell-MakeUpStatusStr="props">
           <q-td>
             <span>{{props.row.MakeUpStatusStr}}</span>&nbsp;
-            <template v-if="props.row.MakeUpStatus==2">
-              <br /> <span>操作人:{{props.row.DealByName}}</span>
-              <br /><span>操作时间{{props.row.DealTime}}</span>
+            <template v-if="props.row.MakeUpStatus!=1">
+              <br /> <span v-if="props.row.DealByName && props.row.DealByName!=''">操作人:{{props.row.DealByName}}</span>
+              <br /><span v-if="props.row.DealTime && props.row.DealTime!=''">操作时间{{props.row.DealTime}}</span>
             </template>
           </q-td>
         </template>
@@ -182,7 +182,7 @@
           pageIndex: 1,
           pageSize: 12,
           rowsPerPage: 12,
-          MakeUpStatus: 1, //(2-已处理，3-未处理)
+          MakeUpStatus: -1, //(2-已处理，3-未处理)
           GuestName: "", //学员名称
           ClassName: "", //班级名称
           CourseName: "", //课程名称
@@ -193,7 +193,7 @@
         },
         pageCount: 0,
         isShowEdit: false, //是否显示修改
-        statusList: [{Id: 1,Name: '未处理'}, { Id: 2,Name: '可补课'},{Id: 3,Name: "不可补课"}],
+        statusList: [{Id: -1,Name: '不限'},{Id: 1,Name: '未处理'}, { Id: 2,Name: '可补课'},{Id: 3,Name: "不可补课"}],
         statusList2: [ { Id: 2,Name: '可补课'},{Id: 3,Name: "不可补课"}],
         statusMsg: {
           Id: 0,
@@ -242,7 +242,10 @@
         this.statusMsg.ClassCheckId = item.ClassCheckId;
         this.statusMsg.GuestId = item.OrderGuestId;
         this.statusMsg.Id = item.Id;
+        if(item.MakeUpStatus!=1){
           this.statusMsg.MakeUpStatus = item.MakeUpStatus
+
+        }
       },
       clearMsg() {
         this.statusMsg.Id = 0;

src/pages/stuMan/studentManage.vue

@@ -64,7 +64,9 @@
           <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"  label="导出" @click="getexport()" />
+            </div>
           </template>
           <template v-slot:body-cell-GuestName="props">
             <q-td :props="props" style="padding-right:0px">
@@ -163,7 +165,9 @@
     } from "../../api/stuMan/index"
     import selectTree from "../../components/common/select-tree";
     import { openURL } from "quasar";
-  
+    import {
+        EduDownLoad,
+    } from '../../api/common/common';
     export default {
       meta: {
         title: "学员管理"
@@ -445,6 +449,12 @@
             }
           })
         },
+        getexport(){//导出
+          
+               
+          var msg = JSON.parse(JSON.stringify(this.msg));
+          EduDownLoad("/stu/GetStudentAttendanceDayStatisticsToExcel", msg, '学员出勤管理')
+        },
       }
     };
   

src/router/routes.js

@@ -1056,7 +1056,11 @@ const routes = [{
     component: () =>
       import("pages/stuMan/visitorRecord")
   },
-
+  {
+    path: "/stuMan/todaysOrder",//学管  今日订单
+    component: () =>
+      import("pages/stuMan/todaysOrder")
+  },
   ],
 
 },