Skip to content

C
confucius
Commit e95e3235 authored by 黄奎's avatar 黄奎
Browse files
Options

也没修过

parent 513b1ebb
Hide whitespace changes
Inline Side-by-side
Showing with 99 additions and 12 deletions
src/pages/scheduling/schedulingPlan.vue
View file @ e95e3235
......@@ -69,6 +69,37 @@
</div>
</div>
</q-td>
<q-td v-if="col.name == 'CheckTimeStr'" style="padding-right:0px">
<div v-for="item in col.value">
<div class="border-bottom" style="padding-left: 16px;padding-right: 16px">
<div v-if="item.Status==1">
{{item.CheckTimeStr}}
<template v-if="item.CheckLateTime&&item.CheckLateTime>0">
<span style="color:red">{{item.CheckLateTimeStr}}</span>
</template>
<template v-else>
<span style="color:green">{{item.CheckLateTimeStr}}</span>
</template>
</div>
</div>
</div>
</q-td>
<q-td v-if="col.name == 'FinishTimeStr'" style="padding-right:0px">
<div v-for="item in col.value">
<div class="border-bottom" style="padding-left: 16px;padding-right: 16px">
<div v-if="item.Status==2">
{{item.FinishTimeStr}}
<template v-if="item.FinishLateTime&&item.FinishLateTime>0">
<span style="color:red">{{item.FinishLateTimeStr}} </span>
</template>
<template v-else>
<span style="color:green">{{item.FinishLateTimeStr}}</span>
</template>
</div>
</div>
</div>
</q-td>
<q-td v-if="col.name == 'DutyManName'" style="padding-right:0px">
<div v-for="item in col.value">
<div class="border-bottom" style="padding-left: 16px;padding-right: 16px">
......@@ -91,9 +122,8 @@
<q-td v-else-if="col.name == 'Id'" style="width:200px;">
<div v-for="item in col.value">
<div class="border-bottom" style="border-bottom:0;">
<q-btn v-if="item.Status==0||item.Status==1"  flat size="xs"  icon="edit"
 style="font-weight:400;" color="edit"  class="q-mr-xs" label="修改"  @click="EditSchedu(props.row)"
  />
<q-btn v-if="item.Status==0||item.Status==1"  flat size="xs"  icon="edit"  style="font-weight:400;"
color="edit"  class="q-mr-xs" label="修改"  @click="EditSchedu(props.row)"   />
<q-btn v-if="item.Status==0"  flat size="xs"  icon="delete"  style="font-weight:400;"
color="negative"  class="q-mr-xs" label="删除"  @click="RemovePlan(props.row.Id)" />
<q-btn flat size="xs" icon="iconfont icon-View" style="font-weight:400;" class="q-mr-xs"  label="查看"
......@@ -162,7 +192,20 @@
field: 'StartTime',
field: row => row.PlanDetails
},
{
name: 'CheckTimeStr',
label: '上班',
align: 'left',
field: 'CheckTimeStr',
field: row => row.PlanDetails
},
{
name: 'FinishTimeStr',
label: '下班',
align: 'left',
field: 'FinishTimeStr',
field: row => row.PlanDetails
},
{
name: 'DutyManName',
label: '值班人员',
......
src/pages/scheduling/schedulingRecord.vue
View file @ e95e3235
......@@ -68,6 +68,36 @@
</div>
</div>
</q-td>
<q-td v-if="col.name == 'CheckTimeStr'" style="padding-right:0px">
<div v-for="item in col.value">
<div class="border-bottom" style="padding-left: 16px;padding-right: 16px">
<div v-if="item.Status==1">
{{item.CheckTimeStr}}
<template v-if="item.CheckLateTime&&item.CheckLateTime>0">
<span style="color:red">{{item.CheckLateTimeStr}}</span>
</template>
<template v-else>
<span style="color:green">{{item.CheckLateTimeStr}}</span>
</template>
</div>
</div>
</div>
</q-td>
<q-td v-if="col.name == 'FinishTimeStr'" style="padding-right:0px">
<div v-for="item in col.value">
<div class="border-bottom" style="padding-left: 16px;padding-right: 16px">
<div v-if="item.Status==2">
{{item.FinishTimeStr}}
<template v-if="item.FinishLateTime&&item.FinishLateTime>0">
<span style="color:red">{{item.FinishLateTimeStr}} </span>
</template>
<template v-else>
<span style="color:green">{{item.FinishLateTimeStr}}</span>
</template>
</div>
</div>
</div>
</q-td>
<q-td v-if="col.name == 'DutyManName'" style="padding-right:0px">
<div v-for="item in col.value">
<div class="border-bottom" style="padding-left: 16px;padding-right: 16px">
......@@ -75,12 +105,11 @@
</div>
</div>
</q-td>
<q-td v-if="col.name == 'DutyStatusStr'" style="padding-right:0px">
<q-td v-if="col.name == 'StatusStr'" style="padding-right:0px">
<div v-for="item in col.value">
<div v-if="item.DutyStatus==0" style="color:blue" class="border-bottom">{{item.DutyStatusStr}}</div>
<div v-if="item.DutyStatus==1" style="color:green"
class="border-bottom">{{item.DutyStatusStr}}</div>
<div v-if="item.DutyStatus==2" style="color:red" class="border-bottom">{{item.DutyStatusStr}}</div>
<div v-if="item.Status==0" style="color:blue" class="border-bottom">{{item.StatusStr}}</div>
<div v-if="item.Status==1" style="color:green" class="border-bottom">{{item.StatusStr}}</div>
<div v-if="item.Status==2" style="color:red" class="border-bottom">{{item.StatusStr}}</div>
</div>
</q-td>
<q-td v-else-if="col.name == 'ViewId'" style="width:200px;">
......@@ -147,6 +176,20 @@
field: 'StartTime',
field: row => row.PlanDetails
},
{
name: 'StartTime',
label: '值班时间',
align: 'left',
field: 'StartTime',
field: row => row.PlanDetails
},
{
name: 'CheckTimeStr',
label: '上班',
align: 'left',
field: 'CheckTimeStr',
field: row => row.PlanDetails
},
{
name: 'DutyManName',
label: '值班人员',
......@@ -155,10 +198,10 @@
field: row => row.PlanDetails
},
{
name: 'DutyStatusStr',
name: 'StatusStr',
label: '状态',
align: 'left',
field: 'DutyStatusStr',
field: 'StatusStr',
field: row => row.PlanDetails
},
{
......@@ -269,9 +312,10 @@
padding-bottom: 5px;
margin-bottom: 5px;
}
.Sysuser_Date .el-input__inner {
background-color: transparent;
border:0;
border: 0;
}
</style>
......
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