|
|
@@ -57,7 +57,11 @@
|
|
|
<th style="width: 35%">重量</th>
|
|
|
<!-- <th style="width: 21%">订单日期</th>-->
|
|
|
</tr>
|
|
|
- <tr style="height: 35px" v-for="(item, index) in deliveryOrderMaterialList" :key="index">
|
|
|
+ <tr
|
|
|
+ style="height: 35px"
|
|
|
+ v-for="(item, index) in deliveryOrderMaterialList"
|
|
|
+ :key="index"
|
|
|
+ >
|
|
|
<td>{{ index + 1 }}</td>
|
|
|
<td>{{ item.materialName }}</td>
|
|
|
<td>{{ item.materialSpe }}{{ item.materialModel }}</td>
|
|
|
@@ -175,11 +179,14 @@
|
|
|
border="0"
|
|
|
cellpadding="10"
|
|
|
cellspacing="0"
|
|
|
- style="margin-left: 690px; font-size: 20px;height: 40px"
|
|
|
+ style="margin: auto; font-size: 20px;height: 40px"
|
|
|
width="1000px"
|
|
|
class="tablePart6"
|
|
|
>
|
|
|
<tr>
|
|
|
+ <th style="width: 28.5%;">
|
|
|
+ 注:此单据共计三联，需签字返回两联。
|
|
|
+ </th>
|
|
|
<th style="width: 14.5%;text-align: left">签收人及签收时间：</th>
|
|
|
</tr>
|
|
|
</table>
|
|
|
@@ -201,14 +208,14 @@
|
|
|
</div>-->
|
|
|
<!--设置中间的间隔以及虚线-->
|
|
|
<div style="height: 50px" v-show="index < 2"></div>
|
|
|
- <hr width="1500px" style="border:1px dashed black" v-show="index < 2"/>
|
|
|
- <div style="page-break-after:always" v-show="index ==1 && page"></div>
|
|
|
+ <hr width="1500px" style="border:1px dashed black" v-show="index < 2" />
|
|
|
+ <div style="page-break-after:always" v-show="index == 1 && page"></div>
|
|
|
</div>
|
|
|
</div>
|
|
|
<!-- <el-button style="margin-left: 45%;" type="primary" @click="getPdf()">
|
|
|
<i class="el-icon-download"></i>导出(pdf)
|
|
|
</el-button> -->
|
|
|
-<!-- <el-button type="primary" @click="backScan()">
|
|
|
+ <!-- <el-button type="primary" @click="backScan()">
|
|
|
<i class="el-icon-back"></i>返回
|
|
|
</el-button>-->
|
|
|
</div>
|
|
|
@@ -253,7 +260,7 @@ export default {
|
|
|
dataList: ['1', '2', '3'],
|
|
|
timer1: '',
|
|
|
//分页数据
|
|
|
- page: '',
|
|
|
+ page: ''
|
|
|
}
|
|
|
},
|
|
|
created() {
|
|
|
@@ -263,7 +270,6 @@ export default {
|
|
|
/*this.timer1 = setTimeout(this.print,2000);*/
|
|
|
// 六十秒不操作，自动返回扫码页面
|
|
|
const timer = setInterval(() => {
|
|
|
-
|
|
|
this.backScan()
|
|
|
}, 30000)
|
|
|
this.$once('hook:beforeDestroy', () => {
|
|
|
@@ -275,11 +281,11 @@ export default {
|
|
|
async getDeliveryOrder() {
|
|
|
let orderNumber = this.$route.query.orderNumber
|
|
|
//空对象设置为null值
|
|
|
- var deliver={};
|
|
|
+ var deliver = {}
|
|
|
await this.axios
|
|
|
.post('/api/v1/tms/getDeliveryOrder?orderNumber=' + orderNumber)
|
|
|
.then(res => {
|
|
|
- console.log("查询出来的数据")
|
|
|
+ console.log('查询出来的数据')
|
|
|
console.log(res.data)
|
|
|
this.orderNumber = res.data.orderNumber
|
|
|
this.carrierName = res.data.carrierName
|
|
|
@@ -296,10 +302,10 @@ export default {
|
|
|
this.deliveryAddress = res.data.deliveryAddress
|
|
|
this.deliveryOrderMaterialList = res.data.deliveryOrderMaterialList
|
|
|
this.note = res.data.note
|
|
|
- console.log("数据的长度"+res.data.deliveryOrderMaterialList.length)
|
|
|
- if (res.data.deliveryOrderMaterialList.length > 2){
|
|
|
- this.page=true
|
|
|
- }else if (res.data.deliveryOrderMaterialList.length ==1){
|
|
|
+ console.log('数据的长度' + res.data.deliveryOrderMaterialList.length)
|
|
|
+ if (res.data.deliveryOrderMaterialList.length > 2) {
|
|
|
+ this.page = true
|
|
|
+ } else if (res.data.deliveryOrderMaterialList.length == 1) {
|
|
|
this.deliveryOrderMaterialList.push(deliver)
|
|
|
console.log(this.deliveryOrderMaterialList)
|
|
|
}
|
luobang