Commit 98e4be2a authored by 黄奎's avatar 黄奎

页面修改

parent a638786f
...@@ -35,14 +35,14 @@ ...@@ -35,14 +35,14 @@
</q-select> </q-select>
</div> </div>
<div class="col-3"> <div class="col-3">
<q-select @input="resetSearch" clearable standout="bg-primary text-white" option-value="Id" <q-select @input="resetSearch" clearable standout="bg-primary text-white" option-value="Id"
option-label="Name" v-model="msg.QDutyStatus" :options="DutyStatusList" emit-value map-options label="值班状态" option-label="Name" v-model="msg.QDutyStatus" :options="DutyStatusList" emit-value map-options label="值班状态"
@clear="resetSearch" /> @clear="resetSearch" />
</div> </div>
<div class="col-3"> <div class="col-3">
<q-select @input="resetSearch" clearable standout="bg-primary text-white" option-value="Id" <q-select @input="resetSearch" clearable standout="bg-primary text-white" option-value="Id"
option-label="Name" v-model="msg.QAttendanceStatus" :options="AttendanceStatusList" emit-value map-options label="出勤状态" option-label="Name" v-model="msg.QAttendanceStatus" :options="AttendanceStatusList" emit-value map-options
@clear="resetSearch" /> label="出勤状态" @clear="resetSearch" />
</div> </div>
</div> </div>
</div> </div>
...@@ -82,7 +82,6 @@ ...@@ -82,7 +82,6 @@
<q-td v-if="col.name == 'CheckTimeStr'" style="padding-right:0px"> <q-td v-if="col.name == 'CheckTimeStr'" style="padding-right:0px">
<div v-for="item in col.value"> <div v-for="item in col.value">
<div class="border-bottom" style="padding-left: 16px;padding-right: 16px"> <div class="border-bottom" style="padding-left: 16px;padding-right: 16px">
<div v-if="item.Status==1"> <div v-if="item.Status==1">
{{item.CheckTimeStr}} {{item.CheckTimeStr}}
<template v-if="item.CheckLateTime&&item.CheckLateTime>0"> <template v-if="item.CheckLateTime&&item.CheckLateTime>0">
...@@ -246,8 +245,8 @@ ...@@ -246,8 +245,8 @@
StartDate: "", //开始日期 StartDate: "", //开始日期
EndDate: "", //结束日期 EndDate: "", //结束日期
EmployeeIds: [], //员工列表 EmployeeIds: [], //员工列表
QDutyStatus:"",//值班状态 QDutyStatus: "", //值班状态
QAttendanceStatus:"",//出勤状态 QAttendanceStatus: "", //出勤状态
}, },
isShowSchedu: false, isShowSchedu: false,
scheduOption: null, scheduOption: null,
......
...@@ -34,11 +34,16 @@ ...@@ -34,11 +34,16 @@
</template> </template>
</q-select> </q-select>
</div> </div>
<div class="col-3"> <div class="col-3">
<q-select @input="resetSearch" clearable multiple standout="bg-primary text-white" option-value="Id" <q-select @input="resetSearch" clearable standout="bg-primary text-white" option-value="Id"
option-label="Name" v-model="msg.School_Ids" :options="schoolOptions" emit-value map-options label="值班状态" option-label="Name" v-model="msg.QDutyStatus" :options="DutyStatusList" emit-value map-options label="值班状态"
@clear="resetSearch" /> @clear="resetSearch" />
</div> </div>
<div class="col-3">
<q-select @input="resetSearch" clearable standout="bg-primary text-white" option-value="Id"
option-label="Name" v-model="msg.QAttendanceStatus" :options="AttendanceStatusList" emit-value map-options
label="出勤状态" @clear="resetSearch" />
</div>
</div> </div>
</div> </div>
<div class="page-content"> <div class="page-content">
...@@ -226,11 +231,41 @@ ...@@ -226,11 +231,41 @@
EndDate: "", //结束日期 EndDate: "", //结束日期
EmployeeIds: [], //员工列表 EmployeeIds: [], //员工列表
IsFinish: 1, //已完成值班 IsFinish: 1, //已完成值班
QDutyStatus: "", //值班状态
QAttendanceStatus: "", //出勤状态
}, },
pageCount: 0, pageCount: 0,
schoolOptions: [], //校区列表 schoolOptions: [], //校区列表
EmployeeList: [], //员工列表 EmployeeList: [], //员工列表
AllemployeeList: [], //所有员工列表 AllemployeeList: [], //所有员工列表
//值班状态
DutyStatusList: [{
Id: 0,
Name: '未开始'
}, {
Id: 1,
Name: '值班中'
}, {
Id: 2,
Name: '已完成'
}, {
Id: 3,
Name: '未值班'
}],
//考勤状态列表
AttendanceStatusList: [{
Id: 1,
Name: '迟到'
}, {
Id: 2,
Name: '早退'
}, {
Id: 3,
Name: '缺勤'
}, {
Id: 4,
Name: '正常'
}]
} }
}, },
created() { created() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment