Merge branch 'lx-online' of gitee.com:cabbage_qd/web-base-admin into lx-dev
This commit is contained in:
woody
commit
c7a78dd8ce
|
|
@ -3,8 +3,8 @@ ENV = 'production'
|
|||
|
||||
# base api
|
||||
VUE_APP_BASE_API = '/prod-api'
|
||||
VUE_APP_CLIENT_ADDRESS = 'http://t-app.beida413.com/#/'
|
||||
VUE_APP_APP_ADDRESS = 'http://t-app.beida413.com/#/'
|
||||
VUE_APP_CLIENT_ADDRESS = 'http://app.beida413.com/#/'
|
||||
VUE_APP_APP_ADDRESS = 'http://app.beida413.com/#/'
|
||||
# 打包：
|
||||
# npm run build:prod
|
||||
|
||||
|
|
|
|||
|
|
@ -522,14 +522,14 @@
|
|||
<div class="rowcontent" style="width: 260px">出库人：</div>
|
||||
<div class="rowcontent" style="width: 260px">出库时间：</div>
|
||||
<div class="rowcontent" style="width: 260px">
|
||||
客服热线：4001112818
|
||||
客服热线：4007655887
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<span style="font-weight: bold; font-size: 12px">温馨提示：</span>
|
||||
<span
|
||||
style="font-size:10px;!important"
|
||||
>尊敬的各位家人，感谢您长期以来对海之圣的支持与厚爱，当您收到货物时，请检查货物是否有破损，当场开箱验货确认无误后再签收哦，如有问题请第一时间致电公司客服热线，我们将一如既往的为您提供优质、快捷的物流服务。</span>
|
||||
>尊敬的各位家人，感谢您长期以来对北方大陆的支持与厚爱，当您收到货物时，请检查货物是否有破损，当场开箱验货确认无误后再签收哦，如有问题请第一时间致电公司客服热线，我们将一如既往的为您提供优质、快捷的物流服务。</span>
|
||||
</div>
|
||||
<div style="page-break-after: always" />
|
||||
</div>
|
||||
|
|
@ -658,7 +658,7 @@
|
|||
<div class="rowcontent" style="width: 260px">出库人：</div>
|
||||
|
||||
<div class="rowcontent" style="width: 260px">
|
||||
客服热线：4001112818
|
||||
客服热线：4007655887
|
||||
</div>
|
||||
<div class="rowcontent" style="width: 260px" />
|
||||
</div>
|
||||
|
|
@ -666,7 +666,7 @@
|
|||
<span style="font-weight: bold; font-size: 12px">温馨提示：</span>
|
||||
<span
|
||||
style="font-size:10px;!important"
|
||||
>尊敬的各位家人，感谢您长期以来对海之圣的支持与厚爱，当您收到货物时，请检查货物是否有破损，当场开箱验货确认无误后再签收哦，如有问题请第一时间致电公司客服热线，我们将一如既往的为您提供优质、快捷的物流服务。</span>
|
||||
>尊敬的各位家人，感谢您长期以来对北方大陆的支持与厚爱，当您收到货物时，请检查货物是否有破损，当场开箱验货确认无误后再签收哦，如有问题请第一时间致电公司客服热线，我们将一如既往的为您提供优质、快捷的物流服务。</span>
|
||||
</div>
|
||||
<div style="page-break-after: always" />
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -659,7 +659,7 @@ export const constantRoutes = [
|
|||
path: 'topPerformance',
|
||||
name: 'TopPerformance',
|
||||
component: () => import('@/views/settlementCenter/topPerformance/index'),
|
||||
meta: { title: '顶点奖金拨比列表统计' },
|
||||
meta: { title: '零线系统拨比统计' },
|
||||
hidden: true
|
||||
},
|
||||
{
|
||||
|
|
|
|||
|
|
@ -184,3 +184,13 @@ tbody {
|
|||
}
|
||||
}
|
||||
|
||||
.success-text{
|
||||
color: #00B42A;
|
||||
}
|
||||
.error-text{
|
||||
color: #FF0000;
|
||||
}
|
||||
.normal-text{
|
||||
color: #000000;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -27,14 +27,14 @@
|
|||
border>京东收银台（H5）</el-checkbox>
|
||||
<el-checkbox v-model="formData.pay6"
|
||||
border>京东收银台（PC）</el-checkbox>
|
||||
<el-checkbox v-model="formData.pay11"
|
||||
border>宝付微信</el-checkbox>
|
||||
<el-checkbox v-model="formData.pay12"
|
||||
border>宝付微信扫码</el-checkbox>
|
||||
<el-checkbox v-model="formData.pay13"
|
||||
border>汇付微信</el-checkbox>
|
||||
<el-checkbox v-model="formData.pay15"
|
||||
border>汇付银行卡</el-checkbox>
|
||||
<!-- <el-checkbox v-model="formData.pay11"-->
|
||||
<!-- border>宝付微信</el-checkbox>-->
|
||||
<!-- <el-checkbox v-model="formData.pay12"-->
|
||||
<!-- border>宝付微信扫码</el-checkbox>-->
|
||||
<!-- <el-checkbox v-model="formData.pay13"-->
|
||||
<!-- border>汇付微信</el-checkbox>-->
|
||||
<!-- <el-checkbox v-model="formData.pay15"-->
|
||||
<!-- border>汇付银行卡</el-checkbox>-->
|
||||
<!-- <el-checkbox v-model="formData.pay20"-->
|
||||
<!-- border>微信APP</el-checkbox>-->
|
||||
<el-checkbox v-model="formData.pay32"
|
||||
|
|
@ -78,10 +78,10 @@ export default {
|
|||
// pay4: false,
|
||||
pay5: false,
|
||||
pay6: false,
|
||||
pay11: false,
|
||||
pay12: false,
|
||||
pay13: false,
|
||||
pay15: false,
|
||||
// pay11: false,
|
||||
// pay12: false,
|
||||
// pay13: false,
|
||||
// pay15: false,
|
||||
pay20: false,
|
||||
pay32: false,
|
||||
pay33: false,
|
||||
|
|
@ -112,10 +112,10 @@ export default {
|
|||
// pay4: res.data.pay4,
|
||||
pay5: res.data.pay5,
|
||||
pay6: res.data.pay6,
|
||||
pay11: res.data.pay11,
|
||||
pay12: res.data.pay12,
|
||||
pay13: res.data.pay13,
|
||||
pay15: res.data.pay15,
|
||||
// pay11: res.data.pay11,
|
||||
// pay12: res.data.pay12,
|
||||
// pay13: res.data.pay13,
|
||||
// pay15: res.data.pay15,
|
||||
pay20: res.data.pay20,
|
||||
pay32: res.data.pay32,
|
||||
pay33: res.data.pay33,
|
||||
|
|
|
|||
|
|
@ -5,12 +5,16 @@
|
|||
<el-form ref="form" :model="form" label-width="100px">
|
||||
<template>
|
||||
<div class="mainbtn">
|
||||
<el-button size="small" class="thebtn1" @click="handleImport"
|
||||
> {{ '导入' }}</el-button
|
||||
>
|
||||
<el-button size="small" class="thebtn2" @click="importTemplate"
|
||||
> {{ '下载模板' }}</el-button
|
||||
>
|
||||
<el-button
|
||||
size="small"
|
||||
class="thebtn1"
|
||||
@click="handleImport"
|
||||
> {{ '导入' }}</el-button>
|
||||
<el-button
|
||||
size="small"
|
||||
class="thebtn2"
|
||||
@click="importTemplate"
|
||||
> {{ '下载模板' }}</el-button>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
|
@ -19,21 +23,21 @@
|
|||
<el-col :span="5">
|
||||
<el-form-item :label="'会员编号'">
|
||||
<el-input
|
||||
v-model="form.memberCode"
|
||||
clearable
|
||||
style="width: 200px"
|
||||
v-model="form.memberCode"
|
||||
@blur="checkName"
|
||||
></el-input>
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="5">
|
||||
<el-form-item :label="'会员姓名'">
|
||||
<el-input
|
||||
v-model="form.memberName"
|
||||
clearable
|
||||
style="width: 200px"
|
||||
v-model="form.memberName"
|
||||
disabled
|
||||
></el-input>
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
|
|
@ -41,19 +45,17 @@
|
|||
class="my_search"
|
||||
style="margin-left: 30px"
|
||||
@click="getList"
|
||||
> {{ '搜索' }}</el-button
|
||||
>
|
||||
> {{ '搜索' }}</el-button>
|
||||
<el-button class="my_reset" @click="reset"> {{ '重置' }}</el-button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-form-item :label="'充值方式'">
|
||||
<el-radio-group v-model="rechargeMethod">
|
||||
<el-radio
|
||||
:label="item.value"
|
||||
v-for="(item, index) in czWayList"
|
||||
:key="index"
|
||||
>{{ item.label }}</el-radio
|
||||
>
|
||||
:label="item.value"
|
||||
>{{ item.label }}</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-table
|
||||
|
|
@ -68,15 +70,13 @@
|
|||
prop="memberCode"
|
||||
:label="'会员编号'"
|
||||
min-width="120px"
|
||||
>
|
||||
</el-table-column>
|
||||
/>
|
||||
<el-table-column
|
||||
align="center"
|
||||
prop="memberName"
|
||||
:label="'会员姓名'"
|
||||
min-width="120px"
|
||||
>
|
||||
</el-table-column>
|
||||
/>
|
||||
<el-table-column
|
||||
align="center"
|
||||
prop="paymentMethod"
|
||||
|
|
@ -85,33 +85,35 @@
|
|||
>
|
||||
<template slot-scope="scope">
|
||||
<el-select
|
||||
v-model="scope.row.paymentMethod"
|
||||
clearable
|
||||
:placeholder="'请选择'"
|
||||
v-model="scope.row.paymentMethod"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in paymentTypeList"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
></el-option>
|
||||
/>
|
||||
</el-select>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
min-width="150px"
|
||||
v-for="(item, index) in enumsAccountList"
|
||||
:key="index"
|
||||
min-width="150px"
|
||||
align="center"
|
||||
:prop="`${item.pkId}`"
|
||||
:label="item.pkTransactionKeyVal + `${'变更'}(${getUser.currency.symbol})`"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<el-input
|
||||
clearable
|
||||
<el-input-number
|
||||
v-model="scope.row.rechargeDetailMap[`${item.pkId}`]"
|
||||
>
|
||||
</el-input>
|
||||
clearable
|
||||
size="small"
|
||||
:min="0"
|
||||
:controls="false"
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
|
|
@ -121,7 +123,7 @@
|
|||
min-width="120px"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.memberRemarks"></el-input>
|
||||
<el-input v-model="scope.row.memberRemarks" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
|
|
@ -131,7 +133,7 @@
|
|||
:label="'备注(后台)'"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.remarks"></el-input>
|
||||
<el-input v-model="scope.row.remarks" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
|
@ -141,12 +143,11 @@
|
|||
<div class="footer">
|
||||
<div style="margin: 0 auto">
|
||||
<el-button
|
||||
v-has-buttons="['ChongzhiConfirm']"
|
||||
type="primary"
|
||||
class="thebtn"
|
||||
@click="saveDate('form')"
|
||||
v-has-buttons="['ChongzhiConfirm']"
|
||||
> {{ '确认' }}</el-button
|
||||
>
|
||||
> {{ '确认' }}</el-button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -170,223 +171,225 @@
|
|||
:auto-upload="false"
|
||||
drag
|
||||
>
|
||||
<i class="el-icon-upload"></i>
|
||||
<i class="el-icon-upload" />
|
||||
<div class="el-upload__text">
|
||||
{{'将文件拖到此处，或'}}
|
||||
<em>{{'点击上传'}}</em>
|
||||
{{ '将文件拖到此处，或' }}
|
||||
<em>{{ '点击上传' }}</em>
|
||||
</div>
|
||||
<div class="el-upload__tip" slot="tip">
|
||||
<el-link type="info" style="font-size: 12px" @click="importTemplate"
|
||||
> {{ '下载模板' }}</el-link
|
||||
>
|
||||
<div slot="tip" class="el-upload__tip">
|
||||
<el-link
|
||||
type="info"
|
||||
style="font-size: 12px"
|
||||
@click="importTemplate"
|
||||
> {{ '下载模板' }}</el-link>
|
||||
</div>
|
||||
<div class="el-upload__tip" style="color: red" slot="tip">
|
||||
{{'提示：仅允许导入“xls”或“xlsx”格式文件！'}}
|
||||
<div slot="tip" class="el-upload__tip" style="color: red">
|
||||
{{ '提示：仅允许导入“xls”或“xlsx”格式文件！' }}
|
||||
</div>
|
||||
</el-upload>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="submitFileForm">{{'确认'}}</el-button>
|
||||
<el-button @click="upload.open = false">{{'取消'}}</el-button>
|
||||
<el-button type="primary" @click="submitFileForm">{{ '确认' }}</el-button>
|
||||
<el-button @click="upload.open = false">{{ '取消' }}</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import FileUpload from "@/components/FileUpload";
|
||||
import { getToken } from "@/utils/auth";
|
||||
import { mapGetters } from "vuex";
|
||||
<script>
|
||||
import FileUpload from '@/components/FileUpload'
|
||||
import { getToken } from '@/utils/auth'
|
||||
import { mapGetters } from 'vuex'
|
||||
import {
|
||||
getenumsCzAccount,
|
||||
getpaymentType,
|
||||
getrechargeMethod,
|
||||
changeAccountType,
|
||||
getMemberName,
|
||||
} from "@/api/financial";
|
||||
import { stateFormat } from "@/utils/numberToCurrency";
|
||||
getMemberName
|
||||
} from '@/api/financial'
|
||||
import { stateFormat } from '@/utils/numberToCurrency'
|
||||
export default {
|
||||
name: "Chongzhi",
|
||||
name: 'Chongzhi',
|
||||
components: {
|
||||
FileUpload,
|
||||
FileUpload
|
||||
},
|
||||
|
||||
computed: {
|
||||
...mapGetters(["getUser"]),
|
||||
...mapGetters(['getUser'])
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
tableData: [],
|
||||
form: {
|
||||
memberCode: "", //会员编号
|
||||
memberName: null, //会员姓名
|
||||
memberCode: '', // 会员编号
|
||||
memberName: null, // 会员姓名
|
||||
rechargeDetailMap: {},
|
||||
paymentMethod: [], //交款方式
|
||||
paymentMethod: [] // 交款方式
|
||||
},
|
||||
rechargeMethod: 1, //充值方式
|
||||
enumsAccountList: [], //币种类型
|
||||
paymentTypeList: [], //交款方式
|
||||
czWayList: [], //充值方式
|
||||
rechargeMethod: 1, // 充值方式
|
||||
enumsAccountList: [], // 币种类型
|
||||
paymentTypeList: [], // 交款方式
|
||||
czWayList: [], // 充值方式
|
||||
upload: {
|
||||
// 是否显示弹出层（物流导入）
|
||||
open: false,
|
||||
// 弹出层标题（物流导入）
|
||||
title: "",
|
||||
title: '',
|
||||
// 是否禁用上传
|
||||
isUploading: false,
|
||||
// 是否更新已经存在的物流数据
|
||||
updateSupport: 0,
|
||||
// 设置上传的请求头部
|
||||
headers: { Authorization: "Bearer " + getToken() },
|
||||
headers: { Authorization: 'Bearer ' + getToken() },
|
||||
// 上传的地址
|
||||
url:
|
||||
process.env.VUE_APP_BASE_API +
|
||||
"/member/manager/recharge/import-member-code",
|
||||
},
|
||||
};
|
||||
'/member/manager/recharge/import-member-code'
|
||||
}
|
||||
}
|
||||
},
|
||||
created() {
|
||||
//币种类型
|
||||
this.getenumsCzAccount();
|
||||
//交款方式
|
||||
this.getpaymentType();
|
||||
//充值方式
|
||||
this.getrechargeMethod();
|
||||
// 币种类型
|
||||
this.getenumsCzAccount()
|
||||
// 交款方式
|
||||
this.getpaymentType()
|
||||
// 充值方式
|
||||
this.getrechargeMethod()
|
||||
},
|
||||
methods: {
|
||||
stateFormat,
|
||||
//下载模板
|
||||
// 下载模板
|
||||
importTemplate() {
|
||||
this.download(
|
||||
"/member/manager/recharge/download-template",
|
||||
'/member/manager/recharge/download-template',
|
||||
{},
|
||||
`${'模板'}${new Date().getTime()}.xlsx`
|
||||
);
|
||||
)
|
||||
},
|
||||
|
||||
/** 导入按钮操作 */
|
||||
handleImport() {
|
||||
this.upload.title = '导入';
|
||||
this.upload.open = true;
|
||||
this.upload.title = '导入'
|
||||
this.upload.open = true
|
||||
},
|
||||
// 文件上传中处理
|
||||
handleFileUploadProgress(event, file, fileList) {
|
||||
this.upload.isUploading = true;
|
||||
this.upload.isUploading = true
|
||||
},
|
||||
// 文件上传成功处理
|
||||
handleFileSuccess(response, file, fileList) {
|
||||
this.tableData = [];
|
||||
this.tableData = []
|
||||
if (response.code === 200 && response.data) {
|
||||
const rechargeDetailMap = {};
|
||||
const rechargeDetailMap = {}
|
||||
this.enumsAccountList.forEach((item) => {
|
||||
rechargeDetailMap[item.pkId] = "";
|
||||
});
|
||||
rechargeDetailMap[item.pkId] = ''
|
||||
})
|
||||
response.data.forEach((item) => {
|
||||
if (item.rechargeDetail) {
|
||||
item.rechargeDetailMap = { ...JSON.parse(item.rechargeDetail) };
|
||||
this.tableData.push(item);
|
||||
item.rechargeDetailMap = { ...JSON.parse(item.rechargeDetail) }
|
||||
this.tableData.push(item)
|
||||
} else {
|
||||
item.rechargeDetailMap = { ...rechargeDetailMap };
|
||||
this.tableData.push(item);
|
||||
item.rechargeDetailMap = { ...rechargeDetailMap }
|
||||
this.tableData.push(item)
|
||||
}
|
||||
});
|
||||
})
|
||||
}
|
||||
this.upload.open = false;
|
||||
this.upload.isUploading = false;
|
||||
this.$refs.upload.clearFiles();
|
||||
this.upload.open = false
|
||||
this.upload.isUploading = false
|
||||
this.$refs.upload.clearFiles()
|
||||
this.$message({
|
||||
message: response.msg,
|
||||
type: "success",
|
||||
});
|
||||
type: 'success'
|
||||
})
|
||||
},
|
||||
|
||||
getList() {
|
||||
changeAccountType({
|
||||
memberCode: this.form.memberCode,
|
||||
memberName: this.form.memberName,
|
||||
memberName: this.form.memberName
|
||||
}).then((res) => {
|
||||
res.data.forEach((ele) => {
|
||||
ele.rechargeDetailMap = {};
|
||||
});
|
||||
this.tableData = res.data;
|
||||
});
|
||||
ele.rechargeDetailMap = {}
|
||||
})
|
||||
this.tableData = res.data
|
||||
})
|
||||
},
|
||||
// 上传文件数量超出后的动作
|
||||
handleExceed() {
|
||||
this.upload.isUploading = false;
|
||||
this.msgInfo('仅可上传一个文件哦');
|
||||
this.upload.isUploading = false
|
||||
this.msgInfo('仅可上传一个文件哦')
|
||||
},
|
||||
// 提交上传文件
|
||||
submitFileForm() {
|
||||
this.$refs.upload.submit();
|
||||
this.$refs.upload.submit()
|
||||
},
|
||||
//根据会员编号查询会员姓名
|
||||
// 根据会员编号查询会员姓名
|
||||
checkName() {
|
||||
getMemberName({ memberCode: this.form.memberCode }).then((res) => {
|
||||
this.form.memberName = res.memberName;
|
||||
});
|
||||
this.form.memberName = res.memberName
|
||||
})
|
||||
},
|
||||
reset() {
|
||||
this.form.memberCode = "";
|
||||
this.form.memberName = "";
|
||||
this.getList();
|
||||
this.form.memberCode = ''
|
||||
this.form.memberName = ''
|
||||
this.getList()
|
||||
},
|
||||
//充值
|
||||
// 充值
|
||||
saveDate(formName) {
|
||||
if (!this.rechargeMethod) {
|
||||
this.$message({
|
||||
message: '请先选择充值方式',
|
||||
type: "warning",
|
||||
});
|
||||
return;
|
||||
type: 'warning'
|
||||
})
|
||||
return
|
||||
} else {
|
||||
this.$refs[formName].validate((valid) => {
|
||||
if (valid) {
|
||||
let shouldTerminate = false;
|
||||
let shouldTerminate = false
|
||||
this.tableData.forEach((ele) => {
|
||||
if (!ele.paymentMethod) {
|
||||
shouldTerminate = true;
|
||||
shouldTerminate = true
|
||||
this.$message({
|
||||
message: '交款方式不能为空',
|
||||
type: "warning",
|
||||
});
|
||||
return;
|
||||
type: 'warning'
|
||||
})
|
||||
return
|
||||
}
|
||||
});
|
||||
})
|
||||
|
||||
if (!shouldTerminate) {
|
||||
this.$router.push({
|
||||
path: "/information/business/czzxqc",
|
||||
path: '/information/business/czzxqc',
|
||||
query: {
|
||||
data: "",
|
||||
data: '',
|
||||
czlx: 2,
|
||||
detailParams: JSON.stringify(this.tableData),
|
||||
rechargeMethod: this.rechargeMethod,
|
||||
},
|
||||
});
|
||||
rechargeMethod: this.rechargeMethod
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
});
|
||||
})
|
||||
}
|
||||
},
|
||||
|
||||
getrechargeMethod() {
|
||||
getrechargeMethod().then((res) => {
|
||||
this.czWayList = res.data;
|
||||
});
|
||||
this.czWayList = res.data
|
||||
})
|
||||
},
|
||||
|
||||
getpaymentType() {
|
||||
getpaymentType().then((res) => {
|
||||
this.paymentTypeList = res.data;
|
||||
});
|
||||
this.paymentTypeList = res.data
|
||||
})
|
||||
},
|
||||
getenumsCzAccount() {
|
||||
getenumsCzAccount({ accountProperty: 1 }).then((res) => {
|
||||
this.enumsAccountList = res.rows;
|
||||
});
|
||||
},
|
||||
},
|
||||
};
|
||||
this.enumsAccountList = res.rows
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
|
|
|
|||
|
|
@ -6,21 +6,21 @@
|
|||
<el-col :span="6">
|
||||
<el-form-item :label="'会员编号'">
|
||||
<el-input
|
||||
v-model="form.memberCode"
|
||||
clearable
|
||||
style="width: 200px"
|
||||
v-model="form.memberCode"
|
||||
@blur="checkName"
|
||||
></el-input>
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item :label="'会员姓名'">
|
||||
<el-input
|
||||
v-model="form.memberName"
|
||||
clearable
|
||||
style="width: 200px"
|
||||
v-model="form.memberName"
|
||||
disabled
|
||||
></el-input>
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
|
|
@ -29,11 +29,9 @@
|
|||
style="margin-left: 30px"
|
||||
@click="getList"
|
||||
>
|
||||
{{ '搜索' }}</el-button
|
||||
>
|
||||
{{ '搜索' }}</el-button>
|
||||
<el-button class="my_reset" @click="reset">
|
||||
{{ '重置' }}</el-button
|
||||
>
|
||||
{{ '重置' }}</el-button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<!-- <el-form-item :label="'钱包类型'">
|
||||
|
|
@ -62,11 +60,10 @@
|
|||
<el-radio-group v-model="rechargeMethod">
|
||||
1
|
||||
<el-radio
|
||||
:label="item.value"
|
||||
v-for="(item, index) in czWayList"
|
||||
:key="index"
|
||||
>{{ item.label }}</el-radio
|
||||
>
|
||||
:label="item.value"
|
||||
>{{ item.label }}</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-table
|
||||
|
|
@ -81,15 +78,13 @@
|
|||
prop="memberCode"
|
||||
:label="'会员编号'"
|
||||
min-width="120px"
|
||||
>
|
||||
</el-table-column>
|
||||
/>
|
||||
<el-table-column
|
||||
align="center"
|
||||
prop="memberName"
|
||||
:label="'会员姓名'"
|
||||
min-width="120px"
|
||||
>
|
||||
</el-table-column>
|
||||
/>
|
||||
<el-table-column
|
||||
align="center"
|
||||
prop="paymentMethod"
|
||||
|
|
@ -98,37 +93,45 @@
|
|||
>
|
||||
<template slot-scope="scope">
|
||||
<el-select
|
||||
v-model="scope.row.paymentMethod"
|
||||
clearable
|
||||
:placeholder="'请选择'"
|
||||
v-model="scope.row.paymentMethod"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in paymentTypeList"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
></el-option>
|
||||
/>
|
||||
</el-select>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column
|
||||
min-width="150px"
|
||||
v-for="(item, index) in enumsAccountList"
|
||||
:key="index"
|
||||
min-width="150px"
|
||||
align="center"
|
||||
:prop="`${item.pkId}`"
|
||||
:label="
|
||||
item.pkTransactionKeyVal +
|
||||
`${'变更'}(${getUser.currency.symbol})`
|
||||
`${'变更'}(${getUser.currency.symbol})`
|
||||
"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<el-input
|
||||
clearable
|
||||
<!-- <el-input
|
||||
v-model="scope.row.rechargeDetailMap[`${item.pkId}`]"
|
||||
>
|
||||
</el-input>
|
||||
clearable
|
||||
type="number"
|
||||
:min="0"
|
||||
/> -->
|
||||
<el-input-number
|
||||
v-model="scope.row.rechargeDetailMap[`${item.pkId}`]"
|
||||
clearable
|
||||
size="small"
|
||||
:min="0"
|
||||
:controls="false"
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
|
|
@ -138,7 +141,7 @@
|
|||
min-width="120px"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.memberRemarks"></el-input>
|
||||
<el-input v-model="scope.row.memberRemarks" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
|
|
@ -148,7 +151,7 @@
|
|||
:label="'备注(后台)'"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.remarks"></el-input>
|
||||
<el-input v-model="scope.row.remarks" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
|
@ -158,138 +161,137 @@
|
|||
<div class="footer">
|
||||
<div style="margin: 0 auto">
|
||||
<el-button
|
||||
v-has-buttons="['ChongzhiConfirm']"
|
||||
type="primary"
|
||||
class="thebtn"
|
||||
@click="saveDate('form')"
|
||||
v-has-buttons="['ChongzhiConfirm']"
|
||||
>
|
||||
{{ '确认' }}</el-button
|
||||
>
|
||||
{{ '确认' }}</el-button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { mapGetters } from "vuex";
|
||||
import { mapGetters } from 'vuex'
|
||||
import {
|
||||
getenumsCzAccount,
|
||||
getpaymentType,
|
||||
getrechargeMethod,
|
||||
changeAccountType,
|
||||
getMemberName,
|
||||
} from "@/api/financial";
|
||||
import { stateFormat } from "@/utils/numberToCurrency";
|
||||
getMemberName
|
||||
} from '@/api/financial'
|
||||
import { stateFormat } from '@/utils/numberToCurrency'
|
||||
export default {
|
||||
name: "Chongzhi",
|
||||
name: 'Chongzhi',
|
||||
computed: {
|
||||
...mapGetters(["getUser"]),
|
||||
...mapGetters(['getUser'])
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
tableData: [],
|
||||
form: {
|
||||
memberCode: "", //会员编号
|
||||
memberName: null, //会员姓名
|
||||
memberCode: '', // 会员编号
|
||||
memberName: null, // 会员姓名
|
||||
rechargeDetailMap: {},
|
||||
paymentMethod: [], //交款方式
|
||||
paymentMethod: [] // 交款方式
|
||||
},
|
||||
rechargeMethod: 1, //充值方式
|
||||
enumsAccountList: [], //币种类型
|
||||
paymentTypeList: [], //交款方式
|
||||
czWayList: [], //充值方式
|
||||
};
|
||||
rechargeMethod: 1, // 充值方式
|
||||
enumsAccountList: [], // 币种类型
|
||||
paymentTypeList: [], // 交款方式
|
||||
czWayList: [] // 充值方式
|
||||
}
|
||||
},
|
||||
created() {
|
||||
//钱包类型
|
||||
this.getenumsCzAccount();
|
||||
//交款方式
|
||||
this.getpaymentType();
|
||||
//充值方式
|
||||
this.getrechargeMethod();
|
||||
// 钱包类型
|
||||
this.getenumsCzAccount()
|
||||
// 交款方式
|
||||
this.getpaymentType()
|
||||
// 充值方式
|
||||
this.getrechargeMethod()
|
||||
},
|
||||
methods: {
|
||||
stateFormat,
|
||||
//根据会员编号查询会员姓名
|
||||
// 根据会员编号查询会员姓名
|
||||
checkName() {
|
||||
getMemberName({ memberCode: this.form.memberCode }).then((res) => {
|
||||
this.form.memberName = res.memberName;
|
||||
});
|
||||
this.form.memberName = res.memberName
|
||||
})
|
||||
},
|
||||
getList() {
|
||||
changeAccountType({
|
||||
memberCode: this.form.memberCode,
|
||||
memberName: this.form.memberName,
|
||||
memberName: this.form.memberName
|
||||
}).then((res) => {
|
||||
res.data.forEach((ele) => {
|
||||
ele.rechargeDetailMap = {};
|
||||
});
|
||||
this.tableData = res.data;
|
||||
});
|
||||
ele.rechargeDetailMap = {}
|
||||
})
|
||||
this.tableData = res.data
|
||||
})
|
||||
},
|
||||
reset() {
|
||||
this.form.memberCode = "";
|
||||
this.form.memberName = "";
|
||||
this.getList();
|
||||
this.form.memberCode = ''
|
||||
this.form.memberName = ''
|
||||
this.getList()
|
||||
},
|
||||
//充值
|
||||
// 充值
|
||||
saveDate(formName) {
|
||||
if (!this.rechargeMethod) {
|
||||
this.$message({
|
||||
message: '请先选择充值方式',
|
||||
type: "warning",
|
||||
});
|
||||
return;
|
||||
type: 'warning'
|
||||
})
|
||||
return
|
||||
} else {
|
||||
this.$refs[formName].validate((valid) => {
|
||||
if (valid) {
|
||||
let shouldTerminate = false;
|
||||
let shouldTerminate = false
|
||||
|
||||
this.tableData.forEach((ele) => {
|
||||
if (!ele.paymentMethod) {
|
||||
shouldTerminate = true;
|
||||
shouldTerminate = true
|
||||
this.$message({
|
||||
message: '交款方式不能为空',
|
||||
type: "warning",
|
||||
});
|
||||
return;
|
||||
type: 'warning'
|
||||
})
|
||||
return
|
||||
}
|
||||
});
|
||||
})
|
||||
|
||||
if (!shouldTerminate) {
|
||||
this.$router.push({
|
||||
path: "/information/business/czzxqc",
|
||||
path: '/information/business/czzxqc',
|
||||
query: {
|
||||
data: "",
|
||||
data: '',
|
||||
czlx: 1,
|
||||
detailParams: JSON.stringify(this.tableData),
|
||||
rechargeMethod: this.rechargeMethod,
|
||||
},
|
||||
});
|
||||
rechargeMethod: this.rechargeMethod
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
});
|
||||
})
|
||||
}
|
||||
},
|
||||
|
||||
getrechargeMethod() {
|
||||
getrechargeMethod().then((res) => {
|
||||
this.czWayList = res.data;
|
||||
});
|
||||
this.czWayList = res.data
|
||||
})
|
||||
},
|
||||
|
||||
getpaymentType() {
|
||||
getpaymentType().then((res) => {
|
||||
this.paymentTypeList = res.data;
|
||||
});
|
||||
this.paymentTypeList = res.data
|
||||
})
|
||||
},
|
||||
getenumsCzAccount() {
|
||||
getenumsCzAccount({ accountProperty: 1 }).then((res) => {
|
||||
this.enumsAccountList = res.rows;
|
||||
});
|
||||
},
|
||||
},
|
||||
};
|
||||
this.enumsAccountList = res.rows
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
|
|
|
|||
|
|
@ -216,7 +216,7 @@
|
|||
align="center"
|
||||
prop="paymentBeforeBalance"
|
||||
:label="'充前余额' + `(${isLocalSymbol()})`"
|
||||
width="140"
|
||||
width="120px"
|
||||
:formatter="stateFormat"
|
||||
/>
|
||||
<el-table-column
|
||||
|
|
@ -224,7 +224,7 @@
|
|||
align="center"
|
||||
prop="paymentAmount"
|
||||
:label="'充值金额' + `(${isLocalSymbol()})`"
|
||||
width="200px"
|
||||
width="120px"
|
||||
:formatter="stateFormat"
|
||||
/>
|
||||
<el-table-column
|
||||
|
|
@ -232,7 +232,7 @@
|
|||
align="center"
|
||||
prop="paymentBalance"
|
||||
:label="'当前余额' + `(${isLocalSymbol()})`"
|
||||
width="140"
|
||||
width="120px"
|
||||
:formatter="stateFormat"
|
||||
/>
|
||||
<el-table-column
|
||||
|
|
@ -291,8 +291,22 @@
|
|||
v-if="listColumnVisible('approveStateVal')"
|
||||
align="center"
|
||||
prop="approveStateVal"
|
||||
:label="'审核状态'"
|
||||
/>
|
||||
label="审核状态"
|
||||
fixed="right"
|
||||
>
|
||||
<template #default="scope">
|
||||
<!--approveStateVal= 审核通过 绿色，=审核驳回 红色 =待审核 正常展示 -->
|
||||
<span
|
||||
:class="{
|
||||
'success-text': scope.row.approveStateVal == '审核通过',
|
||||
'error-text': scope.row.approveStateVal == '审核驳回',
|
||||
'normal-text': scope.row.approveStateVal == '待审核'
|
||||
}"
|
||||
>
|
||||
{{ scope.row.approveStateVal }}
|
||||
</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -560,33 +560,27 @@
|
|||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<!-- <el-col :span="8">
|
||||
<el-form-item
|
||||
label="商品视频"
|
||||
prop="videoUrl"
|
||||
>
|
||||
<!-- <el-input clearable v-model="form.name"
|
||||
:placeholder="'请输入'"></el-input> -->
|
||||
<!-- <UpDataImg :maxLength="1"
|
||||
ref="upImg1"
|
||||
@getImg="getImg1"
|
||||
@delImg="delImg1"></UpDataImg> -->
|
||||
<imageUpload
|
||||
v-model="form.videoUrl"
|
||||
:is-video="true"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<!-- <el-col :span="8">
|
||||
</el-col> -->
|
||||
<el-col :span="8">
|
||||
<el-form-item
|
||||
label="视频封面"
|
||||
label="商品封面"
|
||||
prop="cover"
|
||||
>
|
||||
<imageUpload v-model="form.cover" />
|
||||
</el-form-item>
|
||||
</el-col> -->
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-row style="margin-top: 10px; margin-bottom: 10px;">
|
||||
<el-col :span="8">
|
||||
<el-form-item
|
||||
:label="'图片'"
|
||||
|
|
@ -630,44 +624,26 @@
|
|||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<!-- <el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item
|
||||
:label="'图片'"
|
||||
prop="cover4"
|
||||
>
|
||||
<!-- <el-input clearable v-model="form.name"
|
||||
:placeholder="'请输入'"></el-input> -->
|
||||
<!-- <UpDataImg :maxLength="1"
|
||||
ref="upImg6"
|
||||
@getImg="getImg6"
|
||||
@delImg="delImg6"></UpDataImg> -->
|
||||
<imageUpload v-model="form.cover4" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item :label="'图片'">
|
||||
<!-- <el-input clearable v-model="form.name"
|
||||
:placeholder="'请输入'"></el-input> -->
|
||||
<!-- <UpDataImg :maxLength="1"
|
||||
ref="upImg7"
|
||||
@getImg="getImg7"
|
||||
@delImg="delImg7"></UpDataImg> -->
|
||||
<imageUpload v-model="form.cover5" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item :label="'图片'">
|
||||
<!-- <el-input clearable v-model="form.name"
|
||||
:placeholder="'请输入'"></el-input> -->
|
||||
<!-- <UpDataImg :maxLength="1"
|
||||
ref="upImg8"
|
||||
@getImg="getImg8"
|
||||
@delImg="delImg8"></UpDataImg> -->
|
||||
<imageUpload v-model="form.cover6" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-row> -->
|
||||
<el-row>
|
||||
<el-col :span="24">
|
||||
<el-form-item
|
||||
|
|
@ -1189,7 +1165,7 @@ export default {
|
|||
// videoUrl: [
|
||||
// { required: true, message: '请上传商品视频', trigger: 'blur' }
|
||||
// ],
|
||||
// cover: [{ required: true, message: '请上传视频主图', trigger: 'blur' }],
|
||||
cover: [{ required: true, message: '请上传商品封面', trigger: 'blur' }],
|
||||
cover1: [
|
||||
{ required: true, message: '请上传图片', trigger: 'blur' }
|
||||
],
|
||||
|
|
|
|||
|
|
@ -529,45 +529,33 @@
|
|||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<!-- <el-col :span="8">
|
||||
<el-form-item
|
||||
:label="'主视频'"
|
||||
prop="videoUrl"
|
||||
>
|
||||
<!-- <el-input clearable v-model="form.name"
|
||||
:placeholder="'请输入'"></el-input> -->
|
||||
<!-- <UpDataImg :maxLength="1"
|
||||
ref="upImg"
|
||||
@getImg="getImg1"
|
||||
@delImg="delImg1"></UpDataImg> -->
|
||||
<imageUpload
|
||||
v-model="form.videoUrl"
|
||||
:is-video="true"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<!-- <el-col :span="8">
|
||||
</el-col> -->
|
||||
<el-col :span="8">
|
||||
<el-form-item
|
||||
:label="'视频封面'"
|
||||
label="商品封面"
|
||||
prop="cover"
|
||||
>
|
||||
|
||||
<imageUpload v-model="form.cover" />
|
||||
</el-form-item>
|
||||
</el-col> -->
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-row style="margin-top: 10px; margin-bottom: 10px;">
|
||||
<el-col :span="8">
|
||||
<el-form-item
|
||||
:label="'图片'"
|
||||
prop="cover1"
|
||||
>
|
||||
<!-- <el-input clearable v-model="form.name"
|
||||
:placeholder="'请输入'"></el-input> -->
|
||||
<!-- <UpDataImg :maxLength="1"
|
||||
ref="upImg"
|
||||
@getImg="getImg3"
|
||||
@delImg="delImg3"></UpDataImg> -->
|
||||
<imageUpload v-model="form.cover1" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
|
@ -576,12 +564,6 @@
|
|||
:label="'图片'"
|
||||
prop="cover2"
|
||||
>
|
||||
<!-- <el-input clearable v-model="form.name"
|
||||
:placeholder="'请输入'"></el-input> -->
|
||||
<!-- <UpDataImg :maxLength="1"
|
||||
ref="upImg"
|
||||
@getImg="getImg4"
|
||||
@delImg="delImg4"></UpDataImg> -->
|
||||
<imageUpload v-model="form.cover2" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
|
@ -590,54 +572,30 @@
|
|||
:label="'图片'"
|
||||
prop="cover3"
|
||||
>
|
||||
<!-- <el-input clearable v-model="form.name"
|
||||
:placeholder="'请输入'"></el-input> -->
|
||||
<!-- <UpDataImg :maxLength="1"
|
||||
ref="upImg"
|
||||
@getImg="getImg5"
|
||||
@delImg="delImg5"></UpDataImg> -->
|
||||
<imageUpload v-model="form.cover3" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<!-- <el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item
|
||||
:label="'图片'"
|
||||
prop="cover4"
|
||||
>
|
||||
<!-- <el-input clearable v-model="form.name"
|
||||
:placeholder="'请输入'"></el-input> -->
|
||||
<!-- <UpDataImg :maxLength="1"
|
||||
ref="upImg"
|
||||
@getImg="getImg6"
|
||||
@delImg="delImg6"></UpDataImg> -->
|
||||
<imageUpload v-model="form.cover4" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item :label="'图片'">
|
||||
<!-- <el-input clearable v-model="form.name"
|
||||
:placeholder="'请输入'"></el-input> -->
|
||||
<!-- <UpDataImg :maxLength="1"
|
||||
ref="upImg"
|
||||
@getImg="getImg7"
|
||||
@delImg="delImg7"></UpDataImg> -->
|
||||
<imageUpload v-model="form.cover5" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item :label="'图片'">
|
||||
<!-- <el-input clearable v-model="form.name"
|
||||
:placeholder="'请输入'"></el-input> -->
|
||||
<!-- <UpDataImg :maxLength="1"
|
||||
ref="upImg"
|
||||
@getImg="getImg8"
|
||||
@delImg="delImg8"></UpDataImg> -->
|
||||
<imageUpload v-model="form.cover6" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-row> -->
|
||||
<el-row>
|
||||
<el-col :span="24">
|
||||
<el-form-item
|
||||
|
|
@ -1145,7 +1103,7 @@ export default {
|
|||
// videoUrl: [
|
||||
// { required: true, message: '请上传商品视频', trigger: 'blur' }
|
||||
// ],
|
||||
// cover: [{ required: true, message: '请上传视频主图', trigger: 'blur' }],
|
||||
cover: [{ required: true, message: '请上传商品封面', trigger: 'blur' }],
|
||||
cover1: [
|
||||
{ required: true, message: '请上传图片', trigger: 'blur' }
|
||||
],
|
||||
|
|
|
|||
|
|
@ -54,6 +54,21 @@
|
|||
<el-input v-model="queryParams.memberName" clearable />
|
||||
</el-form-item>
|
||||
</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-form-item :label="'联系方式'" prop="phone">
|
||||
<el-input v-model="queryParams.phone" clearable />
|
||||
|
|
@ -321,6 +336,12 @@
|
|||
prop="memberName"
|
||||
:label="'会员姓名'"
|
||||
/>
|
||||
<el-table-column
|
||||
align="center"
|
||||
prop="vertexName"
|
||||
:label="'隶属体系'"
|
||||
min-width="120"
|
||||
/>
|
||||
<el-table-column
|
||||
align="center"
|
||||
min-width="120px"
|
||||
|
|
@ -475,7 +496,7 @@ import topBar from '@/components/topBar'
|
|||
import * as log from '@/api/logistics'
|
||||
import * as del from '@/api/delivery'
|
||||
import { getStatus } from '@/api/notice'
|
||||
|
||||
import { getVartexList } from '@/api/affiliatedteam'
|
||||
export default {
|
||||
name: 'Ckspdd',
|
||||
components: {
|
||||
|
|
@ -507,14 +528,16 @@ export default {
|
|||
pageNum: 1,
|
||||
pageSize: 50,
|
||||
orderCode: '',
|
||||
orderStatus: ''
|
||||
orderStatus: '',
|
||||
vertexId: ''
|
||||
},
|
||||
orderStatusList: [],
|
||||
tableData: [],
|
||||
orderTypeList: [],
|
||||
shippingTypeList: [],
|
||||
payTypeList: [],
|
||||
total: 0
|
||||
total: 0,
|
||||
vertexList: []
|
||||
}
|
||||
},
|
||||
created() {
|
||||
|
|
@ -522,6 +545,9 @@ export default {
|
|||
this.getOthers()
|
||||
this.getSearch()
|
||||
this.getOrderStatus()
|
||||
getVartexList().then((res) => {
|
||||
this.vertexList = res.data
|
||||
})
|
||||
},
|
||||
methods: {
|
||||
getOrderStatus() {
|
||||
|
|
|
|||
|
|
@ -19,7 +19,21 @@
|
|||
<el-input v-model="queryParams.memberName" clearable />
|
||||
</el-form-item>
|
||||
</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-form-item :label="'联系方式'" prop="phone">
|
||||
<el-input v-model="queryParams.phone" clearable />
|
||||
|
|
@ -58,8 +72,7 @@
|
|||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
|
||||
<el-col :span="4">
|
||||
<el-form-item :label="'收货人'" prop="recName">
|
||||
<el-input v-model="queryParams.recName" clearable />
|
||||
|
|
@ -97,20 +110,21 @@
|
|||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<el-form-item
|
||||
:label="`${'购买人' + '姓名'}`"
|
||||
prop="buyMemberName"
|
||||
>
|
||||
<el-input
|
||||
v-model="queryParams.buyMemberName"
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
</el-row>
|
||||
<el-collapse-transition>
|
||||
<el-row v-show="isActive">
|
||||
<el-col :span="4">
|
||||
<el-form-item
|
||||
:label="`${'购买人' + '姓名'}`"
|
||||
prop="buyMemberName"
|
||||
>
|
||||
<el-input
|
||||
v-model="queryParams.buyMemberName"
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<el-form-item :label="'支付方式'" prop="payType">
|
||||
<el-select
|
||||
|
|
@ -236,6 +250,12 @@
|
|||
prop="memberCode"
|
||||
:label="'会员编号'"
|
||||
/>
|
||||
<el-table-column
|
||||
align="center"
|
||||
prop="vertexName"
|
||||
:label="'隶属体系'"
|
||||
min-width="120"
|
||||
/>
|
||||
<el-table-column
|
||||
v-if="dataList[3].key"
|
||||
align="center"
|
||||
|
|
@ -410,6 +430,7 @@
|
|||
import topBar from '@/components/topBar'
|
||||
import * as log from '@/api/logistics'
|
||||
import * as api from '@/api/site.js'
|
||||
import { getVartexList } from '@/api/affiliatedteam'
|
||||
import { getRoleMenu, roleDetails, getStatus } from '@/api/notice'
|
||||
export default {
|
||||
name: 'Spdd',
|
||||
|
|
@ -419,6 +440,7 @@ export default {
|
|||
data() {
|
||||
return {
|
||||
moren: 'spdd',
|
||||
vertexList: [],
|
||||
dataList: [
|
||||
{
|
||||
name: 'orderCode',
|
||||
|
|
@ -523,6 +545,7 @@ export default {
|
|||
|
||||
multipleSelection: [],
|
||||
queryParams: {
|
||||
vertexId: '',
|
||||
pageNum: 1,
|
||||
pageSize: 50,
|
||||
shoppingAddress: [],
|
||||
|
|
@ -623,6 +646,9 @@ export default {
|
|||
log.getOrderPayType().then((res) => {
|
||||
this.paywayList = res.data
|
||||
})
|
||||
getVartexList().then((res) => {
|
||||
this.vertexList = res.data
|
||||
})
|
||||
},
|
||||
// 展开折叠
|
||||
changeActive() {
|
||||
|
|
|
|||
|
|
@ -171,21 +171,12 @@
|
|||
: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.serviceIncomeOri"
|
||||
align="center"
|
||||
prop="serviceIncomeOri"
|
||||
width="130"
|
||||
:label="'报单收益' + `(${isLocalSymbol()})`"
|
||||
:label="'服务补贴' + `(${isLocalSymbol()})`"
|
||||
:formatter="stateFormat"
|
||||
/>
|
||||
|
||||
|
|
@ -213,23 +204,6 @@
|
|||
:label="'复购辅导收益' + `(${isLocalSymbol()})`"
|
||||
:formatter="stateFormat"
|
||||
/>
|
||||
<el-table-column
|
||||
v-if="allTxt.repurCouponOri"
|
||||
align="center"
|
||||
prop="repurCouponOri"
|
||||
width="130"
|
||||
:formatter="stateFormat"
|
||||
:label="'复购券' + `(${isLocalSymbol()})`"
|
||||
/>
|
||||
|
||||
<el-table-column
|
||||
v-if="allTxt.repurCouponShareOri"
|
||||
align="center"
|
||||
prop="repurCouponShareOri"
|
||||
width="130"
|
||||
:formatter="stateFormat"
|
||||
:label="'复购券均分'"
|
||||
/>
|
||||
|
||||
<el-table-column
|
||||
v-if="allTxt.backPointsOri"
|
||||
|
|
@ -237,7 +211,7 @@
|
|||
prop="backPointsOri"
|
||||
width="130"
|
||||
:formatter="stateFormat"
|
||||
:label="'商城重消' + `(${isLocalSymbol()})`"
|
||||
:label="'重复消费' + `(${isLocalSymbol()})`"
|
||||
/>
|
||||
|
||||
<el-table-column
|
||||
|
|
@ -258,15 +232,6 @@
|
|||
:formatter="stateFormat"
|
||||
/>
|
||||
|
||||
<el-table-column
|
||||
v-if="allTxt.carAwardPointsOri"
|
||||
align="center"
|
||||
prop="carAwardPointsOri"
|
||||
width="130"
|
||||
:label="'车奖积分'"
|
||||
:formatter="stateFormat"
|
||||
/>
|
||||
|
||||
<el-table-column
|
||||
v-if="allTxt.purRealSubtotalOri"
|
||||
align="center"
|
||||
|
|
@ -275,22 +240,6 @@
|
|||
:formatter="stateFormat"
|
||||
:label="'首购实发小计' + `(${isLocalSymbol()})`"
|
||||
/>
|
||||
<!-- <el-table-column
|
||||
v-if="allTxt.purRealSubtotal"
|
||||
align="center"
|
||||
prop="purRealSubtotal"
|
||||
width="130"
|
||||
:label="'首购实发小计' + '($)'"
|
||||
:formatter="stateFormat"
|
||||
/> -->
|
||||
<el-table-column
|
||||
v-if="allTxt.cloudRealSubtotalOri"
|
||||
align="center"
|
||||
prop="cloudRealSubtotalOri"
|
||||
width="130"
|
||||
:formatter="stateFormat"
|
||||
:label="$t('级差小计') + '(¥)'"
|
||||
/>
|
||||
|
||||
<el-table-column
|
||||
v-if="allTxt.repurRealSubtotalOri"
|
||||
|
|
@ -301,15 +250,6 @@
|
|||
:label="'复购实发小计' + `(${isLocalSymbol()})`"
|
||||
/>
|
||||
|
||||
<el-table-column
|
||||
v-if="allTxt.repurCouponSubtotalOri"
|
||||
align="center"
|
||||
prop="repurCouponSubtotalOri"
|
||||
width="160"
|
||||
:formatter="stateFormat"
|
||||
:label="'复购券实发小计' + `(${isLocalSymbol()})`"
|
||||
/>
|
||||
|
||||
<el-table-column
|
||||
v-if="allTxt.realIncomeTotalOri"
|
||||
align="center"
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@
|
|||
</el-col> -->
|
||||
|
||||
<el-col :span="8">
|
||||
<el-form-item :label="'业绩时间'">
|
||||
<el-form-item :label="'统计时间'">
|
||||
<el-date-picker
|
||||
v-model="creationTime"
|
||||
value-format="yyyy-MM-dd"
|
||||
|
|
@ -59,7 +59,7 @@
|
|||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="顶点">
|
||||
<el-form-item label="系统编号">
|
||||
<el-select v-model="select.pkVertex">
|
||||
<el-option
|
||||
v-for="item in verList"
|
||||
|
|
@ -192,13 +192,13 @@ export default {
|
|||
},
|
||||
{
|
||||
id: 31,
|
||||
text: '顶点名称',
|
||||
text: '系统名称',
|
||||
checked: true,
|
||||
prop: 'memberName'
|
||||
},
|
||||
{
|
||||
id: 27,
|
||||
text: '业绩时间',
|
||||
text: '统计时间',
|
||||
checked: false,
|
||||
prop: 'creationTime'
|
||||
},
|
||||
|
|
@ -374,7 +374,7 @@ export default {
|
|||
moren: '/settlementCenter/topPerformance',
|
||||
topList: [
|
||||
{
|
||||
name: '顶点奖金拨比列表统计',
|
||||
name: '零线系统拨比统计',
|
||||
path: '/settlementCenter/topPerformance',
|
||||
url: 'topPerformance',
|
||||
changed: false
|
||||
|
|
@ -515,7 +515,7 @@ export default {
|
|||
this.download(
|
||||
'/member/manage/bonus-vertex-statis/export',
|
||||
Object.assign({}, this.queryParams, this.select),
|
||||
`顶点奖金拨比列表统计-${new Date().getTime()}.xlsx`
|
||||
`零线系统拨比统计-${new Date().getTime()}.xlsx`
|
||||
)
|
||||
})
|
||||
},
|
||||
|
|
|
|||
|
|
@ -197,63 +197,16 @@
|
|||
:label="'辅导收益' + `(${isLocalSymbol()})`"
|
||||
:formatter="stateFormat"
|
||||
/>
|
||||
<!-- <el-table-column
|
||||
v-if="allTxt.coachIncome"
|
||||
align="center"
|
||||
prop="coachIncome"
|
||||
width="130"
|
||||
:label="'辅导收益' + '($)'"
|
||||
:formatter="stateFormat"
|
||||
/> -->
|
||||
<el-table-column
|
||||
v-if="allTxt.shareIncomeOri"
|
||||
align="center"
|
||||
prop="shareIncomeOri"
|
||||
width="130"
|
||||
:label="'分红收益' + `(${isLocalSymbol()})`"
|
||||
:formatter="stateFormat"
|
||||
/>
|
||||
<!-- <el-table-column
|
||||
v-if="allTxt.shareIncome"
|
||||
align="center"
|
||||
prop="shareIncome"
|
||||
width="130"
|
||||
:label="'分红收益' + '($)'"
|
||||
:formatter="stateFormat"
|
||||
/> -->
|
||||
|
||||
<el-table-column
|
||||
v-if="allTxt.serviceIncomeOri"
|
||||
align="center"
|
||||
prop="serviceIncomeOri"
|
||||
width="130"
|
||||
:label="'报单收益' + `(${isLocalSymbol()})`"
|
||||
:label="'服务补贴' + `(${isLocalSymbol()})`"
|
||||
:formatter="stateFormat"
|
||||
/>
|
||||
<!-- <el-table-column
|
||||
v-if="allTxt.serviceIncome"
|
||||
align="center"
|
||||
prop="serviceIncome"
|
||||
width="130"
|
||||
:label="'报单收益' + '($)'"
|
||||
:formatter="stateFormat"
|
||||
/> -->
|
||||
|
||||
<el-table-column
|
||||
v-if="allTxt.repurPushIncomeOri"
|
||||
align="center"
|
||||
prop="repurPushIncomeOri"
|
||||
width="130"
|
||||
:label="'复购推荐收益'+ `(${isLocalSymbol()})`"
|
||||
:formatter="stateFormat"
|
||||
/>
|
||||
<!-- <el-table-column
|
||||
v-if="allTxt.repurPushIncome"
|
||||
align="center"
|
||||
prop="repurPushIncome"
|
||||
width="130"
|
||||
:label="'复购推荐收益' + '($)'"
|
||||
:formatter="stateFormat"
|
||||
/> -->
|
||||
<el-table-column
|
||||
v-if="allTxt.repurRangeIncomeOri"
|
||||
align="center"
|
||||
|
|
@ -286,47 +239,16 @@
|
|||
:label="'复购辅导收益' + `(${isLocalSymbol()})`"
|
||||
:formatter="stateFormat"
|
||||
/>
|
||||
<el-table-column
|
||||
v-if="allTxt.repurCouponOri"
|
||||
align="center"
|
||||
prop="repurCouponOri"
|
||||
width="130"
|
||||
:label="'复购券' + `(${isLocalSymbol()})`"
|
||||
:formatter="stateFormat"
|
||||
/>
|
||||
|
||||
<el-table-column
|
||||
v-if="allTxt.repurCouponShareOri"
|
||||
align="center"
|
||||
prop="repurCouponShareOri"
|
||||
width="130"
|
||||
:label="'复购券均分'"
|
||||
:formatter="stateFormat"
|
||||
/>
|
||||
<!-- <el-table-column
|
||||
v-if="allTxt.repurCouponShare"
|
||||
align="center"
|
||||
prop="repurCouponShare"
|
||||
width="130"
|
||||
:label="'复购券均分' + '($)'"
|
||||
:formatter="stateFormat"
|
||||
/> -->
|
||||
<el-table-column
|
||||
v-if="allTxt.backPointsOri"
|
||||
align="center"
|
||||
prop="backPointsOri"
|
||||
width="130"
|
||||
:label="'商城重消' + `(${isLocalSymbol()})`"
|
||||
:label="'重复消费' + `(${isLocalSymbol()})`"
|
||||
:formatter="stateFormat"
|
||||
/>
|
||||
<!-- <el-table-column
|
||||
v-if="allTxt.backPoints"
|
||||
align="center"
|
||||
prop="backPoints"
|
||||
width="130"
|
||||
:label="'商城重消' + '($)'"
|
||||
:formatter="stateFormat"
|
||||
/> -->
|
||||
|
||||
<el-table-column
|
||||
v-if="allTxt.serviceSpendOri"
|
||||
align="center"
|
||||
|
|
@ -351,23 +273,6 @@
|
|||
:label="'直推级差' + '(￥)'"
|
||||
:formatter="stateFormat"
|
||||
/>
|
||||
<!-- <el-table-column
|
||||
v-if="allTxt.globalPoints"
|
||||
align="center"
|
||||
prop="globalPoints"
|
||||
width="130"
|
||||
:label="'直推级差' + '($)'"
|
||||
:formatter="stateFormat"
|
||||
/> -->
|
||||
|
||||
<el-table-column
|
||||
v-if="allTxt.carAwardPointsOri"
|
||||
align="center"
|
||||
prop="carAwardPointsOri"
|
||||
width="130"
|
||||
:label="'车奖积分'"
|
||||
:formatter="stateFormat"
|
||||
/>
|
||||
|
||||
<el-table-column
|
||||
v-if="allTxt.purRealSubtotalOri"
|
||||
|
|
@ -386,22 +291,7 @@
|
|||
:label="'复购实发小计' + `(${isLocalSymbol()})`"
|
||||
: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
|
||||
v-if="allTxt.repurCouponSubtotal"
|
||||
align="center"
|
||||
|
|
|
|||
Loading…
Reference in New Issue