Merge branch 'bd-test' of gitee.com:cabbage_qd/web-base-admin into bd-online

This commit is contained in:
woody 2025-06-06 09:05:56 +08:00
commit 7bdeaa7496
8 changed files with 275 additions and 854 deletions

View File

@ -184,3 +184,13 @@ tbody {
}
}
.success-text{
color: #00B42A;
}
.error-text{
color: #FF0000;
}
.normal-text{
color: #000000;
}

View File

@ -5,12 +5,16 @@
<el-form ref="form" :model="form" label-width="100px">
<template>
<div class="mainbtn">
<el-button size="small" class="thebtn1" @click="handleImport"
> {{ '导入' }}</el-button
>
<el-button size="small" class="thebtn2" @click="importTemplate"
> {{ '下载模板' }}</el-button
>
<el-button
size="small"
class="thebtn1"
@click="handleImport"
> {{ '导入' }}</el-button>
<el-button
size="small"
class="thebtn2"
@click="importTemplate"
> {{ '下载模板' }}</el-button>
</div>
</template>
@ -19,21 +23,21 @@
<el-col :span="5">
<el-form-item :label="'会员编号'">
<el-input
v-model="form.memberCode"
clearable
style="width: 200px"
v-model="form.memberCode"
@blur="checkName"
></el-input>
/>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item :label="'会员姓名'">
<el-input
v-model="form.memberName"
clearable
style="width: 200px"
v-model="form.memberName"
disabled
></el-input>
/>
</el-form-item>
</el-col>
<el-col :span="6">
@ -41,19 +45,17 @@
class="my_search"
style="margin-left: 30px"
@click="getList"
> {{ '搜索' }}</el-button
>
> {{ '搜索' }}</el-button>
<el-button class="my_reset" @click="reset"> {{ '重置' }}</el-button>
</el-col>
</el-row>
<el-form-item :label="'充值方式'">
<el-radio-group v-model="rechargeMethod">
<el-radio
:label="item.value"
v-for="(item, index) in czWayList"
:key="index"
>{{ item.label }}</el-radio
>
:label="item.value"
>{{ item.label }}</el-radio>
</el-radio-group>
</el-form-item>
<el-table
@ -68,15 +70,13 @@
prop="memberCode"
:label="'会员编号'"
min-width="120px"
>
</el-table-column>
/>
<el-table-column
align="center"
prop="memberName"
:label="'会员姓名'"
min-width="120px"
>
</el-table-column>
/>
<el-table-column
align="center"
prop="paymentMethod"
@ -85,33 +85,35 @@
>
<template slot-scope="scope">
<el-select
v-model="scope.row.paymentMethod"
clearable
:placeholder="'请选择'"
v-model="scope.row.paymentMethod"
>
<el-option
v-for="item in paymentTypeList"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
/>
</el-select>
</template>
</el-table-column>
<el-table-column
min-width="150px"
v-for="(item, index) in enumsAccountList"
:key="index"
min-width="150px"
align="center"
:prop="`${item.pkId}`"
:label="item.pkTransactionKeyVal + `${'变更'}(${getUser.currency.symbol})`"
>
<template slot-scope="scope">
<el-input
clearable
<el-input-number
v-model="scope.row.rechargeDetailMap[`${item.pkId}`]"
>
</el-input>
clearable
size="small"
:min="0"
:controls="false"
/>
</template>
</el-table-column>
<el-table-column
@ -121,7 +123,7 @@
min-width="120px"
>
<template slot-scope="scope">
<el-input v-model="scope.row.memberRemarks"></el-input>
<el-input v-model="scope.row.memberRemarks" />
</template>
</el-table-column>
<el-table-column
@ -131,7 +133,7 @@
:label="'备注(后台)'"
>
<template slot-scope="scope">
<el-input v-model="scope.row.remarks"></el-input>
<el-input v-model="scope.row.remarks" />
</template>
</el-table-column>
</el-table>
@ -141,12 +143,11 @@
<div class="footer">
<div style="margin: 0 auto">
<el-button
v-has-buttons="['ChongzhiConfirm']"
type="primary"
class="thebtn"
@click="saveDate('form')"
v-has-buttons="['ChongzhiConfirm']"
> {{ '确认' }}</el-button
>
> {{ '确认' }}</el-button>
</div>
</div>
</div>
@ -170,223 +171,225 @@
:auto-upload="false"
drag
>
<i class="el-icon-upload"></i>
<i class="el-icon-upload" />
<div class="el-upload__text">
{{'将文件拖到此处,或'}}
<em>{{'点击上传'}}</em>
{{ '将文件拖到此处,或' }}
<em>{{ '点击上传' }}</em>
</div>
<div class="el-upload__tip" slot="tip">
<el-link type="info" style="font-size: 12px" @click="importTemplate"
> {{ '下载模板' }}</el-link
>
<div slot="tip" class="el-upload__tip">
<el-link
type="info"
style="font-size: 12px"
@click="importTemplate"
> {{ '下载模板' }}</el-link>
</div>
<div class="el-upload__tip" style="color: red" slot="tip">
{{'提示仅允许导入“xls”或“xlsx”格式文件'}}
<div slot="tip" class="el-upload__tip" style="color: red">
{{ '提示仅允许导入“xls”或“xlsx”格式文件' }}
</div>
</el-upload>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitFileForm">{{'确认'}}</el-button>
<el-button @click="upload.open = false">{{'取消'}}</el-button>
<el-button type="primary" @click="submitFileForm">{{ '确认' }}</el-button>
<el-button @click="upload.open = false">{{ '取消' }}</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import FileUpload from "@/components/FileUpload";
import { getToken } from "@/utils/auth";
import { mapGetters } from "vuex";
<script>
import FileUpload from '@/components/FileUpload'
import { getToken } from '@/utils/auth'
import { mapGetters } from 'vuex'
import {
getenumsCzAccount,
getpaymentType,
getrechargeMethod,
changeAccountType,
getMemberName,
} from "@/api/financial";
import { stateFormat } from "@/utils/numberToCurrency";
getMemberName
} from '@/api/financial'
import { stateFormat } from '@/utils/numberToCurrency'
export default {
name: "Chongzhi",
name: 'Chongzhi',
components: {
FileUpload,
FileUpload
},
computed: {
...mapGetters(["getUser"]),
...mapGetters(['getUser'])
},
data() {
return {
tableData: [],
form: {
memberCode: "", //
memberName: null, //
memberCode: '', //
memberName: null, //
rechargeDetailMap: {},
paymentMethod: [], //
paymentMethod: [] //
},
rechargeMethod: 1, //
enumsAccountList: [], //
paymentTypeList: [], //
czWayList: [], //
rechargeMethod: 1, //
enumsAccountList: [], //
paymentTypeList: [], //
czWayList: [], //
upload: {
//
open: false,
//
title: "",
title: '',
//
isUploading: false,
//
updateSupport: 0,
//
headers: { Authorization: "Bearer " + getToken() },
headers: { Authorization: 'Bearer ' + getToken() },
//
url:
process.env.VUE_APP_BASE_API +
"/member/manager/recharge/import-member-code",
},
};
'/member/manager/recharge/import-member-code'
}
}
},
created() {
//
this.getenumsCzAccount();
//
this.getpaymentType();
//
this.getrechargeMethod();
//
this.getenumsCzAccount()
//
this.getpaymentType()
//
this.getrechargeMethod()
},
methods: {
stateFormat,
//
//
importTemplate() {
this.download(
"/member/manager/recharge/download-template",
'/member/manager/recharge/download-template',
{},
`${'模板'}${new Date().getTime()}.xlsx`
);
)
},
/** 导入按钮操作 */
handleImport() {
this.upload.title = '导入';
this.upload.open = true;
this.upload.title = '导入'
this.upload.open = true
},
//
handleFileUploadProgress(event, file, fileList) {
this.upload.isUploading = true;
this.upload.isUploading = true
},
//
handleFileSuccess(response, file, fileList) {
this.tableData = [];
this.tableData = []
if (response.code === 200 && response.data) {
const rechargeDetailMap = {};
const rechargeDetailMap = {}
this.enumsAccountList.forEach((item) => {
rechargeDetailMap[item.pkId] = "";
});
rechargeDetailMap[item.pkId] = ''
})
response.data.forEach((item) => {
if (item.rechargeDetail) {
item.rechargeDetailMap = { ...JSON.parse(item.rechargeDetail) };
this.tableData.push(item);
item.rechargeDetailMap = { ...JSON.parse(item.rechargeDetail) }
this.tableData.push(item)
} else {
item.rechargeDetailMap = { ...rechargeDetailMap };
this.tableData.push(item);
item.rechargeDetailMap = { ...rechargeDetailMap }
this.tableData.push(item)
}
});
})
}
this.upload.open = false;
this.upload.isUploading = false;
this.$refs.upload.clearFiles();
this.upload.open = false
this.upload.isUploading = false
this.$refs.upload.clearFiles()
this.$message({
message: response.msg,
type: "success",
});
type: 'success'
})
},
getList() {
changeAccountType({
memberCode: this.form.memberCode,
memberName: this.form.memberName,
memberName: this.form.memberName
}).then((res) => {
res.data.forEach((ele) => {
ele.rechargeDetailMap = {};
});
this.tableData = res.data;
});
ele.rechargeDetailMap = {}
})
this.tableData = res.data
})
},
//
handleExceed() {
this.upload.isUploading = false;
this.msgInfo('仅可上传一个文件哦');
this.upload.isUploading = false
this.msgInfo('仅可上传一个文件哦')
},
//
submitFileForm() {
this.$refs.upload.submit();
this.$refs.upload.submit()
},
//
//
checkName() {
getMemberName({ memberCode: this.form.memberCode }).then((res) => {
this.form.memberName = res.memberName;
});
this.form.memberName = res.memberName
})
},
reset() {
this.form.memberCode = "";
this.form.memberName = "";
this.getList();
this.form.memberCode = ''
this.form.memberName = ''
this.getList()
},
//
//
saveDate(formName) {
if (!this.rechargeMethod) {
this.$message({
message: '请先选择充值方式',
type: "warning",
});
return;
type: 'warning'
})
return
} else {
this.$refs[formName].validate((valid) => {
if (valid) {
let shouldTerminate = false;
let shouldTerminate = false
this.tableData.forEach((ele) => {
if (!ele.paymentMethod) {
shouldTerminate = true;
shouldTerminate = true
this.$message({
message: '交款方式不能为空',
type: "warning",
});
return;
type: 'warning'
})
return
}
});
})
if (!shouldTerminate) {
this.$router.push({
path: "/information/business/czzxqc",
path: '/information/business/czzxqc',
query: {
data: "",
data: '',
czlx: 2,
detailParams: JSON.stringify(this.tableData),
rechargeMethod: this.rechargeMethod,
},
});
rechargeMethod: this.rechargeMethod
}
})
}
}
});
})
}
},
getrechargeMethod() {
getrechargeMethod().then((res) => {
this.czWayList = res.data;
});
this.czWayList = res.data
})
},
getpaymentType() {
getpaymentType().then((res) => {
this.paymentTypeList = res.data;
});
this.paymentTypeList = res.data
})
},
getenumsCzAccount() {
getenumsCzAccount({ accountProperty: 1 }).then((res) => {
this.enumsAccountList = res.rows;
});
},
},
};
this.enumsAccountList = res.rows
})
}
}
}
</script>
<style lang="scss" scoped>

