|
@@ -7,7 +7,7 @@
|
|
|
<el-col :span="24" class="one"> <span>发货清单</span> </el-col>
|
|
|
<el-col class="top_btn"> <el-button type="primary" @click="toFile()">导出清单</el-button></el-col>
|
|
|
<el-col :span="24" class="two">
|
|
|
- <el-col :span="15" v-for="(item, index) in list" :key="index">
|
|
|
+ <el-col :span="24" v-for="(item, index) in list" :key="index">
|
|
|
<el-card class="box-card">
|
|
|
<el-col class="clearfix">
|
|
|
<el-col>收货人:{{ item.address.name }},{{ item.address.phone }}</el-col>
|
|
@@ -46,6 +46,7 @@ export default {
|
|
|
return {
|
|
|
list: [],
|
|
|
fields: [
|
|
|
+ // { label: '序号', model: 'index' },
|
|
|
{ label: '订单编号', model: 'order_no' },
|
|
|
{ label: '商品名称', model: 'goods.name' },
|
|
|
{ label: '商品规格', model: 'name' },
|
|
@@ -88,7 +89,7 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
info.push(...p2.goods);
|
|
|
- for (const p5 of info) {
|
|
|
+ for (const p5 of p2.goods) {
|
|
|
if (p5.gift && p5.gift.length != 0) {
|
|
|
for (const p6 of p5.gift) {
|
|
|
p6.gift_name = p6.goods_name;
|
|
@@ -215,7 +216,8 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
.two {
|
|
|
- margin: 5px 10%;
|
|
|
+ margin: 5px 0;
|
|
|
+ padding: 0 20px;
|
|
|
.data-table {
|
|
|
margin: 5px 0;
|
|
|
}
|