|
@@ -55,7 +55,7 @@
|
|
|
{{ message.blogDate | dataFormat }}
|
|
|
</td>
|
|
|
<td colspan="2" style="border: none; font-family: 'songti'">
|
|
|
- <span style="font-family: 'fangsong'">{{ message.weekworkRegisters[0].week }}</span>
|
|
|
+ <span style="font-family: 'fangsong'">{{ message.week }}</span>
|
|
|
</td>
|
|
|
<td colspan="6" style="border: none; font-family: 'songti'">
|
|
|
天气:<span style="font-family: 'fangsong'">{{
|
|
@@ -375,7 +375,7 @@
|
|
|
<p align="center">{{ item.peopleName }}</p>
|
|
|
</td>
|
|
|
<td class="JR_right">
|
|
|
- <p align="center">{{ item.examineDate | dataFormat }}</p>
|
|
|
+ <p align="center">{{ item.examineDate }}</p>
|
|
|
</td>
|
|
|
<td class="JR_right">
|
|
|
<p align="center">{{ item.foremanName }}</p>
|
|
@@ -557,10 +557,10 @@
|
|
|
<p align="center">{{ item1.relation }}</p>
|
|
|
</td>
|
|
|
<td class="JR_right" height="30">
|
|
|
- <p align="center">{{ item1.comeDate | dataFormat }}</p>
|
|
|
+ <p align="center">{{ item1.comeDate}}</p>
|
|
|
</td>
|
|
|
<td class="JR_right" height="30">
|
|
|
- <p align="center">{{ item1.leaveDate | dataFormat }}</p>
|
|
|
+ <p align="center">{{ item1.leaveDate }}</p>
|
|
|
</td>
|
|
|
</tr>
|
|
|
|
|
@@ -846,9 +846,12 @@ export default {
|
|
|
xunlian(){
|
|
|
|
|
|
console.log(this.message)
|
|
|
- if (this.message.weekworkRegisters.length > 4){
|
|
|
+ if(this.message.weekworkRegisters!= null){
|
|
|
+ if (this.message.weekworkRegisters.length > 4){
|
|
|
this.number += (this.message.weekworkRegisters.length - 4)
|
|
|
}
|
|
|
+ }
|
|
|
+
|
|
|
},
|
|
|
/*
|
|
|
获取当前星期几
|