jufubao-admin-library 1.1.8 → 1.1.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -97,17 +97,39 @@
|
|
|
97
97
|
v-for="(prod, i) in scope.row.product_list"
|
|
98
98
|
:key="i"
|
|
99
99
|
>
|
|
100
|
-
<div class="table-product__img">
|
|
100
|
+
<div v-if="scope.row.scene==='online'" class="table-product__img">
|
|
101
101
|
<img :src="prod.product_thumb" alt="" />
|
|
102
102
|
</div>
|
|
103
|
-
<div class="table-
|
|
104
|
-
|
|
105
|
-
<
|
|
103
|
+
<div class="table-product__img" v-else></div>
|
|
104
|
+
<el-tooltip placement="top" v-if="scope.row.scene==='online'">
|
|
105
|
+
<div slot="content">
|
|
106
|
+
<div class="table-product__name">
|
|
107
|
+
<p>{{ prod.product_name}}</p>
|
|
108
|
+
<p>{{ prod.product_sku_name }}</p>
|
|
109
|
+
</div>
|
|
106
110
|
</div>
|
|
107
|
-
<div class="table-
|
|
111
|
+
<div class="table-product__name">
|
|
112
|
+
<p>{{ prod.product_name}}</p>
|
|
113
|
+
<p>{{ prod.product_sku_name }}</p>
|
|
114
|
+
</div>
|
|
115
|
+
</el-tooltip>
|
|
116
|
+
<el-tooltip v-else placement="top">
|
|
117
|
+
<div slot="content">
|
|
118
|
+
<div class="table-product__name">
|
|
119
|
+
<p>{{ prod.shop_name}}</p>
|
|
120
|
+
</div>
|
|
121
|
+
</div>
|
|
122
|
+
<div class="table-product__name">
|
|
123
|
+
<p>{{ prod.shop_name}}</p>
|
|
124
|
+
</div>
|
|
125
|
+
</el-tooltip>
|
|
126
|
+
<div v-if="scope.row.scene==='online'" class="table-product__id">
|
|
108
127
|
<p>{{ prod.product_id }}</p>
|
|
109
128
|
</div>
|
|
110
|
-
<div>
|
|
129
|
+
<div class="table-product__id" v-else>
|
|
130
|
+
<p>{{ prod.settle_tag_name }}</p>
|
|
131
|
+
</div>
|
|
132
|
+
<div v-if="scope.row.scene==='online'">
|
|
111
133
|
<p>
|
|
112
134
|
{{
|
|
113
135
|
`单价(${divide(prod.dist_price)})*数量(${
|
|
@@ -119,6 +141,15 @@
|
|
|
119
141
|
}}
|
|
120
142
|
</p>
|
|
121
143
|
</div>
|
|
144
|
+
<div v-else>
|
|
145
|
+
<p>
|
|
146
|
+
{{
|
|
147
|
+
`金额(${divide(prod.sale_price)})*平台折扣(${
|
|
148
|
+
prod.dist_discount_ratio
|
|
149
|
+
}%)`
|
|
150
|
+
}}
|
|
151
|
+
</p>
|
|
152
|
+
</div>
|
|
122
153
|
</div>
|
|
123
154
|
</template>
|
|
124
155
|
</xd-table>
|
|
@@ -228,7 +259,7 @@ export default {
|
|
|
228
259
|
type: "normal",
|
|
229
260
|
prop: "products",
|
|
230
261
|
align: "center",
|
|
231
|
-
minWidth:
|
|
262
|
+
minWidth: 500,
|
|
232
263
|
label: "商品图片/名称/ID/公式",
|
|
233
264
|
},
|
|
234
265
|
// { "type": "normal", "prop": "category_name", "align": "center", "minWidth": 200, "label": "公式" },
|
|
@@ -48,18 +48,42 @@
|
|
|
48
48
|
</template>
|
|
49
49
|
<template slot="products" slot-scope="scope">
|
|
50
50
|
<div class="table-product" v-for="(prod, i) in scope.row.product_list" :key="i">
|
|
51
|
-
<div class="table-product__img">
|
|
51
|
+
<div v-if="scope.row.scene==='online'" class="table-product__img">
|
|
52
52
|
<img :src="prod.product_thumb" alt="">
|
|
53
53
|
</div>
|
|
54
|
-
<div class="table-
|
|
54
|
+
<div v-else class="table-product__img"></div>
|
|
55
|
+
<div v-if="scope.row.scene==='online'" class="table-product__name">
|
|
55
56
|
<p>{{ prod.product_name}}</p>
|
|
56
57
|
</div>
|
|
57
|
-
<
|
|
58
|
+
<el-tooltip v-else placement="top">
|
|
59
|
+
<div slot="content">
|
|
60
|
+
<div class="table-product__name">
|
|
61
|
+
<p>{{ prod.shop_name}}</p>
|
|
62
|
+
</div>
|
|
63
|
+
</div>
|
|
64
|
+
<div class="table-product__name">
|
|
65
|
+
<p>{{ prod.shop_name}}</p>
|
|
66
|
+
</div>
|
|
67
|
+
</el-tooltip>
|
|
68
|
+
<div v-if="scope.row.scene==='online'" class="table-product__id">
|
|
58
69
|
<p>{{ prod.product_id}}</p>
|
|
59
70
|
</div>
|
|
60
|
-
<div>
|
|
61
|
-
<
|
|
62
|
-
|
|
71
|
+
<div v-else class="table-product__name">
|
|
72
|
+
<div>{{ prod.settle_tag_name}}</div>
|
|
73
|
+
</div>
|
|
74
|
+
<div v-if="scope.row.scene==='online'">
|
|
75
|
+
<p>金额：{{ divide(prod.sale_price) }} <br/>数量：{{ prod.product_num }}</p>
|
|
76
|
+
<!-- <p>{{ `金额：${prod.sale_price} 数量：${prod.product_num}` }}</p> -->
|
|
77
|
+
</div>
|
|
78
|
+
<div v-else>
|
|
79
|
+
<p>
|
|
80
|
+
{{
|
|
81
|
+
`金额(${divide(prod.sale_price)})*货源折扣(${
|
|
82
|
+
prod.purchase_discount_ratio
|
|
83
|
+
}%)`
|
|
84
|
+
}}
|
|
85
|
+
</p>
|
|
86
|
+
<!-- <p>{{ `金额：${prod.sale_price} 数量：${prod.product_num}` }}</p> -->
|
|
63
87
|
</div>
|
|
64
88
|
</div>
|
|
65
89
|
</template>
|
|
@@ -138,7 +162,7 @@ export default {
|
|
|
138
162
|
{ "type": "normal", "prop": "main_order_id", "align": "center", "width": 200, "label": "主单号" },
|
|
139
163
|
{ "type": "normal", "prop": "sub_order_id", "align": "center", "minWidth": 200, "label": "拆单号" },
|
|
140
164
|
{ "type": "normal", "prop": "address", "align": "center", "minWidth": 200, "label": "收货信息" },
|
|
141
|
-
{ "type": "normal", "prop": "products", "align": "center", "minWidth":
|
|
165
|
+
{ "type": "normal", "prop": "products", "align": "center", "minWidth": 500, "label": "商品图片/名称/ID/金额&数量" },
|
|
142
166
|
// { "type": "normal", "prop": "category_name", "align": "center", "minWidth": 200, "label": "公式" },
|
|
143
167
|
{ "type": "price", "prop": "amount", "align": "center", "width": 100, "label": "总价", "unit": "元"},
|
|
144
168
|
{ "type": "normal", "prop": "created_time", "align": "center", "minWidth": 200, "label": "下单时间" },
|
|
@@ -404,7 +428,7 @@ export default {
|
|
|
404
428
|
}
|
|
405
429
|
.table-product__id,
|
|
406
430
|
.table-product__name{
|
|
407
|
-
width:
|
|
431
|
+
width: 120px;
|
|
408
432
|
p{
|
|
409
433
|
width: 100%;
|
|
410
434
|
overflow: hidden;
|