|
@@ -40,11 +40,11 @@
|
|
|
color: black;
|
|
|
"
|
|
|
>
|
|
|
- <tr height="30" align="center">
|
|
|
- <td colspan="3" height="40">{{ message.blogDate }}</td>
|
|
|
- <td colspan="2">星期</td>
|
|
|
- <td colspan="6">天气:{{ message.weather }}</td>
|
|
|
- <td colspan="3">值班员:{{ message.peopleName }}</td>
|
|
|
+ <tr height="30" align="center" style="border:none">
|
|
|
+ <td colspan="3" height="40" style="border:none">{{ message.blogDate }}</td>
|
|
|
+ <td colspan="2" style="border:none">{{ week }}</td>
|
|
|
+ <td colspan="6" style="border:none">天气:{{ message.weather }}</td>
|
|
|
+ <td colspan="3" style="border:none">值班员:{{ message.peopleName }}</td>
|
|
|
</tr>
|
|
|
<!-- 实力 -->
|
|
|
<tr class="JR_tr" height="30" align="center">
|
|
@@ -290,7 +290,7 @@
|
|
|
|
|
|
<!-- 临时来队亲属 -->
|
|
|
<tr class="JR_tr" height="30">
|
|
|
- <td rowspan="4" class="JR_left">
|
|
|
+ <td :rowspan="qinshu" class="JR_left">
|
|
|
<p align="center" style="margin: 0 15px">
|
|
|
临 <br />
|
|
|
时 <br />
|
|
@@ -312,8 +312,8 @@
|
|
|
<td class="JR_left" height="30" colspan="2">
|
|
|
<p align="center">时 间</p>
|
|
|
</td>
|
|
|
- <td class="JR_left" height="30" colspan="10" >
|
|
|
- <p align="center" style="letter-spacing: 16px">
|
|
|
+ <td class="JR_left" height="30" colspan="10">
|
|
|
+ <p align="center" style="letter-spacing: 12px">
|
|
|
病 号 及 处 理 情 况
|
|
|
</p>
|
|
|
</td>
|
|
@@ -330,7 +330,6 @@
|
|
|
>
|
|
|
<p align="left"></p>
|
|
|
</td>
|
|
|
-
|
|
|
</tr>
|
|
|
<tr class="JR_tr" v-for="(item1, i) in message.kinsfolk" :key="i">
|
|
|
<td class="JR_right" height="30">
|
|
@@ -339,6 +338,7 @@
|
|
|
<td class="JR_right" height="30">
|
|
|
<p align="center">{{ item1.name }}</p>
|
|
|
</td>
|
|
|
+
|
|
|
<td class="JR_right" height="30">
|
|
|
<p align="center">{{ item1.relation }}</p>
|
|
|
</td>
|
|
@@ -347,9 +347,9 @@
|
|
|
</td>
|
|
|
<td class="JR_right" height="30">
|
|
|
<p align="center">{{ item1.leaveDate }}</p>
|
|
|
- </td>
|
|
|
+ </td>
|
|
|
</tr>
|
|
|
-
|
|
|
+
|
|
|
<tr></tr>
|
|
|
<!-- <tr class="JR_tr" height="30">
|
|
|
<td class="JR_right" height="30"><p align="center"></p></td>
|
|
@@ -495,13 +495,14 @@ export default {
|
|
|
style:
|
|
|
".JR_tr {height: 40px;};.JR_left{text-align:center;font-size: 1.331em; font-family: '楷体_GB2312';};.JR_right{ font-size: 1.331em; font-family: 仿宋_GB2312;};.JR_bottom{border-left:0; font-size: 1.331em; font-family: 仿宋_GB2312; text-align: right}",
|
|
|
chapu: 4,
|
|
|
+ qinshu: 4,
|
|
|
+ week: "",
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
|
- // this.chapu();
|
|
|
- // this.chapus();
|
|
|
this.chapu = this.chapus();
|
|
|
- // console.log(this.chapus());
|
|
|
+ this.qinshu = this.qinshus();
|
|
|
+ this.week = this.getWeek(this.message.blogDate);
|
|
|
},
|
|
|
methods: {
|
|
|
daochu() {
|
|
@@ -509,9 +510,22 @@ export default {
|
|
|
},
|
|
|
chapus() {
|
|
|
return this.message.inspect.length + 1;
|
|
|
- // if (this.message.inspect.lenght > 3) {
|
|
|
- // this.chapu += this.message.inspect.lenght - 3;
|
|
|
- // }
|
|
|
+ },
|
|
|
+ qinshus() {
|
|
|
+ return this.message.kinsfolk.length + 2;
|
|
|
+ },
|
|
|
+
|
|
|
+ /*
|
|
|
+ 获取当前星期几
|
|
|
+ */
|
|
|
+ getWeek(dateString) {
|
|
|
+ var dateArray = dateString.split("-");
|
|
|
+ var date = new Date(
|
|
|
+ dateArray[0],
|
|
|
+ parseInt(dateArray[1] - 1),
|
|
|
+ dateArray[2]
|
|
|
+ );
|
|
|
+ return "星期" + "日一二三四五六".charAt(date.getDay());
|
|
|
},
|
|
|
},
|
|
|
};
|