Skip to content

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

页面修改

parent 77fbae15
Hide whitespace changes
Inline Side-by-side
Showing with 109 additions and 89 deletions
src/components/schedul/schedul-head.vue
View file @ 609a96fb
<style> <style>
.Sctop_Last{ .Sctop_Last {
position: absolute; position: absolute;
right:25px; right: 25px;
top:16px; top: 16px;
} }
.Sctop_Last>div{
display:inline-block; .Sctop_Last>div {
width:112px; display: inline-block;
height:34px; width: 112px;
background-color: #D4DFFF; height: 34px;
color:#2966FE; background-color: #D4DFFF;
text-align:center; color: #2966FE;
font-size:14px; text-align: center;
line-height: 34px; font-size: 14px;
border-radius: 10px; line-height: 34px;
font-weight:bold; border-radius: 10px;
cursor: pointer; font-weight: bold;
} cursor: pointer;
}
</style> </style>
<template> <template>
<div class="sche_rightTop"> <div class="sche_rightTop">
<div v-if="dataList.DutyStatus==1" class="sche_Topflex"> <div v-if="dataList.Status==1" class="sche_Topflex">
<div class="Sctop_Color Scdu_benci" style="position:relative;">本次值班信息</div> <div class="Sctop_Color Scdu_benci" style="position:relative;">本次值班信息</div>
<div class="Sctop_Color"> <div class="Sctop_Color">
<span class="Scotop_little">校区</span>{{dataList.SchoolName}} <span class="Scotop_little">校区</span>{{dataList.SchoolName}}
...@@ -36,9 +38,9 @@ ...@@ -36,9 +38,9 @@
</div> </div>
</div> </div>
<div class="Sctop_Last"> <div class="Sctop_Last">
<div @click="isShowJiedai=true"><i style="margin-right:5px;" class="iconfont icon-liuchengguanliqi"></i>接待流程</div> <div @click="isShowJiedai=true"><i style="margin-right:5px;" class="iconfont icon-liuchengguanliqi"></i>接待流程</div>
</div> </div>
<table v-if="dataList.DutyStatus==2" style="width:100%;margin:0 20px;font-size:18px;color:#000000;"> <table v-if="dataList.Status==2" style="width:100%;margin:0 20px;font-size:18px;color:#000000;">
<tr> <tr>
<td style="width:11%"> <td style="width:11%">
<span class="Sch_MainColor">本次值班信息</span> <span class="Sch_MainColor">本次值班信息</span>
...@@ -56,7 +58,7 @@ ...@@ -56,7 +58,7 @@
<span class="Scotop_little">班次</span>{{dataList.ShiftName}} <span class="Scotop_little">班次</span>{{dataList.ShiftName}}
</td> </td>
<td> <td>
<span class="Scotop_little">值班状态</span>{{dataList.DutyStatusStr}} <span class="Scotop_little">值班状态</span>{{dataList.StatusStr}}
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -66,10 +68,23 @@ ...@@ -66,10 +68,23 @@
</td> </td>
<td> <td>
<span class="Scotop_little">打卡时间</span> <span class="Scotop_little">打卡时间</span>
<span v-if="dataList.CheckTime">{{dataList.CheckTime}}</span> <span v-if="dataList.CheckTime">{{dataList.CheckTime}}
<template v-if="dataList.CheckLateTime&&dataList.CheckLateTime>0">
<span style="color:red">[迟到 {{dataList.CheckLateTime}} 分钟] </span>
</template>
<template v-else>
<span style="color:green">[正常]</span>
</template>
</span>
</td> </td>
<td> <td>
<span class="Scotop_little">交接时间</span>{{dataList.FinishTime}} <span class="Scotop_little">交接时间</span>{{dataList.FinishTime}}
<template v-if="dataList.FinishLateTime&&dataList.FinishLateTime>0">
<span style="color:red">[早退 {{dataList.FinishLateTime}} 分钟]</span>
</template>
<template v-else>
<span style="color:green">[正常]</span>
</template>
</td> </td>
</tr> </tr>
</table> </table>
...@@ -87,18 +102,18 @@ ...@@ -87,18 +102,18 @@
}, },
}, },
components: { components: {
schedulJiedai schedulJiedai
}, },
data() { data() {
return { return {
isShowJiedai:false //是否显示接待 isShowJiedai: false //是否显示接待
} }
}, },
created() {}, created() {},
methods: { methods: {
closeJiedai(){ closeJiedai() {
this.isShowJiedai=false; this.isShowJiedai = false;
} }
}, },
} }
......
src/pages/scheduling/mySchedule.vue
View file @ 609a96fb
...@@ -47,14 +47,40 @@ ...@@ -47,14 +47,40 @@
</div> </div>
</q-td> </q-td>
</template> </template>
<template v-slot:body-cell-DutyStatusStr="props"> <template v-slot:body-cell-StatusStr="props">
<q-td> <q-td>
<div v-if="props.row.DutyStatus==0" style="color:blue"> <div v-if="props.row.Status==0" style="color:blue">
{{props.row.DutyStatusStr}}</div> {{props.row.StatusStr}}</div>
<div v-if="props.row.DutyStatus==1" style="color:green"> <div v-if="props.row.Status==1" style="color:green">
{{props.row.DutyStatusStr}}</div> {{props.row.StatusStr}}</div>
<div v-if="props.row.DutyStatus==2" style="color:red"> <div v-if="props.row.Status==2" style="color:red">
{{props.row.DutyStatusStr}}</div> {{props.row.StatusStr}}</div>
</q-td>
</template>
<template v-slot:body-cell-CheckTimeStr="props">
<q-td>
<div v-if="props.row.Status==1">
{{props.row.CheckTimeStr}}
<template v-if="props.row.CheckLateTime&&props.row.CheckLateTime>0">
<span style="color:red">[迟到 {{props.row.CheckLateTime}} 分钟] </span>
</template>
<template v-else>
<span style="color:green">[正常]</span>
</template>
</div>
</q-td>
</template>
<template v-slot:body-cell-FinishTimeStr="props">
<q-td>
<div v-if="props.row.Status==2">
{{props.row.FinishTimeStr}}
<template v-if="props.row.FinishLateTime&&props.row.FinishLateTime>0">
<span style="color:red">[早退 {{props.row.FinishLateTime}} 分钟]</span>
</template>
<template v-else>
<span style="color:green">[正常]</span>
</template>
</div>
</q-td> </q-td>
</template> </template>
<template v-slot:bottom> <template v-slot:bottom>
...@@ -64,11 +90,11 @@ ...@@ -64,11 +90,11 @@
<template v-slot:body-cell-optioned="props"> <template v-slot:body-cell-optioned="props">
<q-td :props="props"> <q-td :props="props">
<div> <div>
<template v-if="props.row.DutyStatus==1"> <template v-if="props.row.Status==1">
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="开始值班" <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="开始值班"
@click="StartSchedule(props.row)" /> @click="StartSchedule(props.row)" />
</template> </template>
<template v-if="props.row.DutyStatus==2"> <template v-if="props.row.Status==2">
<q-btn flat size="xs" icon="iconfont icon-View" style="font-weight:400;" class="q-mr-xs"  label="查看" <q-btn flat size="xs" icon="iconfont icon-View" style="font-weight:400;" class="q-mr-xs"  label="查看"
 @click="GoToDutyInfo(props.row)"   />  @click="GoToDutyInfo(props.row)"   />
