|
|
@@ -142,7 +142,8 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column align="left" label="返利类型" prop="customerWalletId" min-width="160" show-overflow-tooltip>
|
|
|
<template slot-scope="scope">
|
|
|
- <el-select v-if="state2" v-model="scope.row.customerWalletId" placeholder="请选择">
|
|
|
+ <!-- v-if="state2" -->
|
|
|
+ <el-select v-model="scope.row.customerWalletId" placeholder="请选择">
|
|
|
<el-option
|
|
|
v-for="item in scope.row.walletList"
|
|
|
:key="item.customerWalletId"
|
|
|
@@ -151,9 +152,9 @@
|
|
|
>
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
- <el-select v-else v-model="scope.row.walletName" placeholder="请选择">
|
|
|
+ <!-- <el-select v-else v-model="scope.row.walletName" placeholder="请选择">
|
|
|
<el-option :label="scope.row.walletName" value=""> </el-option>
|
|
|
- </el-select>
|
|
|
+ </el-select> -->
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column align="left" label="返利总金额" prop="amount" min-width="160" show-overflow-tooltip>
|
|
|
@@ -237,6 +238,8 @@
|
|
|
<script>
|
|
|
import { getRebateOrderDetail, getRebateOrderUpdate } from '@/api/finance/rebate_list'
|
|
|
import { getCustomerList, getWalletCustomerList } from '@/api/finance/rebate_form'
|
|
|
+import { async } from 'q'
|
|
|
+import { tsThisType } from '@babel/types'
|
|
|
export default {
|
|
|
props: {
|
|
|
detailId: {
|
|
|
@@ -277,14 +280,21 @@ export default {
|
|
|
//获取详情数据
|
|
|
async getDataList() {
|
|
|
let res = await getRebateOrderDetail({ id: this.detailId })
|
|
|
- console.log(res, 11111)
|
|
|
// this.searchForm.rebateOrderId = res.data.id;
|
|
|
this.searchForm.theTime = res.data.theTime
|
|
|
// this.searchForm.createBy = res.data.createBy;
|
|
|
// this.searchForm.createTime = res.data.createTime;
|
|
|
this.searchForm.remark = res.data.remark
|
|
|
- this.dataList = res.data.items
|
|
|
this.state = res.data.examineStatus
|
|
|
+ res.data.items.map(async(k)=>{
|
|
|
+ const wallet = await getWalletCustomerList({
|
|
|
+ customerId: k.customerId,
|
|
|
+ type: 'REBATE'
|
|
|
+ })
|
|
|
+ this.$set(k, 'walletList', wallet.data)
|
|
|
+ })
|
|
|
+ this.dataList = res.data.items
|
|
|
+ // this.$set(this.dataList, 'walletList', wallet.data)
|
|
|
},
|
|
|
//保存
|
|
|
async addFn() {
|
zh