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

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

This commit is contained in:
woody 2025-08-08 15:37:19 +08:00
parent 8912d89970 752a779c60
commit c7a78dd8ce
15 changed files with 370 additions and 525 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.production
View File

@ -3,8 +3,8 @@ ENV = 'production'
# base api # base api
VUE_APP_BASE_API = '/prod-api' VUE_APP_BASE_API = '/prod-api'
VUE_APP_CLIENT_ADDRESS = 'http://t-app.beida413.com/#/' VUE_APP_CLIENT_ADDRESS = 'http://app.beida413.com/#/'
VUE_APP_APP_ADDRESS = 'http://t-app.beida413.com/#/' VUE_APP_APP_ADDRESS = 'http://app.beida413.com/#/'
# 打包： # 打包：
# npm run build:prod # npm run build:prod

8
src/components/Delivery/yihandeled.vue
View File

@ -522,14 +522,14 @@
<div class="rowcontent" style="width: 260px">出库人：</div> <div class="rowcontent" style="width: 260px">出库人：</div>
<div class="rowcontent" style="width: 260px">出库时间：</div> <div class="rowcontent" style="width: 260px">出库时间：</div>
<div class="rowcontent" style="width: 260px"> <div class="rowcontent" style="width: 260px">
客服热线：4001112818 客服热线：4007655887
</div> </div>
</div> </div>
<div> <div>
<span style="font-weight: bold; font-size: 12px">温馨提示：</span> <span style="font-weight: bold; font-size: 12px">温馨提示：</span>
<span <span
style="font-size:10px;!important" style="font-size:10px;!important"
>尊敬的各位家人，感谢您长期以来对海之圣的支持与厚爱，当您收到货物时，请检查货物是否有破损，当场开箱验货确认无误后再签收哦，如有问题请第一时间致电公司客服热线，我们将一如既往的为您提供优质、快捷的物流服务。</span> >尊敬的各位家人，感谢您长期以来对北方大陆的支持与厚爱，当您收到货物时，请检查货物是否有破损，当场开箱验货确认无误后再签收哦，如有问题请第一时间致电公司客服热线，我们将一如既往的为您提供优质、快捷的物流服务。</span>
</div> </div>
<div style="page-break-after: always" /> <div style="page-break-after: always" />
</div> </div>
@ -658,7 +658,7 @@
<div class="rowcontent" style="width: 260px">出库人：</div> <div class="rowcontent" style="width: 260px">出库人：</div>
<div class="rowcontent" style="width: 260px"> <div class="rowcontent" style="width: 260px">
客服热线：4001112818 客服热线：4007655887
</div> </div>
<div class="rowcontent" style="width: 260px" /> <div class="rowcontent" style="width: 260px" />
</div> </div>
@ -666,7 +666,7 @@
<span style="font-weight: bold; font-size: 12px">温馨提示：</span> <span style="font-weight: bold; font-size: 12px">温馨提示：</span>
<span <span
style="font-size:10px;!important" style="font-size:10px;!important"
>尊敬的各位家人，感谢您长期以来对海之圣的支持与厚爱，当您收到货物时，请检查货物是否有破损，当场开箱验货确认无误后再签收哦，如有问题请第一时间致电公司客服热线，我们将一如既往的为您提供优质、快捷的物流服务。</span> >尊敬的各位家人，感谢您长期以来对北方大陆的支持与厚爱，当您收到货物时，请检查货物是否有破损，当场开箱验货确认无误后再签收哦，如有问题请第一时间致电公司客服热线，我们将一如既往的为您提供优质、快捷的物流服务。</span>
</div> </div>
<div style="page-break-after: always" /> <div style="page-break-after: always" />
</div> </div>

2
src/router/index.js
View File

