Skip to content

F
factory_front
Commit 81cef81b by qinjianhui
Options

Merge branch 'dev' into 'master' 

Dev

See merge request !169
parents f6928cbc 2c407920
Showing with 11 additions and 0 deletions
src/views/order/podCN/index.vue
...@@ -395,6 +395,7 @@ ...@@ -395,6 +395,7 @@
v-model="searchForm.receiverCountry" v-model="searchForm.receiverCountry"
placeholder="收件国家" placeholder="收件国家"
clearable clearable
multiple
:teleported="false" :teleported="false"
style="width: 150px" style="width: 150px"
filterable filterable
...@@ -1594,6 +1595,12 @@ ...@@ -1594,6 +1595,12 @@
</el-icon> </el-icon>
</div> </div>
<div class="order-detail-item"> <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-label">自定义标签:</span>
<span class="order-detail-item-value" :title="getTagName(row)"> <span class="order-detail-item-value" :title="getTagName(row)">
{{ getTagName(row) }} {{ getTagName(row) }}
...@@ -4231,6 +4238,9 @@ const { ...@@ -4231,6 +4238,9 @@ const {
: undefined, : undefined,
interceptStatus: interceptStatus:
status.value === 'INTERCEPTED' ? interceptStatus.value : '', status.value === 'INTERCEPTED' ? interceptStatus.value : '',
receiverCountry: Array.isArray(searchForm.value?.receiverCountry)
? searchForm.value.receiverCountry.join(',')
: searchForm.value?.receiverCountry || '',
}, },
page, page,
pageSize, pageSize,
...@@ -4241,6 +4251,7 @@ const { ...@@ -4241,6 +4251,7 @@ const {
...baseparams, ...baseparams,
status: status.value, status: status.value,
interceptStatus: '', interceptStatus: '',
receiverCountry: '',
}, },
page, page,
pageSize, 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