Commit a638786f authored by 黄奎's avatar 黄奎

也没修过

parent feba2a6d
...@@ -34,6 +34,16 @@ ...@@ -34,6 +34,16 @@
</template> </template>
</q-select> </q-select>
</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.QDutyStatus" :options="DutyStatusList" emit-value map-options label="值班状态"
@clear="resetSearch" />
</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">
...@@ -236,6 +246,8 @@ ...@@ -236,6 +246,8 @@
StartDate: "", //开始日期 StartDate: "", //开始日期
EndDate: "", //结束日期 EndDate: "", //结束日期
EmployeeIds: [], //员工列表 EmployeeIds: [], //员工列表
QDutyStatus:"",//值班状态
QAttendanceStatus:"",//出勤状态
}, },
isShowSchedu: false, isShowSchedu: false,
scheduOption: null, scheduOption: null,
...@@ -243,6 +255,34 @@ ...@@ -243,6 +255,34 @@
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() {
......
...@@ -33,6 +33,11 @@ ...@@ -33,6 +33,11 @@
</q-item> </q-item>
</template> </template>
</q-select> </q-select>
</div>
<div class="col-3">
<q-select @input="resetSearch" clearable multiple standout="bg-primary text-white" option-value="Id"
option-label="Name" v-model="msg.School_Ids" :options="schoolOptions" emit-value map-options label="值班状态"
@clear="resetSearch" />
</div> </div>
</div> </div>
</div> </div>
...@@ -177,17 +182,17 @@ ...@@ -177,17 +182,17 @@
field: row => row.PlanDetails field: row => row.PlanDetails
}, },
{ {
name: 'StartTime', name: 'CheckTimeStr',
label: '值班时间', label: '上班',
align: 'left', align: 'left',
field: 'StartTime', field: 'CheckTimeStr',
field: row => row.PlanDetails field: row => row.PlanDetails
}, },
{ {
name: 'CheckTimeStr', name: 'FinishTimeStr',
label: '班', label: '班',
align: 'left', align: 'left',
field: 'CheckTimeStr', field: 'FinishTimeStr',
field: row => row.PlanDetails field: row => row.PlanDetails
}, },
{ {
......
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