|
@@ -1155,7 +1155,6 @@
|
|
|
</div>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
- {{detailList}}
|
|
|
<el-table
|
|
|
:data="detailList"
|
|
|
tooltip-effect="dark"
|
|
@@ -1989,18 +1988,19 @@
|
|
|
<td colspan="2" v-else></td>
|
|
|
<td>流水号</td>
|
|
|
<td colspan="2" v-if="form.fBillno">
|
|
|
- {{ form.fBillno }}{{ lsTime }}
|
|
|
+ {{ form.fBillno }}-{{ lsTime }}
|
|
|
</td>
|
|
|
<td colspan="2" v-else></td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td>车号</td>
|
|
|
- <td colspan="2">{{ form.fTruckno }}</td>
|
|
|
+ <td colspan="2" v-if="Printinglist.length">{{ Printinglist[0].fTruckno }}</td>
|
|
|
+ <td colspan="2" v-else></td>
|
|
|
<td colspan="2">提单号</td>
|
|
|
<td colspan="3">{{ form.fMblno }}</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
- <td>货名</td>
|
|
|
+ <td style="width: 15%">货名</td>
|
|
|
<td>箱号</td>
|
|
|
<td>箱量</td>
|
|
|
<td>件数</td>
|
|
@@ -2093,12 +2093,13 @@
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td>车号</td>
|
|
|
- <td colspan="2">{{ form.fTruckno }}</td>
|
|
|
+ <td colspan="2" v-if="Printinglist.length">{{ Printinglist[0].fTruckno }}</td>
|
|
|
+ <td colspan="2" v-else></td>
|
|
|
<td colspan="2">提单号</td>
|
|
|
<td colspan="3">{{ form.fMblno }}</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
- <td>货名</td>
|
|
|
+ <td style="width: 15%">货名</td>
|
|
|
<td>箱号</td>
|
|
|
<td>箱量</td>
|
|
|
<td>件数</td>
|
|
@@ -5265,7 +5266,7 @@ export default {
|
|
|
date.getMonth() + 1 < 10
|
|
|
? "0" + (date.getMonth() + 1)
|
|
|
: date.getMonth() + 1;
|
|
|
- let D = date.getDate();
|
|
|
+ let D = date.getDate()<10?"0"+date.getDate():date.getDate();
|
|
|
e.fBsdate = Y + "-" + M + "-" + D;
|
|
|
}
|
|
|
});
|