|
@@ -76,7 +76,7 @@
|
76
|
76
|
</div>
|
77
|
77
|
</td>
|
78
|
78
|
<td v-if="index%2 !== 0" colspan="4" class="noborder">
|
79
|
|
- <span v-for="(subItem,subIndex) in returnListItem(goodsOrderList, index).Details" :key="subIndex">{{subItem.GoodsName}}({{subItem.SpecName}})</span>
|
|
79
|
+ <span v-for="(subItem,subIndex) in returnListItem(goodsOrderList, index).Details" :key="subIndex">{{subItem.GoodsName}}{{subItem.SpecName !== '' ? '(' + subItem.SpecName + ')' : ''}}</span>
|
80
|
80
|
</td>
|
81
|
81
|
<td v-if="index%2 !== 0" colspan="1" class="noborder">
|
82
|
82
|
<span v-for="(subItem,subIndex) in returnListItem(goodsOrderList, index).Details" :key="subIndex">x{{subItem.Number}}</span>
|
|
@@ -236,7 +236,7 @@ export default {
|
236
|
236
|
this.getGoodsOrderList(this.postData).then((res) => {
|
237
|
237
|
// console.log(JSON.stringify(res))
|
238
|
238
|
this.postData.page = res.page
|
239
|
|
- this.total = res.total
|
|
239
|
+ this.total = res.pagenum
|
240
|
240
|
})
|
241
|
241
|
},
|
242
|
242
|
printPdf (cl) {
|