Skip to content

P
pda-ui
Commit 083011bd authored by chenzj's avatar chenzj
Browse files
Options

Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

parents 4542873f 38c8931e
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 5 deletions
src/views/mes/cal/calendar/calendarType.vue
View file @ 083011bd
...@@ -6,14 +6,19 @@ ...@@ -6,14 +6,19 @@
<template slot="dateCell" slot-scope="{date, data }"> <template slot="dateCell" slot-scope="{date, data }">
<div> <div>
<el-row> <el-row>
<el-col :span="6"> <el-col :span="18">
<div class="solar">
{{ data.day.split('-')[1]+'-'+data.day.split('-')[2] }}
</div>
</el-col>
<!-- <el-col :span="6">
<div class="solar"> <div class="solar">
{{ data.day.split('-')[2] }} {{ data.day.split('-')[2] }}
</div> </div>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<div class="lunar" :class="{ festival : isFestival(date, data) }">{{ solarDate2lunar(data.day) }}</div> <div class="lunar" :class="{ festival : isFestival(date, data) }">{{ solarDate2lunar(data.day) }}</div>
</el-col> </el-col> -->
<el-col :span="6"> <el-col :span="6">
<el-tag v-if="workdayList.indexOf(data.day)> -1" effect="dark">班</el-tag> <el-tag v-if="workdayList.indexOf(data.day)> -1" effect="dark">班</el-tag>
<el-tag v-else-if="holidayList.indexOf(data.day) > -1" effect="dark" type="success">休</el-tag> <el-tag v-else-if="holidayList.indexOf(data.day) > -1" effect="dark" type="success">休</el-tag>
......
src/views/mes/cal/holiday/index.vue
View file @ 083011bd
...@@ -4,21 +4,26 @@ ...@@ -4,21 +4,26 @@
<template slot="dateCell" slot-scope="{date, data }"> <template slot="dateCell" slot-scope="{date, data }">
<div @contextmenu.prevent="onRightClick(data)"> <div @contextmenu.prevent="onRightClick(data)">
<el-row> <el-row>
<el-col :span="16"> <!-- <el-col :span="16">
<div class="solar"> <div class="solar">
{{ data.day.split('-')[2] }} {{ data.day.split('-')[2] }}
</div> </div>
</el-col> -->
<el-col :span="16">
<div class="solar">
{{ data.day.split('-')[1]+'-'+data.day.split('-')[2] }}
</div>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-tag v-if="workdayList.indexOf(data.day)> -1" effect="dark">班</el-tag> <el-tag v-if="workdayList.indexOf(data.day)> -1" effect="dark">班</el-tag>
<el-tag v-else-if="holidayList.indexOf(data.day) > -1" effect="dark" type="success">休</el-tag> <el-tag v-else-if="holidayList.indexOf(data.day) > -1" effect="dark" type="success">休</el-tag>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <!-- <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="lunar" :class="{ festival : isFestival(date, data) }">{{ solarDate2lunar(data.day) }}</div> <div class="lunar" :class="{ festival : isFestival(date, data) }">{{ solarDate2lunar(data.day) }}</div>
</el-col> </el-col>
</el-row> </el-row> -->
</div> </div>
</template> </template>
</el-calendar> </el-calendar>
......
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