Commit 1cc9d4c3 authored by zhengke's avatar zhengke

修改

parent 8dd8f7fe
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
</div> </div>
<div class="col-3"> <div class="col-3">
<q-select v-model="msg.EmployeeIds" :options="EmployeeList" filled multiple clearable use-input label="值班人员" <q-select v-model="msg.EmployeeIds" :options="EmployeeList" filled multiple clearable use-input label="值班人员"
option-label="EmployeeName" option-value="Id" ref="EmployeeName" class="col-6 q-pr-lg q-pb-lg" emit-value option-label="EmployeeName" option-value="Id" ref="EmployeeName" class="col-6" emit-value
map-options @input="resetSearch" @filter="filterFn"> map-options @input="resetSearch" @filter="filterFn">
<template v-slot:no-option> <template v-slot:no-option>
<q-item> <q-item>
...@@ -65,23 +65,23 @@ ...@@ -65,23 +65,23 @@
<q-td v-if="col.name=='SchoolName'"> <q-td v-if="col.name=='SchoolName'">
{{col.value}} {{col.value}}
</q-td> </q-td>
<q-td v-if="col.name == 'PlanDetails'" style="padding-right:0px"> <q-td v-if="col.name == 'PlanDetails'">
<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">
{{item.ShiftName}} {{item.ShiftName}}
</div> </div>
</div> </div>
</q-td> </q-td>
<q-td v-if="col.name == 'StartTime'" style="padding-right:0px"> <q-td v-if="col.name == 'StartTime'">
<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">
{{item.StartTime}} - {{item.EndTime}} {{item.StartTime}} - {{item.EndTime}}
</div> </div>
</div> </div>
</q-td> </q-td>
<q-td v-if="col.name == 'CheckTimeStr'" style="padding-right:0px"> <q-td v-if="col.name == 'CheckTimeStr'">
<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">
<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">
...@@ -94,9 +94,9 @@ ...@@ -94,9 +94,9 @@
</div> </div>
</div> </div>
</q-td> </q-td>
<q-td v-if="col.name == 'FinishTimeStr'" style="padding-right:0px"> <q-td v-if="col.name == 'FinishTimeStr'">
<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="min-height:25px;">
<div v-if="item.Status==2"> <div v-if="item.Status==2">
{{item.FinishTimeStr}} {{item.FinishTimeStr}}
<template v-if="item.FinishLateTime&&item.FinishLateTime>0"> <template v-if="item.FinishLateTime&&item.FinishLateTime>0">
...@@ -109,14 +109,14 @@ ...@@ -109,14 +109,14 @@
</div> </div>
</div> </div>
</q-td> </q-td>
<q-td v-if="col.name == 'DutyManName'" style="padding-right:0px"> <q-td v-if="col.name == 'DutyManName'">
<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">
{{item.DutyManName}} {{item.DutyManName}}
</div> </div>
</div> </div>
</q-td> </q-td>
<q-td v-if="col.name == 'StatusStr'" style="padding-right:0px"> <q-td v-if="col.name == 'StatusStr'">
<div v-for="item in col.value"> <div v-for="item in col.value">
<div class="border-bottom" v-if="item.Status==0" style="color:blue"> <div class="border-bottom" v-if="item.Status==0" style="color:blue">
{{item.StatusStr}}</div> {{item.StatusStr}}</div>
...@@ -419,6 +419,7 @@ ...@@ -419,6 +419,7 @@
border-bottom: 1px dashed #EEE; border-bottom: 1px dashed #EEE;
padding-bottom: 5px; padding-bottom: 5px;
margin-bottom: 5px; margin-bottom: 5px;
min-height: 25px;
} }
.Sysuser_Date .el-input__inner { .Sysuser_Date .el-input__inner {
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
</div> </div>
<div class="col-3"> <div class="col-3">
<q-select v-model="msg.EmployeeIds" :options="EmployeeList" filled multiple clearable use-input label="值班人员" <q-select v-model="msg.EmployeeIds" :options="EmployeeList" filled multiple clearable use-input label="值班人员"
option-label="EmployeeName" option-value="Id" ref="EmployeeName" class="col-6 q-pr-lg q-pb-lg" emit-value option-label="EmployeeName" option-value="Id" ref="EmployeeName" class="col-6" emit-value
map-options @input="resetSearch" @filter="filterFn"> map-options @input="resetSearch" @filter="filterFn">
<template v-slot:no-option> <template v-slot:no-option>
<q-item> <q-item>
......
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