Commit 806133fc authored by 张海景's avatar 张海景

update:修改排班日历显示和刀模版申请单字段问题

parent 92179471
...@@ -22,7 +22,9 @@ ...@@ -22,7 +22,9 @@
<el-row v-for="calendarDay in calendarDayList " :key="calendarDay.theDay"> <el-row v-for="calendarDay in calendarDayList " :key="calendarDay.theDay">
<el-col :span="24" v-if="calendarDay.theDay == data.day && holidayList.indexOf(data.day) ==-1"> <el-col :span="24" v-if="calendarDay.theDay == data.day && holidayList.indexOf(data.day) ==-1">
<div v-for="(teamShift,index) in calendarDay.calPlanWorkunitList" :key="index" class="grid-content"> <div v-for="(teamShift,index) in calendarDay.calPlanWorkunitList" :key="index" class="grid-content">
<el-button type="success" icon="el-icon-sunrise">{{ teamShift.workunitName }}</el-button> <el-button type="primary" v-if="teamShift.shiftName === '白班'" icon="el-icon-sunny">{{ teamShift.workunitName }}</el-button>
<el-button type="success" v-else-if="teamShift.shiftName === '中班'" icon="el-icon-sunrise">{{ teamShift.workunitName }}</el-button>
<el-button type="warning" v-else-if="teamShift.shiftName === '夜班'" icon="el-icon-moon">{{ teamShift.workunitName }}</el-button>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
......
...@@ -31,7 +31,9 @@ ...@@ -31,7 +31,9 @@
<el-row v-for="calendarDay in calendarDayList " :key="calendarDay.theDay"> <el-row v-for="calendarDay in calendarDayList " :key="calendarDay.theDay">
<el-col :span="24" v-if="calendarDay.theDay == data.day && holidayList.indexOf(data.day) ==-1"> <el-col :span="24" v-if="calendarDay.theDay == data.day && holidayList.indexOf(data.day) ==-1">
<div v-for="(teamShift,index) in calendarDay.calPlanWorkunitList" :key="index" class="grid-content"> <div v-for="(teamShift,index) in calendarDay.calPlanWorkunitList" :key="index" class="grid-content">
<el-button type="success" icon="el-icon-sunrise">{{ teamShift.workunitName }}</el-button> <el-button type="primary" v-if="teamShift.shiftName === '白班'" icon="el-icon-sunny">{{ teamShift.workunitName }}</el-button>
<el-button type="success" v-else-if="teamShift.shiftName === '中班'" icon="el-icon-sunrise">{{ teamShift.workunitName }}</el-button>
<el-button type="warning" v-else-if="teamShift.shiftName === '夜班'" icon="el-icon-moon">{{ teamShift.workunitName }}</el-button>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
......
...@@ -132,12 +132,12 @@ ...@@ -132,12 +132,12 @@
</el-table-column> </el-table-column>
<el-table-column label="预计开始时间" align="center" prop="startTime" width="180"> <el-table-column label="预计开始时间" align="center" prop="startTime" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.startTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="预计结束时间" align="center" prop="endTime" width="180"> <el-table-column label="预计结束时间" align="center" prop="endTime" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.endTime,) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="总数量" align="center" prop="requestNum" /> <el-table-column label="总数量" align="center" prop="requestNum" />
......
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