|
|
@@ -62,7 +62,12 @@
|
|
|
@keyup.enter.native="getData"
|
|
|
>
|
|
|
</el-input>
|
|
|
- <created-at-picker v-model="createdAt" @change="getData" name="下单" class="filter-item"></created-at-picker>
|
|
|
+ <created-at-picker
|
|
|
+ v-model="createdAt"
|
|
|
+ @change="getData"
|
|
|
+ name="下单"
|
|
|
+ class="filter-item"
|
|
|
+ ></created-at-picker>
|
|
|
</div>
|
|
|
<el-table
|
|
|
:data="tableData"
|
|
|
@@ -167,7 +172,12 @@ export default {
|
|
|
createdAt: [],
|
|
|
collectionId: '',
|
|
|
name: '',
|
|
|
- userId: ''
|
|
|
+ userId: '',
|
|
|
+ orderTypeOptions: [
|
|
|
+ { label: '单个藏品', value: 'NORMAL' },
|
|
|
+ { label: '合并订单', value: 'MIX' },
|
|
|
+ { label: '子订单', value: 'SUB' }
|
|
|
+ ]
|
|
|
};
|
|
|
},
|
|
|
computed: {
|
|
|
@@ -195,7 +205,8 @@ export default {
|
|
|
// sort: 'createdAt,desc',
|
|
|
query: {
|
|
|
del: false,
|
|
|
- source: 'TRANSFER'
|
|
|
+ source: 'TRANSFER',
|
|
|
+ orderType: 'NORMAL,SUB'
|
|
|
}
|
|
|
};
|
|
|
if (this.search) {
|
|
|
@@ -299,5 +310,4 @@ export default {
|
|
|
}
|
|
|
};
|
|
|
</script>
|
|
|
-<style lang="less" scoped>
|
|
|
-</style>
|
|
|
+<style lang="less" scoped></style>
|