@ -659,7 +659,7 @@ export const constantRoutes = [
path: 'topPerformance', path: 'topPerformance',
name: 'TopPerformance', name: 'TopPerformance',
component: () => import('@/views/settlementCenter/topPerformance/index'), component: () => import('@/views/settlementCenter/topPerformance/index'),
meta: { title: '顶点奖金拨比列表统计' }, meta: { title: '零线系统拨比统计' },
hidden: true hidden: true
}, },
{ {

10
src/styles/index.scss
View File

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

32
src/views/configManage/paySet/index.vue
View File

@ -27,14 +27,14 @@
border>京东收银台（H5）</el-checkbox> border>京东收银台（H5）</el-checkbox>
<el-checkbox v-model="formData.pay6" <el-checkbox v-model="formData.pay6"
border>京东收银台（PC）</el-checkbox> border>京东收银台（PC）</el-checkbox>
<el-checkbox v-model="formData.pay11" <!-- <el-checkbox v-model="formData.pay11"-->
border>宝付微信</el-checkbox> <!-- border>宝付微信</el-checkbox>-->
<el-checkbox v-model="formData.pay12" <!-- <el-checkbox v-model="formData.pay12"-->
border>宝付微信扫码</el-checkbox> <!-- border>宝付微信扫码</el-checkbox>-->
<el-checkbox v-model="formData.pay13" <!-- <el-checkbox v-model="formData.pay13"-->
border>汇付微信</el-checkbox> <!-- border>汇付微信</el-checkbox>-->
<el-checkbox v-model="formData.pay15" <!-- <el-checkbox v-model="formData.pay15"-->
border>汇付银行卡</el-checkbox> <!-- border>汇付银行卡</el-checkbox>-->
<!-- <el-checkbox v-model="formData.pay20"--> <!-- <el-checkbox v-model="formData.pay20"-->
<!-- border>微信APP</el-checkbox>--> <!-- border>微信APP</el-checkbox>-->
<el-checkbox v-model="formData.pay32" <el-checkbox v-model="formData.pay32"
@ -78,10 +78,10 @@ export default {
// pay4: false, // pay4: false,
pay5: false, pay5: false,
pay6: false, pay6: false,
pay11: false, // pay11: false,
pay12: false, // pay12: false,
pay13: false, // pay13: false,
pay15: false, // pay15: false,
pay20: false, pay20: false,
pay32: false, pay32: false,
pay33: false, pay33: false,
@ -112,10 +112,10 @@ export default {
// pay4: res.data.pay4, // pay4: res.data.pay4,
pay5: res.data.pay5, pay5: res.data.pay5,
pay6: res.data.pay6, pay6: res.data.pay6,
pay11: res.data.pay11, // pay11: res.data.pay11,
pay12: res.data.pay12, // pay12: res.data.pay12,
pay13: res.data.pay13, // pay13: res.data.pay13,
pay15: res.data.pay15, // pay15: res.data.pay15,
pay20: res.data.pay20, pay20: res.data.pay20,
pay32: res.data.pay32, pay32: res.data.pay32,
pay33: res.data.pay33, pay33: res.data.pay33,

227
src/views/financial/recharge/doubleCz.vue
View File

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

150
src/views/financial/recharge/singleCz.vue
View File

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

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

@ -216,7 +216,7 @@
align="center" align="center"
prop="paymentBeforeBalance" prop="paymentBeforeBalance"
:label="'充前余额' + `(${isLocalSymbol()})`" :label="'充前余额' + `(${isLocalSymbol()})`"
width="140" width="120px"
:formatter="stateFormat" :formatter="stateFormat"
/> />
<el-table-column <el-table-column
@ -224,7 +224,7 @@
align="center" align="center"
prop="paymentAmount" prop="paymentAmount"
:label="'充值金额' + `(${isLocalSymbol()})`" :label="'充值金额' + `(${isLocalSymbol()})`"
width="200px" width="120px"
:formatter="stateFormat" :formatter="stateFormat"
/> />
<el-table-column <el-table-column
@ -232,7 +232,7 @@
align="center" align="center"
prop="paymentBalance" prop="paymentBalance"
:label="'当前余额' + `(${isLocalSymbol()})`" :label="'当前余额' + `(${isLocalSymbol()})`"
width="140" width="120px"
:formatter="stateFormat" :formatter="stateFormat"
/> />
<el-table-column <el-table-column
@ -291,8 +291,22 @@
v-if="listColumnVisible('approveStateVal')" v-if="listColumnVisible('approveStateVal')"
align="center" align="center"
prop="approveStateVal" 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> </el-table>
</div> </div>

42
src/views/goodsManage/goodsList/goodsEdit/jcsz.vue
View File

@ -560,33 +560,27 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <!-- <el-col :span="8">
<el-form-item <el-form-item
label="商品视频" label="商品视频"
prop="videoUrl" prop="videoUrl"
> >
<!-- <el-input clearable v-model="form.name"
:placeholder="'请输入'"></el-input> -->
<!-- <UpDataImg :maxLength="1"
ref="upImg1"
@getImg="getImg1"
@delImg="delImg1"></UpDataImg> -->
<imageUpload <imageUpload
v-model="form.videoUrl" v-model="form.videoUrl"
:is-video="true" :is-video="true"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<!-- <el-col :span="8"> <el-col :span="8">
<el-form-item <el-form-item
label="视频封面" label="商品封面"
prop="cover" prop="cover"
> >
<imageUpload v-model="form.cover" /> <imageUpload v-model="form.cover" />
</el-form-item> </el-form-item>
</el-col> --> </el-col>
</el-row> </el-row>
<el-row> <el-row style="margin-top: 10px; margin-bottom: 10px;">
<el-col :span="8"> <el-col :span="8">
<el-form-item <el-form-item
:label="'图片'" :label="'图片'"
@ -630,44 +624,26 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <!-- <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item <el-form-item
:label="'图片'" :label="'图片'"
prop="cover4" 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" /> <imageUpload v-model="form.cover4" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item :label="'图片'"> <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" /> <imageUpload v-model="form.cover5" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item :label="'图片'"> <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" /> <imageUpload v-model="form.cover6" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row> -->
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item <el-form-item
@ -1189,7 +1165,7 @@ export default {
// videoUrl: [ // videoUrl: [
// { required: true, message: '请上传商品视频', trigger: 'blur' } // { required: true, message: '请上传商品视频', trigger: 'blur' }
// ], // ],
// cover: [{ required: true, message: '请上传视频主图', trigger: 'blur' }], cover: [{ required: true, message: '请上传商品封面', trigger: 'blur' }],
cover1: [ cover1: [
{ required: true, message: '请上传图片', trigger: 'blur' } { required: true, message: '请上传图片', trigger: 'blur' }
], ],

60
src/views/goodsManage/goodsRelease/jcsz.vue
View File

@ -529,45 +529,33 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <!-- <el-col :span="8">
<el-form-item <el-form-item
:label="'主视频'" :label="'主视频'"
prop="videoUrl" prop="videoUrl"
> >
<!-- <el-input clearable v-model="form.name"
:placeholder="'请输入'"></el-input> -->
<!-- <UpDataImg :maxLength="1"
ref="upImg"
@getImg="getImg1"
@delImg="delImg1"></UpDataImg> -->
<imageUpload <imageUpload
v-model="form.videoUrl" v-model="form.videoUrl"
:is-video="true" :is-video="true"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<!-- <el-col :span="8"> <el-col :span="8">
<el-form-item <el-form-item
:label="'视频封面'" label="商品封面"
prop="cover" prop="cover"
> >
<imageUpload v-model="form.cover" /> <imageUpload v-model="form.cover" />
</el-form-item> </el-form-item>
</el-col> --> </el-col>
</el-row> </el-row>
<el-row> <el-row style="margin-top: 10px; margin-bottom: 10px;">
<el-col :span="8"> <el-col :span="8">
<el-form-item <el-form-item
:label="'图片'" :label="'图片'"
prop="cover1" 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" /> <imageUpload v-model="form.cover1" />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -576,12 +564,6 @@
:label="'图片'" :label="'图片'"
prop="cover2" 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" /> <imageUpload v-model="form.cover2" />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -590,54 +572,30 @@
:label="'图片'" :label="'图片'"
prop="cover3" 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" /> <imageUpload v-model="form.cover3" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <!-- <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item <el-form-item
:label="'图片'" :label="'图片'"
prop="cover4" 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" /> <imageUpload v-model="form.cover4" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item :label="'图片'"> <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" /> <imageUpload v-model="form.cover5" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item :label="'图片'"> <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" /> <imageUpload v-model="form.cover6" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row> -->
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item <el-form-item
@ -1145,7 +1103,7 @@ export default {
// videoUrl: [ // videoUrl: [
// { required: true, message: '请上传商品视频', trigger: 'blur' } // { required: true, message: '请上传商品视频', trigger: 'blur' }
// ], // ],
// cover: [{ required: true, message: '请上传视频主图', trigger: 'blur' }], cover: [{ required: true, message: '请上传商品封面', trigger: 'blur' }],
cover1: [ cover1: [
{ required: true, message: '请上传图片', trigger: 'blur' } { required: true, message: '请上传图片', trigger: 'blur' }
], ],

32
src/views/logistics/commodity/ckspdd.vue
View File

@ -54,6 +54,21 @@
<el-input v-model="queryParams.memberName" clearable /> <el-input v-model="queryParams.memberName" clearable />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4">
<el-form-item :label="'隶属体系'" prop="vertexId">
<el-select
v-model="queryParams.vertexId"
clearable
>
<el-option
v-for="item in vertexList"
:key="item.pkId"
:label="item.vertexName"
:value="item.pkId"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'联系方式'" prop="phone"> <el-form-item :label="'联系方式'" prop="phone">
<el-input v-model="queryParams.phone" clearable /> <el-input v-model="queryParams.phone" clearable />
@ -321,6 +336,12 @@
prop="memberName" prop="memberName"
:label="'会员姓名'" :label="'会员姓名'"
/> />
<el-table-column
align="center"
prop="vertexName"
:label="'隶属体系'"
min-width="120"
/>
<el-table-column <el-table-column
align="center" align="center"
min-width="120px" min-width="120px"
@ -475,7 +496,7 @@ import topBar from '@/components/topBar'
import * as log from '@/api/logistics' import * as log from '@/api/logistics'
import * as del from '@/api/delivery' import * as del from '@/api/delivery'
import { getStatus } from '@/api/notice' import { getStatus } from '@/api/notice'
import { getVartexList } from '@/api/affiliatedteam'
export default { export default {
name: 'Ckspdd', name: 'Ckspdd',
components: { components: {
@ -507,14 +528,16 @@ export default {
pageNum: 1, pageNum: 1,
pageSize: 50, pageSize: 50,
orderCode: '', orderCode: '',
orderStatus: '' orderStatus: '',
vertexId: ''
}, },
orderStatusList: [], orderStatusList: [],
tableData: [], tableData: [],
orderTypeList: [], orderTypeList: [],
shippingTypeList: [], shippingTypeList: [],
payTypeList: [], payTypeList: [],
total: 0 total: 0,
vertexList: []
} }
}, },
created() { created() {
@ -522,6 +545,9 @@ export default {
this.getOthers() this.getOthers()
this.getSearch() this.getSearch()
this.getOrderStatus() this.getOrderStatus()
getVartexList().then((res) => {
this.vertexList = res.data
})
}, },
methods: { methods: {
getOrderStatus() { getOrderStatus() {

38
src/views/logistics/commodity/index.vue
View File

@ -19,7 +19,21 @@
<el-input v-model="queryParams.memberName" clearable /> <el-input v-model="queryParams.memberName" clearable />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4">
<el-form-item :label="'隶属体系'" prop="vertexId">
<el-select
v-model="queryParams.vertexId"
clearable
>
<el-option
v-for="item in vertexList"
:key="item.pkId"
:label="item.vertexName"
:value="item.pkId"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'联系方式'" prop="phone"> <el-form-item :label="'联系方式'" prop="phone">
<el-input v-model="queryParams.phone" clearable /> <el-input v-model="queryParams.phone" clearable />
@ -58,8 +72,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'收货人'" prop="recName"> <el-form-item :label="'收货人'" prop="recName">
<el-input v-model="queryParams.recName" clearable /> <el-input v-model="queryParams.recName" clearable />
@ -97,6 +110,10 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-collapse-transition>
<el-row v-show="isActive">
<el-col :span="4"> <el-col :span="4">
<el-form-item <el-form-item
:label="`${'购买人' + '姓名'}`" :label="`${'购买人' + '姓名'}`"
@ -108,9 +125,6 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-collapse-transition>
<el-row v-show="isActive">
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'支付方式'" prop="payType"> <el-form-item :label="'支付方式'" prop="payType">
<el-select <el-select
@ -236,6 +250,12 @@
prop="memberCode" prop="memberCode"
:label="'会员编号'" :label="'会员编号'"
/> />
<el-table-column
align="center"
prop="vertexName"
:label="'隶属体系'"
min-width="120"
/>
<el-table-column <el-table-column
v-if="dataList[3].key" v-if="dataList[3].key"
align="center" align="center"
@ -410,6 +430,7 @@
import topBar from '@/components/topBar' import topBar from '@/components/topBar'
import * as log from '@/api/logistics' import * as log from '@/api/logistics'
import * as api from '@/api/site.js' import * as api from '@/api/site.js'
import { getVartexList } from '@/api/affiliatedteam'
import { getRoleMenu, roleDetails, getStatus } from '@/api/notice' import { getRoleMenu, roleDetails, getStatus } from '@/api/notice'
export default { export default {
name: 'Spdd', name: 'Spdd',
@ -419,6 +440,7 @@ export default {
data() { data() {
return { return {
moren: 'spdd', moren: 'spdd',
vertexList: [],
dataList: [ dataList: [
{ {
name: 'orderCode', name: 'orderCode',
@ -523,6 +545,7 @@ export default {
multipleSelection: [], multipleSelection: [],
queryParams: { queryParams: {
vertexId: '',
pageNum: 1, pageNum: 1,
pageSize: 50, pageSize: 50,
shoppingAddress: [], shoppingAddress: [],
@ -623,6 +646,9 @@ export default {
log.getOrderPayType().then((res) => { log.getOrderPayType().then((res) => {
this.paywayList = res.data this.paywayList = res.data
}) })
getVartexList().then((res) => {
this.vertexList = res.data
})
}, },
// 展开折叠 // 展开折叠
changeActive() { changeActive() {

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

@ -171,21 +171,12 @@
:formatter="stateFormat" :formatter="stateFormat"
/> />
<el-table-column
v-if="allTxt.shareIncomeOri"
align="center"
prop="shareIncomeOri"
width="130"
:label="'分红收益' + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<el-table-column <el-table-column
v-if="allTxt.serviceIncomeOri" v-if="allTxt.serviceIncomeOri"
align="center" align="center"
prop="serviceIncomeOri" prop="serviceIncomeOri"
width="130" width="130"
:label="'报单收益' + `(${isLocalSymbol()})`" :label="'服务补贴' + `(${isLocalSymbol()})`"
:formatter="stateFormat" :formatter="stateFormat"
/> />
@ -213,23 +204,6 @@
:label="'复购辅导收益' + `(${isLocalSymbol()})`" :label="'复购辅导收益' + `(${isLocalSymbol()})`"
:formatter="stateFormat" :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 <el-table-column
v-if="allTxt.backPointsOri" v-if="allTxt.backPointsOri"
@ -237,7 +211,7 @@
prop="backPointsOri" prop="backPointsOri"
width="130" width="130"
:formatter="stateFormat" :formatter="stateFormat"
:label="'商城重消' + `(${isLocalSymbol()})`" :label="'重复消费' + `(${isLocalSymbol()})`"
/> />
<el-table-column <el-table-column
@ -258,15 +232,6 @@
:formatter="stateFormat" :formatter="stateFormat"
/> />
<el-table-column
v-if="allTxt.carAwardPointsOri"
align="center"
prop="carAwardPointsOri"
width="130"
:label="'车奖积分'"
:formatter="stateFormat"
/>
<el-table-column <el-table-column
v-if="allTxt.purRealSubtotalOri" v-if="allTxt.purRealSubtotalOri"
align="center" align="center"
@ -275,22 +240,6 @@
:formatter="stateFormat" :formatter="stateFormat"
:label="'首购实发小计' + `(${isLocalSymbol()})`" :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 <el-table-column
v-if="allTxt.repurRealSubtotalOri" v-if="allTxt.repurRealSubtotalOri"
@ -301,15 +250,6 @@
:label="'复购实发小计' + `(${isLocalSymbol()})`" :label="'复购实发小计' + `(${isLocalSymbol()})`"
/> />
<el-table-column
v-if="allTxt.repurCouponSubtotalOri"
align="center"
prop="repurCouponSubtotalOri"
width="160"
:formatter="stateFormat"
:label="'复购券实发小计' + `(${isLocalSymbol()})`"
/>
<el-table-column <el-table-column
v-if="allTxt.realIncomeTotalOri" v-if="allTxt.realIncomeTotalOri"
align="center" align="center"

12
src/views/settlementCenter/topPerformance/index.vue
View File

@ -46,7 +46,7 @@
</el-col> --> </el-col> -->
<el-col :span="8"> <el-col :span="8">
<el-form-item :label="'业绩时间'"> <el-form-item :label="'统计时间'">
<el-date-picker <el-date-picker
v-model="creationTime" v-model="creationTime"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
@ -59,7 +59,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="顶点"> <el-form-item label="系统编号">
<el-select v-model="select.pkVertex"> <el-select v-model="select.pkVertex">
<el-option <el-option
v-for="item in verList" v-for="item in verList"
@ -192,13 +192,13 @@ export default {
}, },
{ {
id: 31, id: 31,
text: '顶点名称', text: '系统名称',
checked: true, checked: true,
prop: 'memberName' prop: 'memberName'
}, },
{ {
id: 27, id: 27,
text: '业绩时间', text: '统计时间',
checked: false, checked: false,
prop: 'creationTime' prop: 'creationTime'
}, },
@ -374,7 +374,7 @@ export default {
moren: '/settlementCenter/topPerformance', moren: '/settlementCenter/topPerformance',
topList: [ topList: [
{ {
name: '顶点奖金拨比列表统计', name: '零线系统拨比统计',
path: '/settlementCenter/topPerformance', path: '/settlementCenter/topPerformance',
url: 'topPerformance', url: 'topPerformance',
changed: false changed: false
@ -515,7 +515,7 @@ export default {
this.download( this.download(
'/member/manage/bonus-vertex-statis/export', '/member/manage/bonus-vertex-statis/export',
Object.assign({}, this.queryParams, this.select), Object.assign({}, this.queryParams, this.select),
`顶点奖金拨比列表统计-${new Date().getTime()}.xlsx` `零线系统拨比统计-${new Date().getTime()}.xlsx`
) )
}) })
}, },

120
src/views/settlementCenter/totalBonus/index.vue
View File

@ -197,63 +197,16 @@
:label="'辅导收益' + `(${isLocalSymbol()})`" :label="'辅导收益' + `(${isLocalSymbol()})`"
:formatter="stateFormat" :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 <el-table-column
v-if="allTxt.serviceIncomeOri" v-if="allTxt.serviceIncomeOri"
align="center" align="center"
prop="serviceIncomeOri" prop="serviceIncomeOri"
width="130" width="130"
:label="'报单收益' + `(${isLocalSymbol()})`" :label="'服务补贴' + `(${isLocalSymbol()})`"
:formatter="stateFormat" :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 <el-table-column
v-if="allTxt.repurRangeIncomeOri" v-if="allTxt.repurRangeIncomeOri"
align="center" align="center"
@ -286,47 +239,16 @@
:label="'复购辅导收益' + `(${isLocalSymbol()})`" :label="'复购辅导收益' + `(${isLocalSymbol()})`"
:formatter="stateFormat" :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 <el-table-column
v-if="allTxt.backPointsOri" v-if="allTxt.backPointsOri"
align="center" align="center"
prop="backPointsOri" prop="backPointsOri"
width="130" width="130"
:label="'商城重消' + `(${isLocalSymbol()})`" :label="'重复消费' + `(${isLocalSymbol()})`"
:formatter="stateFormat" :formatter="stateFormat"
/> />
<!-- <el-table-column
v-if="allTxt.backPoints"
align="center"
prop="backPoints"
width="130"
:label="'商城重消' + '($)'"
:formatter="stateFormat"
/> -->
<el-table-column <el-table-column
v-if="allTxt.serviceSpendOri" v-if="allTxt.serviceSpendOri"
align="center" align="center"
@ -351,23 +273,6 @@
:label="'直推级差' + '(￥)'" :label="'直推级差' + '(￥)'"
:formatter="stateFormat" :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 <el-table-column
v-if="allTxt.purRealSubtotalOri" v-if="allTxt.purRealSubtotalOri"
@ -386,22 +291,7 @@
:label="'复购实发小计' + `(${isLocalSymbol()})`" :label="'复购实发小计' + `(${isLocalSymbol()})`"
:formatter="stateFormat" :formatter="stateFormat"
/> />
<!-- <el-table-column
v-if="allTxt.repurRealSubtotal"
align="center"
prop="repurRealSubtotal"
width="130"
:label="'复购实发小计' + '($)'"
:formatter="stateFormat"
/> -->
<el-table-column
v-if="allTxt.repurCouponSubtotalOri"
align="center"
prop="repurCouponSubtotalOri"
width="160"
:label="'复购券实发小计' + `(${isLocalSymbol()})`"
:formatter="stateFormat"
/>
<!-- <el-table-column <!-- <el-table-column
v-if="allTxt.repurCouponSubtotal" v-if="allTxt.repurCouponSubtotal"
align="center" align="center"