1

src/pages/course/makeup.vue

@@ -79,12 +79,12 @@
           <q-td :props="props">
             <q-btn v-if="props.row.MakeUpStatus==3" flat size="xs" icon="edit" color="accent" style="font-weight:400"
               label="处理" @click="isShowEdit=true,getClickItem(props.row)">
-              <q-popup-proxy>
+              <q-popup-proxy >
                 <q-banner v-if="isShowEdit">
                   <div class="calenderDialog">
                     <div style="margin:10px 0 15px 0;">设置处理状态</div>
                     <q-select standout="bg-primary text-white" option-value="Id" option-label="Name"
-                      v-model="statusMsg.MakeUpStatus" :options="statusList" emit-value map-options label="班级状态" />
+                      v-model="statusMsg.MakeUpStatus" :options="statusList" emit-value map-options label="是否可补课" />
                     <q-card-actions align="right" class="bg-white" style="margin-top:20px;">
                       <q-btn label="取消" flat color="grey-10" size="sm" @click="isShowEdit=false"
                         style="font-weight:400 !important" />
@@ -160,10 +160,16 @@
           },
           {
             name: 'MakeUpStatusStr',
-            label: '状态',
+            label: '处理结果',
             align: 'left',
             field: 'MakeUpStatusStr'
           },
+          {
+            name: 'TimeHour',
+            label: '课时长度',
+            align: 'left',
+            field: 'TimeHour'
+          },
           {
             name: 'optioned',
             label: '操作',
@@ -192,11 +198,11 @@
             Name: '全部'
           }, {
             Id: 2,
-            Name: '已处理'
+            Name: '可补课'
           },
           {
             Id: 3,
-            Name: "未处理"
+            Name: "不可补课"
           }
         ],
         statusMsg: {

src/pages/stuMan/studentManage.vue

@@ -52,8 +52,8 @@
             @clear="resetSearch" maxlength="20" />
           </div>
           <div class="col-3">
-            <q-select @input="resetSearch" standout="bg-primary text-white" option-value="Id" option-label="Name" clearable
-            v-model="msg.CheckStatus" :options="AttendanceList" emit-value map-options label="出勤状态" />
+            <q-select @input="resetSearch" standout="bg-primary text-white" option-value="Id" option-label="Name" 
+            v-model="msg.CheckStatus" :options="AttendanceList2" emit-value map-options label="出勤状态" />
           </div>
         </div>
       </div>
@@ -261,7 +261,7 @@
             ClassId:0,
             OrderGuestId:'',
             GuestName:'',
-            CheckStatus:'',
+            CheckStatus:-1,
           },
           IsShowDialog:false,
           //课程分类树形列表
@@ -271,6 +271,7 @@
           AllCourseList: [],
           ClassList: [], //班级下拉
           allClassList: [],
+          AttendanceList2:[{Name:'全部',Id:-1},{Name:'缺席',Id:1},{Name:'请假',Id:2},],
           AttendanceList:[{Name:'正常',Id:0},{Name:'缺席',Id:1},{Name:'请假',Id:2},],
           option:{
             disabledDate:(time)=> {