View File

@ -6,21 +6,21 @@
<el-col :span="6">
<el-form-item :label="'会员编号'">
<el-input
v-model="form.memberCode"
clearable
style="width: 200px"
v-model="form.memberCode"
@blur="checkName"
></el-input>
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="'会员姓名'">
<el-input
v-model="form.memberName"
clearable
style="width: 200px"
v-model="form.memberName"
disabled
></el-input>
/>
</el-form-item>
</el-col>
<el-col :span="6">
@ -29,11 +29,9 @@
style="margin-left: 30px"
@click="getList"
>
{{ '搜索' }}</el-button
>
{{ '搜索' }}</el-button>
<el-button class="my_reset" @click="reset">
{{ '重置' }}</el-button
>
{{ '重置' }}</el-button>
</el-col>
</el-row>
<!-- <el-form-item :label="'钱包类型'">
@ -62,11 +60,10 @@
<el-radio-group v-model="rechargeMethod">
1
<el-radio
:label="item.value"
v-for="(item, index) in czWayList"
:key="index"
>{{ item.label }}</el-radio
>
:label="item.value"
>{{ item.label }}</el-radio>
</el-radio-group>
</el-form-item>
<el-table
@ -81,15 +78,13 @@
prop="memberCode"
:label="'会员编号'"
min-width="120px"
>
</el-table-column>
/>
<el-table-column
align="center"
prop="memberName"
:label="'会员姓名'"
min-width="120px"
>
</el-table-column>
/>
<el-table-column
align="center"
prop="paymentMethod"
@ -98,37 +93,45 @@
>
<template slot-scope="scope">
<el-select
v-model="scope.row.paymentMethod"
clearable
:placeholder="'请选择'"
v-model="scope.row.paymentMethod"
>
<el-option
v-for="item in paymentTypeList"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
/>
</el-select>
</template>
</el-table-column>
<el-table-column
min-width="150px"
v-for="(item, index) in enumsAccountList"
:key="index"
min-width="150px"
align="center"
:prop="`${item.pkId}`"
:label="
item.pkTransactionKeyVal +
`${'变更'}(${getUser.currency.symbol})`
`${'变更'}(${getUser.currency.symbol})`
"
>
<template slot-scope="scope">
<el-input
clearable
<!-- <el-input
v-model="scope.row.rechargeDetailMap[`${item.pkId}`]"
>
</el-input>
clearable
type="number"
:min="0"
/> -->
<el-input-number
v-model="scope.row.rechargeDetailMap[`${item.pkId}`]"
clearable
size="small"
:min="0"
:controls="false"
/>
</template>
</el-table-column>
<el-table-column
@ -138,7 +141,7 @@
min-width="120px"
>
<template slot-scope="scope">
<el-input v-model="scope.row.memberRemarks"></el-input>
<el-input v-model="scope.row.memberRemarks" />
</template>
</el-table-column>
<el-table-column
@ -148,7 +151,7 @@
:label="'备注(后台)'"
>
<template slot-scope="scope">
<el-input v-model="scope.row.remarks"></el-input>
<el-input v-model="scope.row.remarks" />
</template>
</el-table-column>
</el-table>
@ -158,138 +161,137 @@
<div class="footer">
<div style="margin: 0 auto">
<el-button
v-has-buttons="['ChongzhiConfirm']"
type="primary"
class="thebtn"
@click="saveDate('form')"
v-has-buttons="['ChongzhiConfirm']"
>
{{ '确认' }}</el-button
>
{{ '确认' }}</el-button>
</div>
</div>
</div>
</template>
<script>
import { mapGetters } from "vuex";
import { mapGetters } from 'vuex'
import {
getenumsCzAccount,
getpaymentType,
getrechargeMethod,
changeAccountType,
getMemberName,
} from "@/api/financial";
import { stateFormat } from "@/utils/numberToCurrency";
getMemberName
} from '@/api/financial'
import { stateFormat } from '@/utils/numberToCurrency'
export default {
name: "Chongzhi",
name: 'Chongzhi',
computed: {
...mapGetters(["getUser"]),
...mapGetters(['getUser'])
},
data() {
return {
tableData: [],
form: {
memberCode: "", //
memberName: null, //
memberCode: '', //
memberName: null, //
rechargeDetailMap: {},
paymentMethod: [], //
paymentMethod: [] //
},
rechargeMethod: 1, //
enumsAccountList: [], //
paymentTypeList: [], //
czWayList: [], //
};
rechargeMethod: 1, //
enumsAccountList: [], //
paymentTypeList: [], //
czWayList: [] //
}
},
created() {
//
this.getenumsCzAccount();
//
this.getpaymentType();
//
this.getrechargeMethod();
//
this.getenumsCzAccount()
//
this.getpaymentType()
//
this.getrechargeMethod()
},
methods: {
stateFormat,
//
//
checkName() {
getMemberName({ memberCode: this.form.memberCode }).then((res) => {
this.form.memberName = res.memberName;
});
this.form.memberName = res.memberName
})
},
getList() {
changeAccountType({
memberCode: this.form.memberCode,
memberName: this.form.memberName,
memberName: this.form.memberName
}).then((res) => {
res.data.forEach((ele) => {
ele.rechargeDetailMap = {};
});
this.tableData = res.data;
});
ele.rechargeDetailMap = {}
})
this.tableData = res.data
})
},
reset() {
this.form.memberCode = "";
this.form.memberName = "";
this.getList();
this.form.memberCode = ''
this.form.memberName = ''
this.getList()
},
//
//
saveDate(formName) {
if (!this.rechargeMethod) {
this.$message({
message: '请先选择充值方式',
type: "warning",
});
return;
type: 'warning'
})
return
} else {
this.$refs[formName].validate((valid) => {
if (valid) {
let shouldTerminate = false;
let shouldTerminate = false
this.tableData.forEach((ele) => {
if (!ele.paymentMethod) {
shouldTerminate = true;
shouldTerminate = true
this.$message({
message: '交款方式不能为空',
type: "warning",
});
return;
type: 'warning'
})
return
}
});
})
if (!shouldTerminate) {
this.$router.push({
path: "/information/business/czzxqc",
path: '/information/business/czzxqc',
query: {
data: "",
data: '',
czlx: 1,
detailParams: JSON.stringify(this.tableData),
rechargeMethod: this.rechargeMethod,
},
});
rechargeMethod: this.rechargeMethod
}
})
}
}
});
})
}
},
getrechargeMethod() {
getrechargeMethod().then((res) => {
this.czWayList = res.data;
});
this.czWayList = res.data
})
},
getpaymentType() {
getpaymentType().then((res) => {
this.paymentTypeList = res.data;
});
this.paymentTypeList = res.data
})
},
getenumsCzAccount() {
getenumsCzAccount({ accountProperty: 1 }).then((res) => {
this.enumsAccountList = res.rows;
});
},
},
};
this.enumsAccountList = res.rows
})
}
}
}
</script>
<style lang="scss" scoped>

View File

@ -216,7 +216,7 @@
align="center"
prop="paymentBeforeBalance"
:label="'充前余额' + `(${isLocalSymbol()})`"
width="140"
width="120px"
:formatter="stateFormat"
/>
<el-table-column
@ -224,7 +224,7 @@
align="center"
prop="paymentAmount"
:label="'充值金额' + `(${isLocalSymbol()})`"
width="200px"
width="120px"
:formatter="stateFormat"
/>
<el-table-column
@ -232,7 +232,7 @@
align="center"
prop="paymentBalance"
:label="'当前余额' + `(${isLocalSymbol()})`"
width="140"
width="120px"
:formatter="stateFormat"
/>
<el-table-column
@ -291,8 +291,22 @@
v-if="listColumnVisible('approveStateVal')"
align="center"
prop="approveStateVal"
:label="'审核状态'"
/>
label="审核状态"
fixed="right"
>
<template #default="scope">
<!--approveStateVal= 审核通过 绿色=审核驳回 红色 =待审核 正常展示 -->
<span
:class="{
'success-text': scope.row.approveStateVal == '审核通过',
'error-text': scope.row.approveStateVal == '审核驳回',
'normal-text': scope.row.approveStateVal == '待审核'
}"
>
{{ scope.row.approveStateVal }}
</span>
</template>
</el-table-column>
</el-table>
</div>

View File

@ -552,33 +552,27 @@
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item
label="商品视频"
prop="videoUrl"
>
<!-- <el-input clearable v-model="form.name"
:placeholder="'请输入'"></el-input> -->
<!-- <UpDataImg :maxLength="1"
ref="upImg1"
@getImg="getImg1"
@delImg="delImg1"></UpDataImg> -->
<imageUpload
v-model="form.videoUrl"
:is-video="true"
/>
</el-form-item>
</el-col>
<!-- <el-col :span="8">
</el-col> -->
<el-col :span="8">
<el-form-item
label="视频封面"
label="商品封面"
prop="cover"
>
<imageUpload v-model="form.cover" />
</el-form-item>
</el-col> -->
</el-col>
</el-row>
<el-row>
<el-row style="margin-top: 10px; margin-bottom: 10px;">
<el-col :span="8">
<el-form-item
:label="'图片'"
@ -622,44 +616,26 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<!-- <el-row>
<el-col :span="8">
<el-form-item
:label="'图片'"
prop="cover4"
>
<!-- <el-input clearable v-model="form.name"
:placeholder="'请输入'"></el-input> -->
<!-- <UpDataImg :maxLength="1"
ref="upImg6"
@getImg="getImg6"
@delImg="delImg6"></UpDataImg> -->
<imageUpload v-model="form.cover4" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="'图片'">
<!-- <el-input clearable v-model="form.name"
:placeholder="'请输入'"></el-input> -->
<!-- <UpDataImg :maxLength="1"
ref="upImg7"
@getImg="getImg7"
@delImg="delImg7"></UpDataImg> -->
<imageUpload v-model="form.cover5" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="'图片'">
<!-- <el-input clearable v-model="form.name"
:placeholder="'请输入'"></el-input> -->
<!-- <UpDataImg :maxLength="1"
ref="upImg8"
@getImg="getImg8"
@delImg="delImg8"></UpDataImg> -->
<imageUpload v-model="form.cover6" />
</el-form-item>
</el-col>
</el-row>
</el-row> -->
<el-row>
<el-col :span="24">
<el-form-item
@ -1181,7 +1157,7 @@ export default {
// videoUrl: [
// { required: true, message: '', trigger: 'blur' }
// ],
// cover: [{ required: true, message: '', trigger: 'blur' }],
cover: [{ required: true, message: '请上传商品封面', trigger: 'blur' }],
cover1: [
{ required: true, message: '请上传图片', trigger: 'blur' }
],

View File

@ -521,45 +521,33 @@
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item
:label="'主视频'"
prop="videoUrl"
>
<!-- <el-input clearable v-model="form.name"
:placeholder="'请输入'"></el-input> -->
<!-- <UpDataImg :maxLength="1"
ref="upImg"
@getImg="getImg1"
@delImg="delImg1"></UpDataImg> -->
<imageUpload
v-model="form.videoUrl"
:is-video="true"
/>
</el-form-item>
</el-col>
<!-- <el-col :span="8">
</el-col> -->
<el-col :span="8">
<el-form-item
:label="'视频封面'"
label="商品封面"
prop="cover"
>
<imageUpload v-model="form.cover" />
</el-form-item>
</el-col> -->
</el-col>
</el-row>
<el-row>
<el-row style="margin-top: 10px; margin-bottom: 10px;">
<el-col :span="8">
<el-form-item
:label="'图片'"
prop="cover1"
>
<!-- <el-input clearable v-model="form.name"
:placeholder="'请输入'"></el-input> -->
<!-- <UpDataImg :maxLength="1"
ref="upImg"
@getImg="getImg3"
@delImg="delImg3"></UpDataImg> -->
<imageUpload v-model="form.cover1" />
</el-form-item>
</el-col>
@ -568,12 +556,6 @@
:label="'图片'"
prop="cover2"
>
<!-- <el-input clearable v-model="form.name"
:placeholder="'请输入'"></el-input> -->
<!-- <UpDataImg :maxLength="1"
ref="upImg"
@getImg="getImg4"
@delImg="delImg4"></UpDataImg> -->
<imageUpload v-model="form.cover2" />
</el-form-item>
</el-col>
@ -582,54 +564,30 @@
:label="'图片'"
prop="cover3"
>
<!-- <el-input clearable v-model="form.name"
:placeholder="'请输入'"></el-input> -->
<!-- <UpDataImg :maxLength="1"
ref="upImg"
@getImg="getImg5"
@delImg="delImg5"></UpDataImg> -->
<imageUpload v-model="form.cover3" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<!-- <el-row>
<el-col :span="8">
<el-form-item
:label="'图片'"
prop="cover4"
>
<!-- <el-input clearable v-model="form.name"
:placeholder="'请输入'"></el-input> -->
<!-- <UpDataImg :maxLength="1"
ref="upImg"
@getImg="getImg6"
@delImg="delImg6"></UpDataImg> -->
<imageUpload v-model="form.cover4" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="'图片'">
<!-- <el-input clearable v-model="form.name"
:placeholder="'请输入'"></el-input> -->
<!-- <UpDataImg :maxLength="1"
ref="upImg"
@getImg="getImg7"
@delImg="delImg7"></UpDataImg> -->
<imageUpload v-model="form.cover5" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="'图片'">
<!-- <el-input clearable v-model="form.name"
:placeholder="'请输入'"></el-input> -->
<!-- <UpDataImg :maxLength="1"
ref="upImg"
@getImg="getImg8"
@delImg="delImg8"></UpDataImg> -->
<imageUpload v-model="form.cover6" />
</el-form-item>
</el-col>
</el-row>
</el-row> -->
<el-row>
<el-col :span="24">
<el-form-item
@ -1137,7 +1095,7 @@ export default {
// videoUrl: [
// { required: true, message: '', trigger: 'blur' }
// ],
// cover: [{ required: true, message: '', trigger: 'blur' }],
cover: [{ required: true, message: '请上传商品封面', trigger: 'blur' }],
cover1: [
{ required: true, message: '请上传图片', trigger: 'blur' }
],

View File

@ -171,33 +171,24 @@
:formatter="stateFormat"
/>
<el-table-column
<!-- <el-table-column
v-if="allTxt.shareIncomeOri"
align="center"
prop="shareIncomeOri"
width="130"
:label="'分红收益' + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
/> -->
<el-table-column
v-if="allTxt.serviceIncomeOri"
align="center"
prop="serviceIncomeOri"
width="130"
:label="'报单收益' + `(${isLocalSymbol()})`"
:label="'服务补贴' + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<el-table-column
v-if="allTxt.repurRangeIncomeOri"
align="center"
prop="repurRangeIncomeOri"
width="130"
:formatter="stateFormat"
:label="'复购级差收益' + `(${isLocalSymbol()})`"
/>
<el-table-column
v-if="allTxt.repurExpandIncomeOri"
align="center"
@ -213,23 +204,6 @@
:label="'复购辅导收益' + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<el-table-column
v-if="allTxt.repurCouponOri"
align="center"
prop="repurCouponOri"
width="130"
:formatter="stateFormat"
:label="'复购券' + `(${isLocalSymbol()})`"
/>
<el-table-column
v-if="allTxt.repurCouponShareOri"
align="center"
prop="repurCouponShareOri"
width="130"
:formatter="stateFormat"
:label="'复购券均分'"
/>
<el-table-column
v-if="allTxt.backPointsOri"
@ -237,7 +211,7 @@
prop="backPointsOri"
width="130"
:formatter="stateFormat"
:label="'商城重消' + `(${isLocalSymbol()})`"
:label="'' + `(${isLocalSymbol()})`"
/>
<el-table-column
@ -249,24 +223,6 @@
:label="'平台服务费' + `(${isLocalSymbol()})`"
/>
<el-table-column
v-if="allTxt.globalPointsOri"
align="center"
prop="globalPointsOri"
width="130"
:label="$t('直推级差') + '(¥)'"
:formatter="stateFormat"
/>
<el-table-column
v-if="allTxt.carAwardPointsOri"
align="center"
prop="carAwardPointsOri"
width="130"
:label="'车奖积分'"
:formatter="stateFormat"
/>
<el-table-column
v-if="allTxt.purRealSubtotalOri"
align="center"
@ -275,22 +231,6 @@
:formatter="stateFormat"
:label="'首购实发小计' + `(${isLocalSymbol()})`"
/>
<!-- <el-table-column
v-if="allTxt.purRealSubtotal"
align="center"
prop="purRealSubtotal"
width="130"
:label="'首购实发小计' + '($)'"
:formatter="stateFormat"
/> -->
<el-table-column
v-if="allTxt.cloudRealSubtotalOri"
align="center"
prop="cloudRealSubtotalOri"
width="130"
:formatter="stateFormat"
:label="$t('级差小计') + '(¥)'"
/>
<el-table-column
v-if="allTxt.repurRealSubtotalOri"
@ -301,15 +241,6 @@
:label="'复购实发小计' + `(${isLocalSymbol()})`"
/>
<el-table-column
v-if="allTxt.repurCouponSubtotalOri"
align="center"
prop="repurCouponSubtotalOri"
width="160"
:formatter="stateFormat"
:label="'复购券实发小计' + `(${isLocalSymbol()})`"
/>
<el-table-column
v-if="allTxt.realIncomeTotalOri"
align="center"
@ -381,110 +312,8 @@ export default {
id: 0,
text: '全选',
checked: true
},
{
id: 21,
text: '直推收益' + '($)',
checked: true,
prop: 'firstBuyAmountDollar'
},
{
id: 22,
text: '拓展收益' + '($)',
checked: true,
prop: 'expandIncome'
},
{
id: 23,
text: '辅导收益' + '($)',
checked: true,
prop: 'coachIncome'
},
{
id: 24,
text: '分红收益' + '($)',
checked: true,
prop: 'shareIncome'
},
{
id: 25,
text: '报单收益' + '($)',
checked: true,
prop: 'serviceIncome'
},
{
id: 26,
text: this.$t('幸运收益') + '($)',
checked: true,
prop: 'cloudDirectIncome'
},
{
id: 27,
text: this.$t('级差收益') + '($)',
checked: true,
prop: 'cloudPurIncome'
},
{
id: 28,
text: this.$t('平级收益') + '($)',
checked: true,
prop: 'cloudRepurIncome'
},
{
id: 39,
text: '复购级差收益' + '($)',
checked: true,
prop: 'repurRangeIncome'
},
{
id: 30,
text: '复购拓展收益' + '($)',
checked: true,
prop: 'repurExpandIncome'
},
{
id: 31,
text: '复购券',
checked: true,
prop: 'repurCoupon',
flag: 1
},
{
id: 32,
text: '商城重消' + '($)',
checked: true,
prop: 'backPoints'
},
{
id: 35,
text: '平台服务费' + '($)',
checked: true,
prop: 'backPoints'
},
{
id: 44,
text: '首购实发小计' + '($)',
checked: true,
prop: 'purRealSubtotal'
},
{
id: 45,
text: this.$t('级差小计') + '($)',
checked: true,
prop: 'cloudRealSubtotal'
},
{
id: 46,
text: '复购实发小计' + '($)',
checked: true,
prop: 'repurRealSubtotal'
},
{
id: 47,
text: '实发收益总计' + '($)',
checked: true,
prop: 'realIncomeTotal'
}
],
creationTime: [],
creationTime1: [],
@ -524,212 +353,6 @@ export default {
memberList: [],
pkMemberTeam: [],
pkVertex: [],
dataList: [
{
name: 'memberCode',
key: ''
},
{
name: 'memberName',
key: ''
},
{
name: 'vertexName',
key: ''
},
{
name: 'teamName',
key: ''
},
{
name: 'period',
key: ''
},
{
name: 'settleDate',
key: ''
},
{
name: 'directIncomeOri',
key: ''
},
{
name: 'directIncome',
key: ''
},
{
name: 'expandIncomeOri',
key: ''
},
{
name: 'expandIncome',
key: ''
},
{
name: 'coachIncomeOri',
key: ''
},
{
name: 'coachIncome',
key: ''
},
{
name: 'shareIncomeOri',
key: ''
},
{
name: 'shareIncome',
key: ''
},
{
name: 'serviceIncomeOri',
key: ''
},
{
name: 'serviceIncome',
key: ''
},
{
name: 'cloudDirectIncomeOri',
key: ''
},
{
name: 'cloudDirectIncome',
key: ''
},
{
name: 'cloudPurIncomeOri',
key: ''
},
{
name: 'cloudPurIncome',
key: ''
},
{
name: 'cloudRepurIncomeOri',
key: ''
},
{
name: 'cloudRepurIncome',
key: ''
},
{
name: 'repurPushIncomeOri',
key: ''
},
{
name: 'repurPushIncome',
key: ''
},
{
name: 'repurRangeIncomeOri',
key: ''
},
{
name: 'repurRangeIncome',
key: ''
},
{
name: 'repurExpandIncomeOri',
key: ''
},
{
name: 'repurExpandIncome',
key: ''
},
{
name: 'repurCouponOri',
key: ''
},
{
name: 'repurCoupon',
key: ''
},
{
name: 'repurCouponShareOri',
key: ''
},
{
name: 'backPointsOri',
key: ''
},
{
name: 'backPoints',
key: ''
},
{
name: 'serviceSpendOri',
key: ''
},
{
name: 'serviceSpend',
key: ''
},
{
name: 'globalPoints',
key: ''
},
{
name: 'carAwardPoints',
key: ''
},
{
name: 'storeIncome',
key: ''
},
{
name: 'hiFunIncomeOri',
key: ''
},
{
name: 'makerDirectIncomeOri',
key: ''
},
{
name: 'makerShareIncomeOri',
key: ''
},
{
name: 'purRealSubtotalOri',
key: ''
},
{
name: 'purRealSubtotal',
key: ''
},
{
name: 'cloudRealSubtotalOri',
key: ''
},
{
name: 'cloudRealSubtotal',
key: ''
},
{
name: 'repurRealSubtotalOri',
key: ''
},
{
name: 'repurRealSubtotal',
key: ''
},
{
name: 'repurCouponSubtotalOri',
key: ''
},
{
name: 'makerRealSubtotalOri',
key: ''
},
{
name: 'realIncomeTotalOri',
key: ''
},
{
name: 'realIncomeTotal',
key: ''
}
],
flag: false,
allTxt: {},
pkTeamId: '', // id
@ -814,18 +437,7 @@ export default {
return year + '-' + month + '-' + day + ' '
},
isLocalSymbol,
// getUserRole() {
// getRoleMenu('BonusDetail').then((res) => {
// this.dataList.forEach((item) => {
// res.data.forEach((items) => {
// if (item.name == items) {
// item.key = items
// }
// })
// })
// this.flag = true
// })
// },
getUserRole() {
getRoleMenu('BonusDetail').then((res) => {
const obj = {}
@ -869,17 +481,6 @@ export default {
this.pkVertex = []
this.pkMemberTeam = []
},
getMenu(e, id) {
if (e && id == 0) {
this.menuList.forEach((item) => {
this.$set(item, 'checked', true)
})
} else if (!e && id == 0) {
this.menuList.forEach((item) => {
this.$set(item, 'checked', false)
})
}
},
getData() {
api.accountList().then((res) => {
this.acList = res.data

View File

@ -197,79 +197,16 @@
:label="'辅导收益' + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<!-- <el-table-column
v-if="allTxt.coachIncome"
align="center"
prop="coachIncome"
width="130"
:label="'辅导收益' + '($)'"
:formatter="stateFormat"
/> -->
<el-table-column
v-if="allTxt.shareIncomeOri"
align="center"
prop="shareIncomeOri"
width="130"
:label="'分红收益' + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<!-- <el-table-column
v-if="allTxt.shareIncome"
align="center"
prop="shareIncome"
width="130"
:label="'分红收益' + '($)'"
:formatter="stateFormat"
/> -->
<el-table-column
v-if="allTxt.serviceIncomeOri"
align="center"
prop="serviceIncomeOri"
width="130"
:label="'报单收益' + `(${isLocalSymbol()})`"
:label="'服务补贴' + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<!-- <el-table-column
v-if="allTxt.serviceIncome"
align="center"
prop="serviceIncome"
width="130"
:label="'报单收益' + '($)'"
:formatter="stateFormat"
/> -->
<el-table-column
v-if="allTxt.repurPushIncomeOri"
align="center"
prop="repurPushIncomeOri"
width="130"
:label="'复购推荐收益'+ `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<!-- <el-table-column
v-if="allTxt.repurPushIncome"
align="center"
prop="repurPushIncome"
width="130"
:label="'复购推荐收益' + '($)'"
:formatter="stateFormat"
/> -->
<el-table-column
v-if="allTxt.repurRangeIncomeOri"
align="center"
prop="repurRangeIncomeOri"
width="130"
:label="'复购级差收益' + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<!-- <el-table-column
v-if="allTxt.repurRangeIncome"
align="center"
prop="repurRangeIncome"
width="130"
:label="'复购级差收益' + '($)'"
:formatter="stateFormat"
/> -->
<el-table-column
v-if="allTxt.repurExpandIncomeOri"
align="center"
@ -286,47 +223,16 @@
:label="'复购辅导收益' + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<el-table-column
v-if="allTxt.repurCouponOri"
align="center"
prop="repurCouponOri"
width="130"
:label="'复购券' + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<el-table-column
v-if="allTxt.repurCouponShareOri"
align="center"
prop="repurCouponShareOri"
width="130"
:label="'复购券均分'"
:formatter="stateFormat"
/>
<!-- <el-table-column
v-if="allTxt.repurCouponShare"
align="center"
prop="repurCouponShare"
width="130"
:label="'复购券均分' + '($)'"
:formatter="stateFormat"
/> -->
<el-table-column
v-if="allTxt.backPointsOri"
align="center"
prop="backPointsOri"
width="130"
:label="'商城重消' + `(${isLocalSymbol()})`"
:label="'重复消费' + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<!-- <el-table-column
v-if="allTxt.backPoints"
align="center"
prop="backPoints"
width="130"
:label="'商城重消' + '($)'"
:formatter="stateFormat"
/> -->
<el-table-column
v-if="allTxt.serviceSpendOri"
align="center"
@ -335,39 +241,6 @@
:label="'平台服务费' + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<!-- <el-table-column
v-if="allTxt.serviceSpend"
align="center"
prop="serviceSpend"
width="130"
:label="'平台服务费' + '($)'"
:formatter="stateFormat"
/> -->
<el-table-column
v-if="allTxt.globalPointsOri"
align="center"
prop="globalPointsOri"
width="130"
:label="'直推级差' + '(¥)'"
:formatter="stateFormat"
/>
<!-- <el-table-column
v-if="allTxt.globalPoints"
align="center"
prop="globalPoints"
width="130"
:label="'直推级差' + '($)'"
:formatter="stateFormat"
/> -->
<el-table-column
v-if="allTxt.carAwardPointsOri"
align="center"
prop="carAwardPointsOri"
width="130"
:label="'车奖积分'"
:formatter="stateFormat"
/>
<el-table-column
v-if="allTxt.purRealSubtotalOri"
@ -394,22 +267,6 @@
:label="'复购实发小计' + '($)'"
:formatter="stateFormat"
/> -->
<el-table-column
v-if="allTxt.repurCouponSubtotalOri"
align="center"
prop="repurCouponSubtotalOri"
width="160"
:label="'复购券实发小计' + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<!-- <el-table-column
v-if="allTxt.repurCouponSubtotal"
align="center"
prop="repurCouponSubtotal"
width="160"
:label="'复购券实发小计' + `($)`"
:formatter="stateFormat"
/> -->
<el-table-column
v-if="allTxt.realIncomeTotalOri"