</template> </template>
...@@ -121,6 +147,18 @@ ...@@ -121,6 +147,18 @@
align: 'left', align: 'left',
field: 'GiveMan' field: 'GiveMan'
}, },
{
name: 'CheckTimeStr',
label: '上班',
align: 'left',
field: 'CheckTimeStr'
},
{
name: 'FinishTimeStr',
label: '下班',
align: 'left',
field: 'FinishTimeStr'
},
{ {
name: 'ReciveMan', name: 'ReciveMan',
label: '接班对象', label: '接班对象',
...@@ -134,10 +172,10 @@ ...@@ -134,10 +172,10 @@
field: 'CreateByName' field: 'CreateByName'
}, },
{ {
name: 'DutyStatusStr', name: 'StatusStr',
label: '状态', label: '状态',
align: 'left', align: 'left',
field: 'DutyStatusStr' field: 'StatusStr'
}, },
{ {
name: 'optioned', name: 'optioned',
......
src/pages/scheduling/scheduleBoard.vue
View file @ 609a96fb
...@@ -247,12 +247,12 @@ ...@@ -247,12 +247,12 @@
{{dataList.DutyManName}} {{dataList.DutyManName}}
</div> </div>
<div class="schedu_Status"> <div class="schedu_Status">
<span class="schedu_st zbz"></span>{{dataList.DutyStatusStr}} <span class="schedu_st zbz"></span>{{dataList.StatusStr}}
</div> </div>
<div class="clockon_Duty" @click="SetDutyCheck(1)" v-if="dataList.DutyStatus==1 && dataList.Status==0 "> <div class="clockon_Duty" @click="SetDutyCheck(1)" v-if="dataList.Status==0">
值班打卡<i class="iconfont icon-jiejue1 sche_daka"></i> 值班打卡<i class="iconfont icon-jiejue1 sche_daka"></i>
</div> </div>
<div class="clockon_Duty" @click="SetDutyCheck(2)" v-if="dataList.DutyStatus==1 && dataList.Status==1 "> <div class="clockon_Duty" @click="SetDutyCheck(2)" v-if="dataList.Status==1">
值班交接<i class="iconfont icon-jiejue1 sche_daka"></i> 值班交接<i class="iconfont icon-jiejue1 sche_daka"></i>
</div> </div>
</div> </div>
...@@ -260,10 +260,10 @@ ...@@ -260,10 +260,10 @@
<div class="scheduMain"> <div class="scheduMain">
<div class="flex row mySched"> <div class="flex row mySched">
<div class="col scroll schScroll"> <div class="col scroll schScroll">
<template v-if="dataList.Status==1"> <template v-if="dataList.Status==1||dataList.Status==2">
<schedulHead :dataList="dataList"></schedulHead> <schedulHead :dataList="dataList"></schedulHead>
<div class="Sche_Bottom"> <div class="Sche_Bottom">
<template v-if="dataList.DutyStatus!=2"> <template v-if="dataList.Status!=2">
<schedulOrder :save-obj="msg"></schedulOrder> <schedulOrder :save-obj="msg"></schedulOrder>
<schedulVisit :save-obj="msg"></schedulVisit> <schedulVisit :save-obj="msg"></schedulVisit>
</template> </template>
......
src/pages/scheduling/scheduleInfo.vue
View file @ 609a96fb
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
.scheInfo_rightTop { .scheInfo_rightTop {
width: 100%; width: 100%;
/* height: 80px; */ /* height: 80px; */
padding:20px 0; padding: 20px 0;
background-color: #fff; background-color: #fff;
} }
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
margin-right: 15px; margin-right: 15px;
display: inline-block; display: inline-block;
text-align: right; text-align: right;
width:60px; width: 60px;
} }
.Scdu_benci::after { .Scdu_benci::after {
...@@ -234,55 +234,20 @@ ...@@ -234,55 +234,20 @@
.schScroll::-webkit-scrollbar { .schScroll::-webkit-scrollbar {
display: none; display: none;
} }
.Sch_MainColor{
font-size:18px; .Sch_MainColor {
color:#000000; font-size: 18px;
color: #000000;
} }
</style> </style>
<template> <template>
<div class="scheduInfo"> <div class="scheduInfo">
<div class="flex row mySched"> <div class="flex row mySched">
<div class="col scroll schScroll"> <div class="col scroll schScroll">
<div class="scheInfo_rightTop"> <schedulHead :dataList="dataList"></schedulHead>
<table class="" style="width:100%;margin:0 20px;font-size:18px;color:#000000;">
<tr>
<td style="width:12%">
<span class="Sch_MainColor">本次值班信息</span>
</td>
<td style="width:16%">
<span class="Scotop_little">校区</span>{{dataList.SchoolName}}
</td>
<td style="width:29%;">
<span class="Scotop_little">时间</span>
<span v-if="dataList.PlanDate">{{dataList.PlanDate.replaceAll('-','.')}}</span>
<span v-if="dataList.WeekDay"> {{dataList.WeekDay.replace('星期','周')}}</span>
{{dataList.StartTime}}-{{dataList.EndTime}}
</td>
<td style="width:25%;">
<span class="Scotop_little">班次</span>{{dataList.ShiftName}}
</td>
<td>
<span class="Scotop_little">值班状态</span>{{dataList.DutyStatusStr}}
</td>
</tr>
<tr>
<td></td>
<td>
<span class="Scotop_little">值班人员</span>{{dataList.DutyManName}}
</td>
<td>
<span class="Scotop_little">打卡时间</span>
<span v-if="dataList.CheckTime">{{dataList.CheckTime}}</span>
</td>
<td>
<span class="Scotop_little">交接时间</span>{{dataList.FinishTime}}
</td>
</tr>
</table>
</div>
<div class="Sche_Bottom"> <div class="Sche_Bottom">
<schedulOrder :save-obj="msg" :authObj="workAuthObj" @refreshPage="refreshPage"></schedulOrder> <schedulOrder :save-obj="msg" :authObj="workAuthObj" @refreshPage="refreshPage"></schedulOrder>
<schedulVisit :save-obj="msg" :authObj="vitiorAuthObj"></schedulVisit> <schedulVisit :save-obj="msg" :authObj="vitiorAuthObj"></schedulVisit>
...@@ -299,12 +264,14 @@ ...@@ -299,12 +264,14 @@
import schedulOrder from '../../components/schedul/schedul-orderlist' import schedulOrder from '../../components/schedul/schedul-orderlist'
import schedulVisit from '../../components/schedul/schedul-visit' import schedulVisit from '../../components/schedul/schedul-visit'
import schedulHead from '../../components/schedul/schedul-head'
export default { export default {
props: {}, props: {},
components: { components: {
schedulOrder, schedulOrder,
schedulVisit schedulVisit,
schedulHead,
}, },
data() { data() {
return { return {
......
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