Commit 2c407920 by qinjianhui

Merge branch 'dev_optimization' into 'dev'

Dev optimization

See merge request !168
parents 11c41656 82dafaa0
......@@ -395,6 +395,7 @@
v-model="searchForm.receiverCountry"
placeholder="收件国家"
clearable
multiple
:teleported="false"
style="width: 150px"
filterable
......@@ -1594,6 +1595,12 @@
</el-icon>
</div>
<div class="order-detail-item">
<span class="order-detail-item-label">商品总数量:</span>
<span class="order-detail-item-value" :title="row.productNum">
{{ row.productNum }}
</span>
</div>
<div class="order-detail-item">
<span class="order-detail-item-label">自定义标签:</span>
<span class="order-detail-item-value" :title="getTagName(row)">
{{ getTagName(row) }}
......@@ -4231,6 +4238,9 @@ const {
: undefined,
interceptStatus:
status.value === 'INTERCEPTED' ? interceptStatus.value : '',
receiverCountry: Array.isArray(searchForm.value?.receiverCountry)
? searchForm.value.receiverCountry.join(',')
: searchForm.value?.receiverCountry || '',
},
page,
pageSize,
......@@ -4241,6 +4251,7 @@ const {
...baseparams,
status: status.value,
interceptStatus: '',
receiverCountry: '',
},
page,
pageSize,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment