angelo
/
web-retail-admin
3
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(member): 删除无用字段

This commit is contained in:
woody 2025-06-12 20:22:42 +08:00
parent 3232521cf1
commit 1bb7501b0f
12 changed files with 1401 additions and 1500 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.env.development
View File

@ -2,3 +2,4 @@
ENV = 'development' ENV = 'development'
VUE_APP_BASE_API = '/prod-api' VUE_APP_BASE_API = '/prod-api'
VUE_APP_ADDRESS1 = 'http://t-app.beida777.com/#/'

2
.env.production
View File

@ -3,4 +3,4 @@ ENV = 'production'
# base api # base api
VUE_APP_BASE_API = '/prod-api' VUE_APP_BASE_API = '/prod-api'
VUE_APP_ADDRESS = 'https://yx.hzs413.com/' VUE_APP_ADDRESS1 = 'http://t-app.beida777.com/#/'

2
i8n.js
View File

File diff suppressed because one or more lines are too long

465
src/views/configManage/retailLevel/index.vue
View File

@ -2,38 +2,36 @@
<div class="page"> <div class="page">
<topBar <topBar
v-if="topList.length > 0" v-if="topList.length > 0"
:topList="topList" :top-list="topList"
:moren="moren" :moren="moren"
></topBar> />
<div class="main"> <div class="main">
<div class="maintop"> <div class="maintop">
<div class="mainbtn"> <div class="mainbtn">
<el-button <el-button
v-hasButtons="['RetailLevelAdd']"
class="thebtn1" class="thebtn1"
@click="adddate()" @click="adddate()"
v-hasButtons="['RetailLevelAdd']" >{{ '添加' }}</el-button>
>{{ '添加' }}</el-button
>
<el-button <el-button
v-hasButtons="['RetailLevelExport']"
class="thebtn2" class="thebtn2"
@click="exported" @click="exported"
v-hasButtons="['RetailLevelExport']"
>
{{ '导出' }}</el-button
> >
{{ '导出' }}</el-button>
</div> </div>
</div> </div>
<div class="maintable"> <div class="maintable">
<el-table <el-table
:data="tableData"
v-loading="loading" v-loading="loading"
:data="tableData"
height="750px" height="750px"
style="width: 100%" style="width: 100%"
:header-cell-style="{ background: '#EEEEEE' }" :header-cell-style="{ background: '#EEEEEE' }"
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55"> </el-table-column> <el-table-column type="selection" width="55" />
<el-table-column <el-table-column
align="center" align="center"
prop="" prop=""
@ -45,136 +43,89 @@
style="width: 44px; height: 44px" style="width: 44px; height: 44px"
:src="scope.row.image" :src="scope.row.image"
alt="" alt=""
/> >
</template>
</el-table-column>
<el-table-column
align="center"
prop="jxmc"
:label="'国家'"
width="180"
>
<template slot-scope="scope">
<div class="tem">
<img :src="scope.row.nationalFlag2" alt="" />
<div>{{ scope.row.pkCountryName }}</div>
</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
prop="gradeName" prop="gradeName"
:label="'注册等级'" :label="'注册等级'"
width="180" width="180"
> />
</el-table-column>
<el-table-column <el-table-column
align="center" align="center"
prop="censusValueVal" prop="censusValueVal"
:label="'统计类型'" :label="'统计类型'"
> />
</el-table-column> <el-table-column
<el-table-column
align="center" align="center"
prop="startValue" prop="startValue"
:label="'统计数值'" :label="'统计数值'"
> />
</el-table-column>
<el-table-column <el-table-column
align="center" align="center"
prop="boxNumber" prop="boxNumber"
:label="$t('购买盒数')" :label="$t('购买盒数')"
> />
</el-table-column>
<el-table-column <el-table-column
align="center" align="center"
prop="boxTotal" prop="boxTotal"
:label="$t('累计盒数')" :label="$t('累计盒数')"
> />
</el-table-column>
<el-table-column <el-table-column
align="center" align="center"
prop="boxSmallTotal" prop="boxSmallTotal"
width='130' width="130"
:label="$t('小市场盒数')" :label="$t('小市场盒数')"
> />
</el-table-column>
<el-table-column <el-table-column
align="center"
prop="buyPrice"
:label="$t('购买价格')"
>
</el-table-column>
<el-table-column
align="center" align="center"
prop="algebra" prop="algebra"
:label="$t('代数')" :label="$t('代数')"
> />
</el-table-column>
<el-table-column
align="center"
prop="firstAlgebra"
width='140'
:label="$t('第一代平级')"
>
</el-table-column>
</el-table-column>
<el-table-column
align="center"
prop="secondAlgebra"
width='140'
:label="$t('第二代平级')"
>
</el-table-column>
</el-table-column>
<el-table-column
align="center"
prop="thirdAlgebra"
width='140'
:label="$t('第三代平级')"
>
</el-table-column>
<el-table-column <el-table-column
align="center" align="center"
prop="registerAuthorityVal" prop="registerAuthorityVal"
:label="'注册权限'" :label="'注册权限'"
> />
</el-table-column>
<el-table-column <el-table-column
align="center" align="center"
prop="pkAwardsVal" prop="pkAwardsVal"
:label="'真实奖衔'" :label="'真实奖衔'"
> />
</el-table-column>
<el-table-column <el-table-column
align="center" align="center"
prop="anames" prop="anames"
:label="'直推范围'" :label="'直推范围'"
> width="230"
</el-table-column> />
<el-table-column <el-table-column
align="center" align="center"
prop="time" prop="time"
:label="'操作'" :label="'操作'"
fixed="right" fixed="right"
width="90"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@click.native.prevent="update(scope.row, tableData)" v-has-buttons="['RetailLevelEdit']"
type="text" type="text"
size="small" size="small"
class="button-s" class="button-s"
style="color: #4391fd" style="color: #4391fd"
v-has-buttons="['RetailLevelEdit']" @click.native.prevent="update(scope.row, tableData)"
> >
{{ '修改' }} {{ '修改' }}
</el-button> </el-button>
<el-button <el-button
@click.native.prevent="updateState(scope.row, tableData)"
type="text" type="text"
size="small" size="small"
class="button-s" class="button-s"
style="color: #c73030" style="color: #c73030"
@click.native.prevent="updateState(scope.row, tableData)"
> >
<!-- 0启用1禁用 --> <!-- 0启用1禁用 -->
{{ {{
@ -214,21 +165,21 @@
<el-col :span="10" style="margin-left: -50px"> <el-col :span="10" style="margin-left: -50px">
<el-form-item :label="'注册等级'" prop="gradeName"> <el-form-item :label="'注册等级'" prop="gradeName">
<el-input <el-input
clearable
v-model="form.gradeName" v-model="form.gradeName"
clearable
placeholder="" placeholder=""
></el-input> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<el-form-item :label="'统计类型'" prop="censusValue"> <el-form-item :label="'统计类型'" prop="censusValue">
<el-select clearable v-model="form.censusValue" placeholder=""> <el-select v-model="form.censusValue" clearable placeholder="">
<el-option <el-option
v-for="item in censusValueList" v-for="item in censusValueList"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
></el-option> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -237,21 +188,21 @@
<el-col :span="10" style="margin-left: -50px"> <el-col :span="10" style="margin-left: -50px">
<el-form-item :label="'统计数值'" prop="startValue"> <el-form-item :label="'统计数值'" prop="startValue">
<el-input <el-input
clearable
v-model="form.startValue" v-model="form.startValue"
clearable
placeholder="" placeholder=""
></el-input> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<el-form-item :label="'真实奖衔'" prop="pkAwards"> <el-form-item :label="'真实奖衔'" prop="pkAwards">
<el-select clearable v-model="form.pkAwards" placeholder=""> <el-select v-model="form.pkAwards" clearable placeholder="">
<el-option <el-option
v-for="item in pkAwardsList" v-for="item in pkAwardsList"
:key="item.pkId" :key="item.pkId"
:label="item.awardsName" :label="item.awardsName"
:value="item.pkId" :value="item.pkId"
></el-option> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -260,8 +211,8 @@
<el-col :span="10" style="margin-left: -50px"> <el-col :span="10" style="margin-left: -50px">
<el-form-item :label="'注册权限'" prop="registerAuthority"> <el-form-item :label="'注册权限'" prop="registerAuthority">
<el-select <el-select
clearable
v-model="form.registerAuthority" v-model="form.registerAuthority"
clearable
placeholder="" placeholder=""
> >
<el-option <el-option
@ -269,19 +220,19 @@
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
></el-option> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<el-form-item required label="等级属性" prop="gradeValue"> <el-form-item required label="等级属性" prop="gradeValue">
<el-select clearable v-model="form.gradeValue" placeholder=""> <el-select v-model="form.gradeValue" clearable placeholder="">
<el-option <el-option
v-for="item in gradeSxList" v-for="item in gradeSxList"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
></el-option> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -290,19 +241,19 @@
<el-col :span="10" style="margin-left: -50px"> <el-col :span="10" style="margin-left: -50px">
<el-form-item label="购买盒数" prop="boxNumber"> <el-form-item label="购买盒数" prop="boxNumber">
<el-input <el-input
clearable
v-model="form.boxNumber" v-model="form.boxNumber"
clearable
placeholder="" placeholder=""
></el-input> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<el-form-item label="累计盒数" prop="boxTotal"> <el-form-item label="累计盒数" prop="boxTotal">
<el-input <el-input
clearable
v-model="form.boxTotal" v-model="form.boxTotal"
clearable
placeholder="" placeholder=""
></el-input> />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -310,19 +261,19 @@
<el-col :span="10" style="margin-left: -50px"> <el-col :span="10" style="margin-left: -50px">
<el-form-item label="小市场盒数" prop="boxSmallTotal"> <el-form-item label="小市场盒数" prop="boxSmallTotal">
<el-input <el-input
clearable
v-model="form.boxSmallTotal" v-model="form.boxSmallTotal"
clearable
placeholder="" placeholder=""
></el-input> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<el-form-item label="购买价格" prop="buyPrice"> <el-form-item label="购买价格" prop="buyPrice">
<el-input <el-input
clearable
v-model="form.buyPrice" v-model="form.buyPrice"
clearable
placeholder="" placeholder=""
></el-input> />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -330,19 +281,19 @@
<el-col :span="10" style="margin-left: -50px"> <el-col :span="10" style="margin-left: -50px">
<el-form-item label="代数" prop="algebra"> <el-form-item label="代数" prop="algebra">
<el-input <el-input
clearable
v-model="form.algebra" v-model="form.algebra"
clearable
placeholder="" placeholder=""
></el-input> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<el-form-item label="第一代平级(￥)" prop="firstAlgebra"> <el-form-item label="第一代平级(￥)" prop="firstAlgebra">
<el-input <el-input
clearable
v-model="form.firstAlgebra" v-model="form.firstAlgebra"
clearable
placeholder="" placeholder=""
></el-input> />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -350,19 +301,19 @@
<el-col :span="10" style="margin-left: -40px"> <el-col :span="10" style="margin-left: -40px">
<el-form-item label="第二代平级(￥)" prop="secondAlgebra"> <el-form-item label="第二代平级(￥)" prop="secondAlgebra">
<el-input <el-input
clearable
v-model="form.secondAlgebra" v-model="form.secondAlgebra"
clearable
placeholder="" placeholder=""
></el-input> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<el-form-item label="第三代平级(￥)" prop="thirdAlgebra"> <el-form-item label="第三代平级(￥)" prop="thirdAlgebra">
<el-input <el-input
clearable
v-model="form.thirdAlgebra" v-model="form.thirdAlgebra"
clearable
placeholder="" placeholder=""
></el-input> />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -374,8 +325,7 @@
v-for="item in gradeRangList" v-for="item in gradeRangList"
:key="item.pkId" :key="item.pkId"
:label="item.pkId" :label="item.pkId"
>{{ item.gradeName }}</el-checkbox >{{ item.gradeName }}</el-checkbox>
>
</el-checkbox-group> </el-checkbox-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -393,7 +343,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="颜色" prop="color"> <el-form-item label="颜色" prop="color">
<el-color-picker v-model="form.color"></el-color-picker> <el-color-picker v-model="form.color" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -406,16 +356,15 @@
class="submit" class="submit"
style="margin-left: 40px" style="margin-left: 40px"
@click="onSubmit('form')" @click="onSubmit('form')"
>{{ '确认' }}</el-button >{{ '确认' }}</el-button>
>
</span> </span>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import topBar from "@/components/topBar"; import topBar from '@/components/topBar'
import ImageUpload from "@/components/ImageUpload"; import ImageUpload from '@/components/ImageUpload'
import { import {
getGradeList, getGradeList,
getgradeRanglist, getgradeRanglist,
@ -427,31 +376,31 @@ import {
updateGrade, updateGrade,
saveGrade, saveGrade,
updateStatusGrade, updateStatusGrade,
getGradeValueList, getGradeValueList
} from "@/api/retailLevel"; } from '@/api/retailLevel'
import { userCountryList } from "@/api/user"; import { userCountryList } from '@/api/user'
export default { export default {
name: "RetailLevel", name: 'RetailLevel',
components: { components: {
topBar, topBar,
ImageUpload, ImageUpload
}, },
data() { data() {
return { return {
moren: "retailLevel", moren: 'retailLevel',
topList: [ topList: [
{ {
name: '等级配置', name: '等级配置',
path: "retailLevel", path: 'retailLevel'
}, },
{ {
name: '奖衔配置', name: '奖衔配置',
path: "retailJxpz", path: 'retailJxpz'
}, },
{ {
name: '复购极差', name: '复购极差',
path: "retailFgjc", path: 'retailFgjc'
}, }
// { // {
// name: '配送中心', // name: '配送中心',
// path: "pszx", // path: "pszx",
@ -461,256 +410,256 @@ export default {
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 50, pageSize: 50
}, },
tableData: [], tableData: [],
loading: false, loading: false,
total: 0, total: 0,
updateShow: false, updateShow: false,
countryList: [], //国家列表 countryList: [], // 国家列表
gradeValueList: [], //注册等级列表 gradeValueList: [], // 注册等级列表
pkAwardsList: [], //真实奖衔列表 pkAwardsList: [], // 真实奖衔列表
censusValueList: [], //统计类型列表 censusValueList: [], // 统计类型列表
registerAuthorityList: [], //注册权限列表 registerAuthorityList: [], // 注册权限列表
gradeRangList: [], //直推范围列表 gradeRangList: [], // 直推范围列表
gradeSxList: [], //等级属性 gradeSxList: [], // 等级属性
form: { form: {
gradeName: "", //注册等级 gradeName: '', // 注册等级
censusValue: "", //统计类型 censusValue: '', // 统计类型
startValue: "", //注册金额, startValue: '', // 注册金额,
pkAwards: "", //真实奖衔 pkAwards: '', // 真实奖衔
registerAuthority: "", //注册权限 registerAuthority: '', // 注册权限
gradeRang: [], //直推范围 gradeRang: [], // 直推范围
gradeValue: "", //等级属性 gradeValue: '', // 等级属性
image: "", image: '',
icon: "", icon: '',
boxNumber: "", boxNumber: '',
boxTotal: "", boxTotal: '',
boxSmallTotal: "", boxSmallTotal: '',
buyPrice: "", buyPrice: '',
algebra: "", algebra: '',
firstAlgebra: "", firstAlgebra: '',
secondAlgebra: "", secondAlgebra: '',
thirdAlgebra: "", thirdAlgebra: ''
}, },
rules: { rules: {
gradeName: [ gradeName: [
{ required: true, message: "请输入注册金额", trigger: "blur" }, { required: true, message: '请输入注册金额', trigger: 'blur' }
], ],
censusValue: [ censusValue: [
{ required: true, message: "请选择统计类型", trigger: "change" }, { required: true, message: '请选择统计类型', trigger: 'change' }
], ],
startValue: [ startValue: [
{ required: true, message: "请输入注册金额", trigger: "blur" }, { required: true, message: '请输入注册金额', trigger: 'blur' }
], ],
pkAwards: [ pkAwards: [
{ required: true, message: "请选择真实奖衔", trigger: "change" }, { required: true, message: '请选择真实奖衔', trigger: 'change' }
], ],
registerAuthority: [ registerAuthority: [
{ required: true, message: "请选择注册权限", trigger: "change" }, { required: true, message: '请选择注册权限', trigger: 'change' }
], ],
image: [ image: [
{ required: true, message: '请上传图片', trigger: "change" }, { required: true, message: '请上传图片', trigger: 'change' }
], ],
icon: [ icon: [
{ required: true, message: '请上传图标', trigger: "change" }, { required: true, message: '请上传图标', trigger: 'change' }
], ]
}, },
addEdit: "", addEdit: '',
dialogTitle: "", dialogTitle: ''
}; }
}, },
created() { created() {
this.getGradeList(); this.getGradeList()
this.getgradeRanglist(); this.getgradeRanglist()
this.getStatistical(); this.getStatistical()
this.getRegistration(); this.getRegistration()
this.getAwardsListChiose(); this.getAwardsListChiose()
this.userCountryList(); this.userCountryList()
this.getGradeValueList(); this.getGradeValueList()
}, },
methods: { methods: {
exported() { exported() {
this.$confirm('是否确认导出所有数据项?', '警告', { this.$confirm('是否确认导出所有数据项?', '警告', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: "warning", type: 'warning'
}).then((_) => { }).then((_) => {
this.download( this.download(
"/system/manage/retail-grade/export", '/system/manage/retail-grade/export',
{ ...this.queryParams }, { ...this.queryParams },
`${this.$t("等级配置")}${new Date().getTime()}.xlsx` `${this.$t('等级配置')}${new Date().getTime()}.xlsx`
); )
}); })
}, },
//等级属性下拉 // 等级属性下拉
getGradeValueList() { getGradeValueList() {
getGradeValueList().then((res) => { getGradeValueList().then((res) => {
this.gradeSxList = res.data; this.gradeSxList = res.data
}); })
}, },
//启用/禁用 // 启用/禁用
updateState(row) { updateState(row) {
this.$confirm('确认更改状态?', '提示', { this.$confirm('确认更改状态?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: "warning", type: 'warning'
}).then(() => { }).then(() => {
var thestate = ""; var thestate = ''
if (row.enableState == 0) { if (row.enableState == 0) {
thestate = 1; thestate = 1
} else if (row.enableState == 1) { } else if (row.enableState == 1) {
thestate = 0; thestate = 0
} }
updateStatusGrade({ pkId: row.pkId, enableState: thestate }).then( updateStatusGrade({ pkId: row.pkId, enableState: thestate }).then(
(res) => { (res) => {
if (res.code == 200) { if (res.code == 200) {
this.$message({ this.$message({
message: res.msg, message: res.msg,
type: "success", type: 'success'
}); })
// 获取列表 // 获取列表
} }
this.getGradeList(); this.getGradeList()
} }
); )
}); })
}, },
//获取国家 // 获取国家
userCountryList() { userCountryList() {
userCountryList().then((res) => { userCountryList().then((res) => {
this.countryList = res.data; this.countryList = res.data
}); })
}, },
//真实奖衔下拉列表 // 真实奖衔下拉列表
getAwardsListChiose() { getAwardsListChiose() {
getAwardsListChiose().then((res) => { getAwardsListChiose().then((res) => {
this.pkAwardsList = res.rows; this.pkAwardsList = res.rows
}); })
}, },
handleClose() { handleClose() {
this.updateShow = false; this.updateShow = false
this.$refs["form"].clearValidate(); this.$refs['form'].clearValidate()
this.$refs["form"].resetFields(); this.$refs['form'].resetFields()
}, },
//添加 // 添加
adddate() { adddate() {
this.dialogTitle = '添加'; this.dialogTitle = '添加'
this.updateShow = true; this.updateShow = true
this.addEdit = 1; this.addEdit = 1
this.$refs["form"].clearValidate(); this.$refs['form'].clearValidate()
this.$refs["form"].resetFields(); this.$refs['form'].resetFields()
}, },
//添加||修改提交 // 添加||修改提交
onSubmit(formName) { onSubmit(formName) {
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
if (valid) { if (valid) {
let url = ""; let url = ''
if (this.addEdit == 1) { if (this.addEdit == 1) {
//添加 // 添加
url = saveGrade; url = saveGrade
} else { } else {
//修改 // 修改
url = updateGrade; url = updateGrade
} }
url(this.form).then((res) => { url(this.form).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.updateShow = false; this.updateShow = false
this.$message({ this.$message({
message: res.msg, message: res.msg,
type: "success", type: 'success'
}); })
this.getGradeList(); this.getGradeList()
this.addEdit = ""; this.addEdit = ''
} }
}); })
} else { } else {
return false; return false
} }
}); })
}, },
//统计类型列表 // 统计类型列表
getStatistical() { getStatistical() {
getStatistical().then((res) => { getStatistical().then((res) => {
this.censusValueList = res.data; this.censusValueList = res.data
}); })
}, },
//注册权限列表 // 注册权限列表
getRegistration() { getRegistration() {
getRegistration().then((res) => { getRegistration().then((res) => {
this.registerAuthorityList = res.data; this.registerAuthorityList = res.data
}); })
}, },
//获取直推范围列表&&等级下拉 // 获取直推范围列表&&等级下拉
getgradeRanglist() { getgradeRanglist() {
getgradeRanglist().then((res) => { getgradeRanglist().then((res) => {
this.gradeRangList = res.data; this.gradeRangList = res.data
this.gradeValueList = res.data; this.gradeValueList = res.data
}); })
}, },
//获取等级配置列表 // 获取等级配置列表
getGradeList() { getGradeList() {
this.loading = true; this.loading = true
getGradeList(this.queryParams).then((res) => { getGradeList(this.queryParams).then((res) => {
res.rows.forEach((element) => { res.rows.forEach((element) => {
element.bnames = []; element.bnames = []
element.anames = ""; element.anames = ''
element.gseList.forEach((item) => { element.gseList.forEach((item) => {
element.bnames.push(item.pkScopeVal); element.bnames.push(item.pkScopeVal)
const str = element.bnames.join("/"); const str = element.bnames.join('/')
element.anames = str; element.anames = str
}); })
this.countryList.forEach((child) => { this.countryList.forEach((child) => {
if (element.pkCountry == child.pkCountry) { if (element.pkCountry == child.pkCountry) {
element.pkCountryName = child.name; element.pkCountryName = child.name
element.pkCountryIcon = child.nationalFlag2; element.pkCountryIcon = child.nationalFlag2
} }
}); })
}); })
this.tableData = res.rows; this.tableData = res.rows
this.total = res.total; this.total = res.total
this.loading = false; this.loading = false
}); })
}, },
//修改 // 修改
update(row, item) { update(row, item) {
this.dialogTitle = '修改'; this.dialogTitle = '修改'
this.updateShow = true; this.updateShow = true
this.addEdit = 2; this.addEdit = 2
getOnelist(row.pkId).then((res) => { getOnelist(row.pkId).then((res) => {
this.form = res.data; this.form = res.data
}); })
}, },
handleSelectionChange(val) { handleSelectionChange(val) {
this.multipleSelection = val; this.multipleSelection = val
}, },
//删除 // 删除
deleteRow(row, item) { deleteRow(row, item) {
this.$confirm('确定删除?').then((_) => { this.$confirm('确定删除?').then((_) => {
deleteGrade(row.pkId).then((res) => { deleteGrade(row.pkId).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.$message({ this.$message({
message: res.msg, message: res.msg,
type: "success", type: 'success'
}); })
this.getGradeList(); this.getGradeList()
} }
}); })
}); })
}, },
tableRowClassName({ row, rowIndex }) { tableRowClassName({ row, rowIndex }) {
if (rowIndex % 2 == 1) { if (rowIndex % 2 == 1) {
return "warning-row"; return 'warning-row'
} else if (rowIndex % 2 == 0) { } else if (rowIndex % 2 == 0) {
return "success-row"; return 'success-row'
} }
return ""; return ''
}, }
}, }
}; }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>

464
src/views/financial/rechargeDetail/index.vue
View File

@ -2,35 +2,35 @@
<div class="page"> <div class="page">
<topBar <topBar
v-if="topList.length > 0" v-if="topList.length > 0"
:topList="topList" :top-list="topList"
:moren="moren" :moren="moren"
></topBar> />
<div class="thetopbox"> <div class="thetopbox">
<el-form ref="form" :model="queryParams" label-width="100px"> <el-form ref="form" :model="queryParams" label-width="100px">
<el-row> <el-row>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'会员编号'" prop="teamCode"> <el-form-item :label="'会员编号'" prop="teamCode">
<el-input <el-input
clearable
v-model="queryParams.memberCode" v-model="queryParams.memberCode"
clearable
placeholder="" placeholder=""
></el-input> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'会员姓名'" prop="teamCode"> <el-form-item :label="'会员姓名'" prop="teamCode">
<el-input <el-input
clearable
v-model="queryParams.memberName" v-model="queryParams.memberName"
clearable
placeholder="" placeholder=""
></el-input> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'钱包类型'" prop="teamCode"> <el-form-item :label="'钱包类型'" prop="teamCode">
<el-select <el-select
clearable
v-model="queryParams.pkAccount" v-model="queryParams.pkAccount"
clearable
placeholder="" placeholder=""
> >
<el-option <el-option
@ -38,15 +38,15 @@
:key="item.pkId" :key="item.pkId"
:label="item.accountName" :label="item.accountName"
:value="item.pkId" :value="item.pkId"
></el-option> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'交款方式'" prop="teamCode"> <el-form-item :label="'交款方式'" prop="teamCode">
<el-select <el-select
clearable
v-model="queryParams.paymentMethod" v-model="queryParams.paymentMethod"
clearable
placeholder="" placeholder=""
> >
<el-option <el-option
@ -54,15 +54,15 @@
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
></el-option> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'审核状态'" prop="teamCode"> <el-form-item :label="'审核状态'" prop="teamCode">
<el-select <el-select
clearable
v-model="queryParams.approveState" v-model="queryParams.approveState"
clearable
placeholder="" placeholder=""
> >
<el-option <el-option
@ -70,40 +70,40 @@
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
></el-option> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'充值批次'" prop="teamCode"> <el-form-item :label="'充值批次'" prop="teamCode">
<el-input <el-input
clearable
v-model="queryParams.batch" v-model="queryParams.batch"
clearable
placeholder="" placeholder=""
></el-input> />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'操作人'" prop="teamCode"> <el-form-item :label="'操作人'" prop="teamCode">
<el-select clearable v-model="queryParams.creator" placeholder=""> <el-select v-model="queryParams.creator" clearable placeholder="">
<el-option <el-option
v-for="item in creatorList" v-for="item in creatorList"
:key="item.pkCreator" :key="item.pkCreator"
:label="item.memberName" :label="item.memberName"
:value="item.pkCreator" :value="item.pkCreator"
></el-option> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'操作备注'" prop="teamCode"> <el-form-item :label="'操作备注'" prop="teamCode">
<el-input <el-input
clearable
v-model="queryParams.remarks" v-model="queryParams.remarks"
clearable
placeholder="" placeholder=""
></el-input> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
@ -116,8 +116,7 @@
:start-placeholder="'开始日期'" :start-placeholder="'开始日期'"
:end-placeholder="'结束日期'" :end-placeholder="'结束日期'"
@change="changeCzsj" @change="changeCzsj"
> />
</el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
@ -130,8 +129,7 @@
:start-placeholder="'开始日期'" :start-placeholder="'开始日期'"
:end-placeholder="'结束日期'" :end-placeholder="'结束日期'"
@change="changeShsj" @change="changeShsj"
> />
</el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -140,193 +138,153 @@
<el-col :span="4"> <el-col :span="4">
<div class="searchbox"> <div class="searchbox">
<el-button <el-button
class="my_search"
v-has-buttons="['RechargeSearch']" v-has-buttons="['RechargeSearch']"
class="my_search"
@click="research()" @click="research()"
> >
{{ '搜索' }}</el-button {{ '搜索' }}</el-button>
>
<el-button class="my_reset" @click="reChongzhi"> <el-button class="my_reset" @click="reChongzhi">
{{ '重置' }}</el-button {{ '重置' }}</el-button>
>
</div> </div>
</el-col></el-row </el-col></el-row>
>
</el-form> </el-form>
</div> </div>
<div class="main"> <div class="main">
<div class="maintop"> <div class="maintop">
<div class="mainbtn"> <div class="mainbtn">
<el-button <el-button
v-has-buttons="['RechargeDetailExport']"
size="small" size="small"
class="thebtn1" class="thebtn1"
@click="handleExport" @click="handleExport"
v-has-buttons="['RechargeDetailExport']"
>
{{ '导出' }}</el-button
> >
{{ '导出' }}</el-button>
</div> </div>
</div> </div>
<el-table <el-table
:data="tableData"
v-loading="loading" v-loading="loading"
:data="tableData"
max-height="600px" max-height="600px"
style="width: 100%" style="width: 100%"
:header-cell-style="{ background: '#EEEEEE' }" :header-cell-style="{ background: '#EEEEEE' }"
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
@selection-change="handleSelectionChange"
:span-method="objectSpanMethod" :span-method="objectSpanMethod"
:show-summary="true" :show-summary="true"
:summary-method="summaryMethod" :summary-method="summaryMethod"
@selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="50"></el-table-column> <el-table-column type="selection" width="50" />
<el-table-column
align="center"
prop="pkCountryName"
:label="'国家'"
v-if="dataList[0].key"
>
<template slot-scope="scope">
<div class="tem">
<img :src="scope.row.pkCountryIcon" alt="" />
<div>{{ scope.row.pkCountryName }}</div>
</div>
</template>
</el-table-column>
<el-table-column <el-table-column
v-if="columnVisible('memberCode')"
min-width="120px" min-width="120px"
align="center" align="center"
prop="memberCode" prop="memberCode"
:label="'会员编号'" :label="'会员编号'"
v-if="dataList[1].key" />
>
</el-table-column>
<el-table-column <el-table-column
v-if="columnVisible('memberName')"
align="center" align="center"
prop="memberName" prop="memberName"
:label="'会员姓名'" :label="'会员姓名'"
v-if="dataList[2].key" min-width="120px"
> />
</el-table-column>
<el-table-column <el-table-column
v-if="columnVisible('pkAccountVal')"
align="center" align="center"
prop="pkAccountVal" prop="pkAccountVal"
:label="'钱包类型'" :label="'钱包类型'"
v-if="dataList[3].key" />
>
</el-table-column>
<el-table-column <el-table-column
v-if="columnVisible('paymentMethodVal')"
align="center" align="center"
prop="paymentMethodVal" prop="paymentMethodVal"
:label="'交款方式'" :label="'交款方式'"
v-if="dataList[4].key" />
>
</el-table-column>
<el-table-column <el-table-column
v-if="columnVisible('paymentBeforeBalance')"
align="center" align="center"
prop="paymentBeforeBalance" prop="paymentBeforeBalance"
:label="'充前余额' + `(${isLocalSymbol()})`" :label="'充前余额' + `(${isLocalSymbol()})`"
v-if="dataList[5].key"
width="140" width="140"
:formatter="stateFormat" :formatter="stateFormat"
> />
</el-table-column>
<el-table-column <el-table-column
v-if="columnVisible('paymentAmount')"
align="center" align="center"
prop="paymentAmount" prop="paymentAmount"
:label="'充值金额' + `(${isLocalSymbol()})`" :label="'充值金额' + `(${isLocalSymbol()})`"
v-if="dataList[6].key"
width="200px" width="200px"
:formatter="stateFormat" :formatter="stateFormat"
> />
</el-table-column>
<el-table-column <el-table-column
v-if="columnVisible('paymentBalance')"
align="center" align="center"
prop="paymentBalance" prop="paymentBalance"
:label="'当前余额' + `(${isLocalSymbol()})`" :label="'当前余额' + `(${isLocalSymbol()})`"
v-if="dataList[7].key"
width="140" width="140"
:formatter="stateFormat" :formatter="stateFormat"
> />
</el-table-column>
<el-table-column <el-table-column
align="center" v-if="columnVisible('exchangeRate')"
prop="settlePaymentAmount"
:label="'充值金额' + '($)'"
v-if="dataList[8].key"
min-width="200px"
:formatter="stateFormat"
>
</el-table-column>
<el-table-column
align="center" align="center"
prop="exchangeRate" prop="exchangeRate"
:label="'汇率'" :label="'汇率'"
v-if="dataList[9].key" />
>
</el-table-column>
<el-table-column <el-table-column
v-if="columnVisible('rechargeCode')"
align="center" align="center"
min-width="180px" min-width="180px"
prop="rechargeCode" prop="rechargeCode"
:label="'单据编号'" :label="'单据编号'"
v-if="dataList[10].key" />
>
</el-table-column>
<el-table-column <el-table-column
v-if="columnVisible('batch')"
align="center" align="center"
min-width="180px" min-width="180px"
prop="batch" prop="batch"
:label="'充值批次'" :label="'充值批次'"
v-if="dataList[11].key" />
>
</el-table-column>
<el-table-column <el-table-column
v-if="columnVisible('creator')"
align="center" align="center"
prop="creator" prop="creator"
:label="'操作人'" :label="'操作人'"
v-if="dataList[12].key" />
>
</el-table-column>
<el-table-column <el-table-column
v-if="columnVisible('creationTime')"
align="center" align="center"
prop="creationTime" prop="creationTime"
:label="'充值日期'" :label="'充值日期'"
v-if="dataList[13].key"
width="200" width="200"
> />
</el-table-column>
<el-table-column <el-table-column
v-if="columnVisible('remarks')"
align="center" align="center"
prop="remarks" prop="remarks"
:label="'操作备注'" :label="'操作备注'"
v-if="dataList[14].key" />
>
</el-table-column>
<el-table-column <el-table-column
v-if="columnVisible('approverName')"
align="center" align="center"
prop="approverName" prop="approverName"
:label="'审核人'" :label="'审核人'"
v-if="dataList[15].key" />
>
</el-table-column>
<el-table-column <el-table-column
v-if="columnVisible('approveTime')"
align="center" align="center"
prop="approveTime" prop="approveTime"
:label="'审核日期'" :label="'审核日期'"
v-if="dataList[16].key"
width="200" width="200"
> />
</el-table-column>
<el-table-column <el-table-column
v-if="columnVisible('approveStateVal')"
align="center" align="center"
prop="approveStateVal" prop="approveStateVal"
:label="'审核状态'" :label="'审核状态'"
v-if="dataList[17].key" fixed="right"
> />
</el-table-column>
</el-table> </el-table>
</div> </div>
@ -340,191 +298,195 @@
</div> </div>
</template> </template>
<script> <script>
import topBar from "@/components/topBar"; import topBar from '@/components/topBar'
import { userCountryList } from "@/api/user"; import { userCountryList } from '@/api/user'
import { isLocalSymbol } from "@/utils/numberToCurrency"; import { isLocalSymbol } from '@/utils/numberToCurrency'
import { import {
getenumsAccount, getenumsAccount,
getpaymentType, getpaymentType,
getApproveStatus, getApproveStatus,
getrechageList, getrechageList,
getCreatorList, getCreatorList
} from "@/api/financial"; } from '@/api/financial'
import { mapGetters } from "vuex"; import { mapGetters } from 'vuex'
import { stateFormat, numberToCurrencyNo } from "@/utils/numberToCurrency"; import { stateFormat, numberToCurrencyNo } from '@/utils/numberToCurrency'
import { getRoleMenu } from "@/api/notice"; import { getRoleMenu } from '@/api/notice'
export default { export default {
name: "Czmx", name: 'Czmx',
components: { components: {
topBar, topBar
}, },
data() { data() {
return { return {
moren: "czmx", moren: 'czmx',
topList: [ topList: [
{ {
name: '充值明细', name: '充值明细',
path: "czmx", path: 'czmx'
}, }
], ],
multipleSelection: [], multipleSelection: [],
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 50, pageSize: 50,
memberCode: "", //会员编号 memberCode: '', // 会员编号
memberName: "", //会员姓名 memberName: '', // 会员姓名
pkAccount: "", //钱包类型 pkAccount: '', // 钱包类型
paymentMethod: "", //交款方式 paymentMethod: '', // 交款方式
approveState: "", //审核状态 approveState: '', // 审核状态
batch: "", //充值批次 batch: '', // 充值批次
creator: "", //操作人 creator: '', // 操作人
remarks: "", //备注 remarks: '', // 备注
startDate: "", //充值开始时间 startDate: '', // 充值开始时间
endDate: "", //充值结束时间 endDate: '', // 充值结束时间
startApproveTime: "", //审核开始时间 startApproveTime: '', // 审核开始时间
endApproveTime: "", //审核结束时间 endApproveTime: '' // 审核结束时间
}, },
accountList: [], //钱包类型 accountList: [], // 钱包类型
paymentList: [], //交款方式 paymentList: [], // 交款方式
shStateList: [], //审核状态 shStateList: [], // 审核状态
creatorList: [], //操作人列表 creatorList: [], // 操作人列表
tableData: [], tableData: [],
loading:false, loading: false,
czsj: "", //充值时间 czsj: '', // 充值时间
shsj: "", //审核时间 shsj: '', // 审核时间
total: 0, total: 0,
countryList: [], countryList: [],
dataList: [ dataList: [
{ {
name: "pkCountryName", name: 'pkCountryName',
key: "", key: ''
}, },
{ {
name: "memberCode", name: 'memberCode',
key: "", key: ''
}, },
{ {
name: "memberName", name: 'memberName',
key: "", key: ''
}, },
{ {
name: "pkAccountVal", name: 'pkAccountVal',
key: "", key: ''
}, },
{ {
name: "paymentMethodVal", name: 'paymentMethodVal',
key: "", key: ''
}, },
{ {
name: "paymentBeforeBalance", name: 'paymentBeforeBalance',
key: "", key: ''
}, },
{ {
name: "paymentAmount", name: 'paymentAmount',
key: "", key: ''
}, },
{ {
name: "paymentBalance", name: 'paymentBalance',
key: "", key: ''
}, },
{ {
name: "settlePaymentAmount", name: 'settlePaymentAmount',
key: "", key: ''
}, },
{ {
name: "exchangeRate", name: 'exchangeRate',
key: "", key: ''
}, },
{ {
name: "rechargeCode", name: 'rechargeCode',
key: "", key: ''
}, },
{ {
name: "batch", name: 'batch',
key: "", key: ''
}, },
{ {
name: "creator", name: 'creator',
key: "", key: ''
}, },
{ {
name: "creationTime", name: 'creationTime',
key: "", key: ''
}, },
{ {
name: "remarks", name: 'remarks',
key: "", key: ''
}, },
{ {
name: "approverName", name: 'approverName',
key: "", key: ''
}, },
{ {
name: "approveTime", name: 'approveTime',
key: "", key: ''
}, },
{ {
name: "approveStateVal", name: 'approveStateVal',
key: "", key: ''
}, }
], ]
}; }
}, },
computed: { computed: {
...mapGetters(["getUser"]), ...mapGetters(['getUser'])
}, },
created() { created() {
this.research(); this.research()
this.getOthers(); this.getOthers()
this.getCountry(); this.getCountry()
this.getUserRole(); this.getUserRole()
}, },
methods: { methods: {
isLocalSymbol, isLocalSymbol,
columnVisible(column) {
console.log('🌈', column, this.dataList.find((item) => item.name === column))
return !!this.dataList.find((item) => item.name === column)?.key
},
getUserRole() { getUserRole() {
getRoleMenu("RechargeDetail").then((res) => { getRoleMenu('RechargeDetail').then((res) => {
this.dataList.forEach((item) => { this.dataList.forEach((item) => {
res.data.forEach((items) => { res.data.forEach((items) => {
if (item.name == items) { if (item.name == items) {
item.key = items; item.key = items
} }
// this.flag = true // this.flag = true
}); })
}); })
}); })
}, },
stateFormat, stateFormat,
getCountry() { getCountry() {
userCountryList().then((res) => { userCountryList().then((res) => {
this.countryList = res.data; this.countryList = res.data
}); })
}, },
changeCzsj(val) { changeCzsj(val) {
this.queryParams.startDate = val[0]; this.queryParams.startDate = val[0]
this.queryParams.endDate = val[1]; this.queryParams.endDate = val[1]
}, },
changeShsj(val) { changeShsj(val) {
this.queryParams.startApproveTime = val[0]; this.queryParams.startApproveTime = val[0]
this.queryParams.endApproveTime = val[1]; this.queryParams.endApproveTime = val[1]
}, },
getOthers() { getOthers() {
//钱包类型 // 钱包类型
getenumsAccount().then((res) => { getenumsAccount().then((res) => {
this.accountList = res.rows; this.accountList = res.rows
}); })
//交款方式 // 交款方式
getpaymentType().then((res) => { getpaymentType().then((res) => {
this.paymentList = res.data; this.paymentList = res.data
}); })
//审核状态 // 审核状态
getApproveStatus().then((res) => { getApproveStatus().then((res) => {
this.shStateList = res.data; this.shStateList = res.data
}); })
getCreatorList().then((res) => { getCreatorList().then((res) => {
this.creatorList = res.data; this.creatorList = res.data
}); })
}, },
research() { research() {
@ -532,77 +494,77 @@ export default {
// console.log('🌈',this.getUser) // console.log('🌈',this.getUser)
getrechageList(this.queryParams).then((res) => { getrechageList(this.queryParams).then((res) => {
res.rows.forEach((item) => { res.rows.forEach((item) => {
item.pkCountryName = this.getUser.country.shortName; item.pkCountryName = this.getUser.country.shortName
item.pkCountryIcon = this.getUser.country.nationalFlag2; item.pkCountryIcon = this.getUser.country.nationalFlag2
}); })
this.tableData = res.rows; this.tableData = res.rows
this.total = res.total; this.total = res.total
this.loading = false this.loading = false
}); })
}, },
reChongzhi() { reChongzhi() {
this.queryParams = { this.queryParams = {
pageNum: 1, pageNum: 1,
pageSize: 50, pageSize: 50,
memberCode: "", //会员编号 memberCode: '', // 会员编号
memberName: "", //会员姓名 memberName: '', // 会员姓名
pkAccount: "", //钱包类型 pkAccount: '', // 钱包类型
paymentMethod: "", //交款方式 paymentMethod: '', // 交款方式
approveState: "", //审核状态 approveState: '', // 审核状态
batch: "", //充值批次 batch: '', // 充值批次
creator: "", //操作人 creator: '', // 操作人
remarks: "", //备注 remarks: '', // 备注
startDate: "", //充值开始时间 startDate: '', // 充值开始时间
endDate: "", //充值结束时间 endDate: '', // 充值结束时间
startApproveTime: "", //审核开始时间 startApproveTime: '', // 审核开始时间
endApproveTime: "", //审核结束时间 endApproveTime: '' // 审核结束时间
}; }
this.shsj = []; this.shsj = []
this.czsj = []; this.czsj = []
this.research(); this.research()
}, },
handleSelectionChange(val) { handleSelectionChange(val) {
this.multipleSelection = val; this.multipleSelection = val
}, },
handleExport() { handleExport() {
this.$confirm('是否确认导出所有数据项?', '警告', { this.$confirm('是否确认导出所有数据项?', '警告', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: "warning", type: 'warning'
}).then((_) => { }).then((_) => {
this.download( this.download(
"/member/manager/recharge/export", '/member/manager/recharge/export',
{ ...this.queryParams }, { ...this.queryParams },
`${'充值明细'}${new Date().getTime()}.xlsx` `${'充值明细'}${new Date().getTime()}.xlsx`
); )
}); })
}, },
//合计行 // 合计行
summaryMethod({ columns, data }) { summaryMethod({ columns, data }) {
const sums = []; const sums = []
// 遍历所有列 // 遍历所有列
columns.forEach((column, index) => { columns.forEach((column, index) => {
if (index === 1) { if (index === 1) {
sums[index] = "合计"; sums[index] = '合计'
return; return
} }
if (column.property === "paymentAmount") { if (column.property === 'paymentAmount') {
const lastIndex1 = data.length - 1; const lastIndex1 = data.length - 1
sums[index] = data[lastIndex1] sums[index] = data[lastIndex1]
? numberToCurrencyNo(data[lastIndex1].paymentAmount) ? numberToCurrencyNo(data[lastIndex1].paymentAmount)
: ""; : ''
} else if (column.property === "settlePaymentAmount") { } else if (column.property === 'settlePaymentAmount') {
const lastIndex2 = data.length - 1; const lastIndex2 = data.length - 1
sums[index] = data[lastIndex2] sums[index] = data[lastIndex2]
? numberToCurrencyNo(data[lastIndex2].settlePaymentAmount) ? numberToCurrencyNo(data[lastIndex2].settlePaymentAmount)
: ""; : ''
} else { } else {
sums[index] = ""; sums[index] = ''
} }
}); })
console.log("🌈numberToCurrencyNo", sums); console.log('🌈numberToCurrencyNo', sums)
return sums; return sums
}, },
objectSpanMethod({ row, column, rowIndex, columnIndex }) { objectSpanMethod({ row, column, rowIndex, columnIndex }) {
// if (columnIndex === 0) { // if (columnIndex === 0) {
@ -621,14 +583,14 @@ export default {
}, },
tableRowClassName({ row, rowIndex }) { tableRowClassName({ row, rowIndex }) {
if (rowIndex % 2 == 1) { if (rowIndex % 2 == 1) {
return "warning-row"; return 'warning-row'
} else if (rowIndex % 2 == 0) { } else if (rowIndex % 2 == 0) {
return "success-row"; return 'success-row'
} }
return ""; return ''
}, }
}, }
}; }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>

32
src/views/information/member/index.vue
View File

@ -80,7 +80,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="$t('级差奖衔')" prop="pkAwards"> <el-form-item :label="$t('当月奖衔')" prop="pkAwards">
<el-select <el-select
v-model="queryParams.pkAwards" v-model="queryParams.pkAwards"
clearable clearable
@ -416,12 +416,7 @@
:label="'会员姓名'" :label="'会员姓名'"
width="180" width="180"
/> />
<el-table-column
v-if="allTxt.nickName"
align="center"
prop="nickName"
label="会员昵称"
/>
<el-table-column <el-table-column
v-if="allTxt.phone" v-if="allTxt.phone"
align="center" align="center"
@ -447,7 +442,7 @@
v-if="allTxt.pkAwardsVal" v-if="allTxt.pkAwardsVal"
align="center" align="center"
prop="pkAwardsVal" prop="pkAwardsVal"
:label="$t('级差奖衔')" :label="$t('当月奖衔')"
width="180" width="180"
/> />
<el-table-column <el-table-column
@ -636,7 +631,7 @@
> >
{{ '登录' }} {{ '登录' }}
</el-button> </el-button>
<el-button <!-- <el-button
v-has-buttons="['tmpMemberLogin']" v-has-buttons="['tmpMemberLogin']"
type="text" type="text"
size="small" size="small"
@ -644,7 +639,7 @@
@click="toLogin1(scope.row)" @click="toLogin1(scope.row)"
> >
{{ $t("临时登录") }} {{ $t("临时登录") }}
</el-button> </el-button> -->
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
@ -1012,26 +1007,15 @@ export default {
isLocalSymbol, isLocalSymbol,
isLocals, isLocals,
toLogin(row) { toLogin(row) {
if (row.systemType == 0) { console.log(row, '......row')
if (row.systemType == 2) {
passwordFree({ passwordFree({
memberCode: row.memberCode memberCode: row.memberCode
}).then((res) => { }).then((res) => {
if (res.code == 200) { if (res.code == 200) {
const href = const href =
process.env.VUE_APP_ADDRESS1 + process.env.VUE_APP_ADDRESS1 +
'freeLogin?token=' + '?token=' +
res.data.access_token
window.open(href, '_blank')
}
})
} else if (row.systemType == 1) {
passwordFreeLen({
memberCode: row.memberCode
}).then((res) => {
if (res.code == 200) {
const href =
process.env.VUE_APP_ADDRESS +
'freeLogin?token=' +
res.data.access_token res.data.access_token
window.open(href, '_blank') window.open(href, '_blank')
} }

4
src/views/information/policyMoney/policyMoneyDetails.vue
View File

@ -414,13 +414,13 @@ export default {
}, },
{ {
id: 2, id: 2,
text: '级差奖衔', text: '当月奖衔',
checked: false, checked: false,
key: 'dividendAward' key: 'dividendAward'
}, },
{ {
id: 3, id: 3,
text: '级差奖衔', text: '当月奖衔',
checked: false, checked: false,
key: 'extremeAwards' key: 'extremeAwards'
}, },

4
src/views/information/specialBusiness/awardControl.vue
View File

@ -66,7 +66,7 @@
</el-col> </el-col>
<el-col :span="4" style="margin-left: 0px"> <el-col :span="4" style="margin-left: 0px">
<el-form-item :label="'级差奖衔'" prop="status"> <el-form-item :label="'当月奖衔'" prop="status">
<el-select v-model="select.extremeAwards" clearable> <el-select v-model="select.extremeAwards" clearable>
<el-option <el-option
v-for="item in awardsList" v-for="item in awardsList"
@ -213,7 +213,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="extremeAwardsKeyVal" prop="extremeAwardsKeyVal"
:label="'级差奖衔'" :label="'当月奖衔'"
/> />
<el-table-column <el-table-column
align="center" align="center"

6
src/views/information/specialBusiness/awardDetails.vue
View File

@ -188,7 +188,7 @@
<el-table-column align="center" <el-table-column align="center"
width="140" width="140"
prop="extremeAwardsKeyVal" prop="extremeAwardsKeyVal"
:label="'级差奖衔'"> :label="'当月奖衔'">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.extremeAwards" <el-select v-model="scope.row.extremeAwards"
:disabled="select.addAwards == 2" :disabled="select.addAwards == 2"
@ -367,13 +367,13 @@ export default {
}, },
{ {
id: 2, id: 2,
text: '级差奖衔', text: '当月奖衔',
checked: false, checked: false,
key: 'dividendAward', key: 'dividendAward',
}, },
{ {
id: 3, id: 3,
text: '级差奖衔', text: '当月奖衔',
checked: false, checked: false,
key: 'extremeAwards', key: 'extremeAwards',
}, },

1593
src/views/information/specialBusiness/emptyOrder/index.vue
View File

File diff suppressed because it is too large Load Diff

326
src/views/settlementCenter/bonusDetail/index.vue
View File

@ -185,15 +185,9 @@
align="center" align="center"
prop="retailRangeIncomeOri" prop="retailRangeIncomeOri"
width="130" width="130"
:label="$t('极差收益') + `(${isLocalSymbol()})`" :label="$t('直推收益') + `(${isLocalSymbol()})`"
:formatter="stateFormat" :formatter="stateFormat"
/> />
<el-table-column
align="center"
prop="retailRangeIncome"
width="130"
:label="$t('极差收益') + '($)'"
/>
<el-table-column <el-table-column
align="center" align="center"
prop="retailSameLevelIncomeOri" prop="retailSameLevelIncomeOri"
@ -201,12 +195,6 @@
:label="$t('平级收益') + `(${isLocalSymbol()})`" :label="$t('平级收益') + `(${isLocalSymbol()})`"
:formatter="stateFormat" :formatter="stateFormat"
/> />
<el-table-column
align="center"
prop="retailSameLevelIncome"
width="130"
:label="$t('平级收益') + '($)'"
/>
<el-table-column <el-table-column
align="center" align="center"
prop="retailAreaIncomeOri" prop="retailAreaIncomeOri"
@ -214,12 +202,6 @@
:label="$t('区域收益') + `(${isLocalSymbol()})`" :label="$t('区域收益') + `(${isLocalSymbol()})`"
:formatter="stateFormat" :formatter="stateFormat"
/> />
<el-table-column
align="center"
prop="retailAreaIncome"
width="130"
:label="$t('区域收益') + '($)'"
/>
<el-table-column <el-table-column
align="center" align="center"
prop="retailBenefitRangeIncomeOri" prop="retailBenefitRangeIncomeOri"
@ -227,25 +209,7 @@
:label="$t('福利极差收益') + `(${isLocalSymbol()})`" :label="$t('福利极差收益') + `(${isLocalSymbol()})`"
:formatter="stateFormat" :formatter="stateFormat"
/> />
<el-table-column
align="center"
prop="retailBenefitRangeIncome"
width="130"
:label="$t('福利极差收益') + '($)'"
/>
<!-- <el-table-column
align="center"
prop="retailBenefitAvgIncomeOri"
width="130"
:label="$t('福利平均收益') + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<el-table-column
align="center"
prop="retailBenefitAvgIncome"
width="130"
:label="$t('福利平均收益') + '($)'"
/> -->
<el-table-column <el-table-column
align="center" align="center"
prop="retailBenefitIncomeOri" prop="retailBenefitIncomeOri"
@ -253,12 +217,7 @@
:label="$t('福利分红收益') + `(${isLocalSymbol()})`" :label="$t('福利分红收益') + `(${isLocalSymbol()})`"
:formatter="stateFormat" :formatter="stateFormat"
/> />
<el-table-column
align="center"
prop="retailBenefitIncome"
width="130"
:label="$t('福利分红收益') + '($)'"
/>
<el-table-column <el-table-column
align="center" align="center"
prop="backPointsOri" prop="backPointsOri"
@ -266,12 +225,7 @@
:label="$t('重消收益') + `(${isLocalSymbol()})`" :label="$t('重消收益') + `(${isLocalSymbol()})`"
:formatter="stateFormat" :formatter="stateFormat"
/> />
<el-table-column
align="center"
prop="backPoints"
width="130"
:label="$t('重消收益') + '($)'"
/>
<el-table-column <el-table-column
align="center" align="center"
prop="retailRealSubtotalOri" prop="retailRealSubtotalOri"
@ -279,187 +233,7 @@
:label="$t('小计') + `(${isLocalSymbol()})`" :label="$t('小计') + `(${isLocalSymbol()})`"
:formatter="stateFormat" :formatter="stateFormat"
/> />
<el-table-column
align="center"
prop="retailRealSubtotal"
width="130"
:label="$t('小计') + '($)'"
/>
<!-- <el-table-column
v-if="allTxt.directIncomeOri"
align="center"
prop="directIncomeOri"
width="130"
:label="'直推收益' + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<el-table-column
v-if="allTxt.directIncome"
align="center"
prop="directIncome"
width="130"
:label="'直推收益' + `(${isLocals()})`"
:formatter="stateFormat"
/>
<el-table-column
v-if="allTxt.expandIncomeOri"
align="center"
prop="expandIncomeOri"
width="130"
:label="'拓展收益' + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<el-table-column
v-if="allTxt.expandIncome"
align="center"
prop="expandIncome"
width="130"
:label="'拓展收益' + '($)'"
:formatter="stateFormat"
/>
<el-table-column
v-if="allTxt.coachIncomeOri"
align="center"
prop="coachIncomeOri"
width="130"
: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()})`"
:formatter="stateFormat"
/>
<el-table-column
v-if="allTxt.serviceIncome"
align="center"
prop="serviceIncome"
width="130"
:label="'服务收益' + '($)'"
:formatter="stateFormat"
/>
<el-table-column
v-if="allTxt.cloudDirectIncomeOri"
align="center"
prop="cloudDirectIncomeOri"
width="130"
:label="$t('幸运收益') + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<el-table-column
v-if="allTxt.cloudDirectIncome"
align="center"
prop="cloudDirectIncome"
width="130"
:label="$t('幸运收益') + '($)'"
:formatter="stateFormat"
/>
<el-table-column
v-if="allTxt.cloudPurIncomeOri"
align="center"
prop="cloudPurIncomeOri"
width="130"
:label="$t('极差收益') + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<el-table-column
v-if="allTxt.cloudPurIncome"
align="center"
prop="cloudPurIncome"
width="130"
:label="$t('极差收益') + '($)'"
:formatter="stateFormat"
/>
<el-table-column
v-if="allTxt.cloudRepurIncomeOri"
align="center"
prop="cloudRepurIncomeOri"
width="130"
:label="$t('平级收益') + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<el-table-column
v-if="allTxt.cloudRepurIncome"
align="center"
prop="cloudRepurIncome"
width="130"
:label="$t('平级收益') + '($)'"
:formatter="stateFormat"
/>
<el-table-column
v-if="allTxt.repurPushIncomeOri"
align="center"
prop="repurPushIncomeOri"
width="130"
:label="$t('互助收益') + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<el-table-column
v-if="allTxt.repurPushIncome"
align="center"
prop="repurPushIncome"
width="130"
:label="$t('互助收益') + '($)'"
: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.repurRangeIncome"
align="center"
prop="repurRangeIncome"
width="130"
:label="'复购级差收益' + '($)'"
:formatter="stateFormat"
/>
<el-table-column
v-if="allTxt.repurExpandIncomeOri"
align="center"
prop="repurExpandIncomeOri"
width="130"
:label="'复购拓展收益' + `(${isLocalSymbol()})`"
/>
<el-table-column
v-if="allTxt.repurExpandIncome"
align="center"
prop="repurExpandIncome"
width="130"
:label="'复购拓展收益' + '($)'"
:formatter="stateFormat"
/> -->
<el-table-column <el-table-column
align="center" align="center"
prop="repurCouponOri" prop="repurCouponOri"
@ -467,12 +241,7 @@
:formatter="stateFormat" :formatter="stateFormat"
:label="'复购券' + `(${isLocalSymbol()})`" :label="'复购券' + `(${isLocalSymbol()})`"
/> />
<el-table-column
align="center"
prop="repurCoupon"
width="130"
:label="'复购券' + '($)'"
/>
<el-table-column <el-table-column
align="center" align="center"
prop="repurCouponShareOri" prop="repurCouponShareOri"
@ -480,13 +249,7 @@
:formatter="stateFormat" :formatter="stateFormat"
:label="'复购券均分'" :label="'复购券均分'"
/> />
<el-table-column
align="center"
prop="repurCouponShare"
width="130"
:formatter="stateFormat"
:label="'复购券均分' + '($)'"
/>
<el-table-column <el-table-column
align="center" align="center"
prop="backPointsOri" prop="backPointsOri"
@ -494,13 +257,7 @@
:formatter="stateFormat" :formatter="stateFormat"
:label="'商城重消' + `(${isLocalSymbol()})`" :label="'商城重消' + `(${isLocalSymbol()})`"
/> />
<el-table-column
align="center"
prop="backPoints"
width="130"
:label="'商城重消' + '($)'"
:formatter="stateFormat"
/>
<el-table-column <el-table-column
align="center" align="center"
prop="serviceSpendOri" prop="serviceSpendOri"
@ -508,13 +265,7 @@
:formatter="stateFormat" :formatter="stateFormat"
:label="'平台服务费' + `(${isLocalSymbol()})`" :label="'平台服务费' + `(${isLocalSymbol()})`"
/> />
<el-table-column
align="center"
prop="serviceSpend"
width="130"
:label="'平台服务费' + '($)'"
:formatter="stateFormat"
/>
<el-table-column <el-table-column
align="center" align="center"
prop="globalPointsOri" prop="globalPointsOri"
@ -522,27 +273,6 @@
:label="$t('直推极差') + '(￥)'" :label="$t('直推极差') + '(￥)'"
:formatter="stateFormat" :formatter="stateFormat"
/> />
<el-table-column
align="center"
prop="globalPoints"
width="130"
:label="$t('直推极差') + '($)'"
:formatter="stateFormat"
/>
<el-table-column
align="center"
prop="carAwardPointsOri"
width="130"
:label="'车奖积分'"
:formatter="stateFormat"
/>
<el-table-column
align="center"
prop="carAwardPoints"
width="130"
:label="'车奖积分' + '($)'"
:formatter="stateFormat"
/>
<el-table-column <el-table-column
align="center" align="center"
@ -551,13 +281,7 @@
:formatter="stateFormat" :formatter="stateFormat"
:label="'首购实发小计' + `(${isLocalSymbol()})`" :label="'首购实发小计' + `(${isLocalSymbol()})`"
/> />
<el-table-column
align="center"
prop="purRealSubtotal"
width="130"
:label="'首购实发小计' + '($)'"
:formatter="stateFormat"
/>
<el-table-column <el-table-column
align="center" align="center"
prop="cloudRealSubtotalOri" prop="cloudRealSubtotalOri"
@ -565,13 +289,7 @@
:formatter="stateFormat" :formatter="stateFormat"
:label="$t('极差小计') + '(¥)'" :label="$t('极差小计') + '(¥)'"
/> />
<el-table-column
align="center"
prop="cloudRealSubtotal"
width="130"
:label="$t('极差小计') + '($)'"
:formatter="stateFormat"
/>
<el-table-column <el-table-column
align="center" align="center"
prop="repurRealSubtotalOri" prop="repurRealSubtotalOri"
@ -579,13 +297,7 @@
:formatter="stateFormat" :formatter="stateFormat"
:label="'复购实发小计' + `(${isLocalSymbol()})`" :label="'复购实发小计' + `(${isLocalSymbol()})`"
/> />
<el-table-column
align="center"
prop="repurRealSubtotal"
width="130"
:label="'复购实发小计' + '($)'"
:formatter="stateFormat"
/>
<el-table-column <el-table-column
align="center" align="center"
prop="repurCouponSubtotalOri" prop="repurCouponSubtotalOri"
@ -593,13 +305,6 @@
:formatter="stateFormat" :formatter="stateFormat"
:label="'复购券实发小计' + `(${isLocalSymbol()})`" :label="'复购券实发小计' + `(${isLocalSymbol()})`"
/> />
<el-table-column
align="center"
prop="repurCouponSubtotal"
width="160"
:formatter="stateFormat"
:label="'复购券实发小计' + `($)`"
/>
<el-table-column <el-table-column
align="center" align="center"
@ -608,13 +313,6 @@
:formatter="stateFormat" :formatter="stateFormat"
:label="'实发收益总计' + `(${isLocalSymbol()})`" :label="'实发收益总计' + `(${isLocalSymbol()})`"
/> />
<el-table-column
align="center"
prop="realIncomeTotal"
width="130"
:label="'实发收益总计' + '($)'"
:formatter="stateFormat"
/>
</el-table> </el-table>
</div> </div>
</div> </div>

2
src/views/statistics/recommendedCheck.vue
View File

@ -207,7 +207,7 @@
<el-table-column <el-table-column
align="center" align="center"
prop="pkAwardsVal" prop="pkAwardsVal"
label="级差奖衔" label="当月奖衔"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column