|
|
@@ -28,8 +28,8 @@
|
|
|
border="0"
|
|
|
cellpadding="10"
|
|
|
cellspacing="0"
|
|
|
- style="margin: auto; font-size: 20px"
|
|
|
- width="1300px"
|
|
|
+ style="margin:auto; font-size: 20px"
|
|
|
+ width="1000px"
|
|
|
class="tablePart0"
|
|
|
>
|
|
|
<tr>
|
|
|
@@ -44,11 +44,11 @@
|
|
|
border="1"
|
|
|
cellpadding="10"
|
|
|
cellspacing="0"
|
|
|
- style="margin-top: 10px; text-align: center;height: 70px"
|
|
|
- width="1300px"
|
|
|
+ style="margin-top: 10px; text-align: center"
|
|
|
+ width="1000px"
|
|
|
class="tablePart1"
|
|
|
>
|
|
|
- <tr>
|
|
|
+ <tr style="height: 35px">
|
|
|
<th style="width: 5%; text-align: center">序号</th>
|
|
|
<th style="width: 23.5%; text-align: center">物资名称</th>
|
|
|
<th style="width: 22.5%; text-align: center">规格型号</th>
|
|
|
@@ -56,7 +56,7 @@
|
|
|
<th style="width: 35%">重量</th>
|
|
|
<!-- <th style="width: 21%">订单日期</th>-->
|
|
|
</tr>
|
|
|
- <tr 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>
|
|
|
@@ -72,7 +72,7 @@
|
|
|
cellpadding="10"
|
|
|
cellspacing="0"
|
|
|
style="border-top: 0px;height: 40px"
|
|
|
- width="1300px"
|
|
|
+ width="1000px"
|
|
|
class="tablePart2"
|
|
|
>
|
|
|
<tr>
|
|
|
@@ -89,7 +89,7 @@
|
|
|
cellpadding="10"
|
|
|
cellspacing="0"
|
|
|
style="border-top: 0px;height: 40px"
|
|
|
- width="1300px"
|
|
|
+ width="1000px"
|
|
|
class="tablePart3"
|
|
|
>
|
|
|
<tr>
|
|
|
@@ -106,7 +106,7 @@
|
|
|
cellpadding="10"
|
|
|
cellspacing="0"
|
|
|
style="border-top: 0px;height: 40px"
|
|
|
- width="1300px"
|
|
|
+ width="1000px"
|
|
|
class="tablePart4"
|
|
|
>
|
|
|
<tr>
|
|
|
@@ -122,8 +122,8 @@
|
|
|
border="1"
|
|
|
cellpadding="10"
|
|
|
cellspacing="0"
|
|
|
- style="border-top: 0px;height: 40px"
|
|
|
- width="1300px"
|
|
|
+ style="border-top: 0px;height: 45px"
|
|
|
+ width="1000px"
|
|
|
class="tablePart9"
|
|
|
>
|
|
|
<tr>
|
|
|
@@ -139,8 +139,8 @@
|
|
|
border="0"
|
|
|
cellpadding="10"
|
|
|
cellspacing="0"
|
|
|
- style="margin-left: 500px; font-size: 20px;height: 40px"
|
|
|
- width="1300px"
|
|
|
+ style="margin-left: 190px; font-size: 20px;height: 45px"
|
|
|
+ width="1000px"
|
|
|
class="tablePart6"
|
|
|
>
|
|
|
<tr>
|
|
|
@@ -174,8 +174,8 @@
|
|
|
border="0"
|
|
|
cellpadding="10"
|
|
|
cellspacing="0"
|
|
|
- style="margin-left: 500px; font-size: 20px;height: 40px"
|
|
|
- width="1300px"
|
|
|
+ style="margin-left: 190px; font-size: 20px;height: 40px"
|
|
|
+ width="1000px"
|
|
|
class="tablePart6"
|
|
|
>
|
|
|
<tr>
|
|
|
@@ -200,8 +200,9 @@
|
|
|
</table>
|
|
|
</div>-->
|
|
|
<!--设置中间的间隔以及虚线-->
|
|
|
- <div style="height: 80px"></div>
|
|
|
- <hr width="1500px" style="border:1px dashed black;height:1px" />
|
|
|
+ <div style="height: 60px" 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>
|
|
|
</div>
|
|
|
</div>
|
|
|
<!-- <el-button style="margin-left: 45%;" type="primary" @click="getPdf()">
|
|
|
@@ -250,7 +251,9 @@ export default {
|
|
|
htmlTitle: '客户换票送货单',
|
|
|
note: '',
|
|
|
dataList: ['1', '2', '3'],
|
|
|
- timer1: ''
|
|
|
+ timer1: '',
|
|
|
+ //分页数据
|
|
|
+ page: '',
|
|
|
}
|
|
|
},
|
|
|
created() {
|
|
|
@@ -269,12 +272,13 @@ export default {
|
|
|
})
|
|
|
},
|
|
|
methods: {
|
|
|
- getDeliveryOrder() {
|
|
|
+ async getDeliveryOrder() {
|
|
|
let orderNumber = this.$route.query.orderNumber
|
|
|
- this.axios
|
|
|
+ await this.axios
|
|
|
.post('/api/v1/tms/getDeliveryOrder?orderNumber=' + orderNumber)
|
|
|
.then(res => {
|
|
|
- console.log(res)
|
|
|
+ console.log("查询出来的数据")
|
|
|
+ console.log(res.data)
|
|
|
this.orderNumber = res.data.orderNumber
|
|
|
this.carrierName = res.data.carrierName
|
|
|
this.capacityNumber = res.data.capacityNumber
|
|
|
@@ -290,6 +294,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
|
|
|
+ }
|
|
|
document.getElementById('printReceipt').click()
|
|
|
})
|
|
|
},
|
luobang