bug
This commit is contained in:
@@ -8,7 +8,7 @@
|
||||
<template slot="content">
|
||||
<ai-search-bar bottomBorder>
|
||||
<template #left>
|
||||
<ai-user-selecter :instance="instance" @change="onUserChange" :isMultiple="false" v-model="user">
|
||||
<ai-user-selecter :instance="instance" @change="onUserChange" :isMultiple="false">
|
||||
<div class="userSelcet">
|
||||
<span style="color: #606266;" v-if="search.createUserId">{{ name }}</span>
|
||||
<span v-else>兑换人</span>
|
||||
@@ -20,7 +20,7 @@
|
||||
v-model="search.source"
|
||||
clearable
|
||||
placeholder="请选择订单状态"
|
||||
:selectList="dict.getDict('EP_source')"
|
||||
:selectList="dict.getDict('merchandiseStatus')"
|
||||
@change="search.current = 1, getList()">
|
||||
</ai-select>
|
||||
<el-date-picker
|
||||
@@ -74,6 +74,8 @@
|
||||
<el-table-column slot="goods" width="240px" label="商品" align="left">
|
||||
<template slot-scope="{ row }">
|
||||
<div class="goods">
|
||||
<img :src="row.imageUrl">
|
||||
<span>{{ row.merchandiseName }}</span>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
@@ -107,6 +109,7 @@
|
||||
name: '',
|
||||
createUserId: ''
|
||||
},
|
||||
user: [],
|
||||
name: '',
|
||||
info: {},
|
||||
colConfigs: [
|
||||
@@ -120,9 +123,10 @@
|
||||
label: '兑换时间'
|
||||
},
|
||||
{
|
||||
prop: 'arriveAreaName',
|
||||
prop: 'status',
|
||||
align: 'center',
|
||||
label: '状态'
|
||||
label: '状态',
|
||||
formart: v => this.dict.getLabel('merchandiseStatus', v)
|
||||
}
|
||||
],
|
||||
ids: [],
|
||||
@@ -134,14 +138,18 @@
|
||||
},
|
||||
|
||||
created () {
|
||||
this.dict.load(['EP_riskLevel', 'EP_handleType', 'modeType', 'EP_riskStatus', 'EP_source']).then(() => {
|
||||
this.dict.load(['merchandiseStatus']).then(() => {
|
||||
this.getList()
|
||||
})
|
||||
},
|
||||
|
||||
methods: {
|
||||
onUserChange () {
|
||||
|
||||
},
|
||||
|
||||
getList () {
|
||||
this.instance.post(`/app/appepidemicpreventionregisterinfo/list`, null, {
|
||||
this.instance.post(`/app/appintegralmerchandiseorder/list`, null, {
|
||||
params: {
|
||||
...this.search,
|
||||
arriveAreaId: this.search.arriveAreaId,
|
||||
@@ -150,6 +158,7 @@
|
||||
}
|
||||
}).then(res => {
|
||||
if (res.code == 0) {
|
||||
console.log(res.data.records)
|
||||
this.tableData = res.data.records
|
||||
this.total = res.data.total
|
||||
}
|
||||
@@ -181,6 +190,17 @@
|
||||
|
||||
<style scoped lang="scss">
|
||||
.list {
|
||||
.goods {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
img {
|
||||
width: 80px;
|
||||
height: 80px;
|
||||
margin-right: 20px;
|
||||
}
|
||||
}
|
||||
|
||||
.userSelcet {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
Reference in New Issue
Block a user