pull/1/head
xiaozhiyong 2 years ago
parent b1c894f96c
commit 96233ead10
  1. 570
      src/views/customerManagement/companyManagement/index.vue
  2. 2
      src/views/financialCenter/billDetails/index.vue
  3. 258
      src/views/financialCenter/enterpriseRecharge/components/add.vue
  4. 2
      src/views/financialCenter/enterpriseRecharge/index.vue

@ -0,0 +1,570 @@
<template>
<div class="enterprise-recharge-details">
<div class="frame">
<!-- 公司名称 -->
<autocomplete
class="mr20"
:params="parameter.params"
:config="configAutocomplete"
/>
<!-- 业务负责人 -->
<autocomplete
:params="parameter.params"
:config="configAutocompleteSec"
/>
<el-select
v-model="parameter.params.enableMark"
placeholder="交易类型"
clearable
>
<el-option
v-for="(item, index) in rechargeTypeEnum"
:key="index"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
<el-select
v-model="parameter.params.enableMark"
placeholder="交易状态"
clearable
>
<el-option
v-for="(item, index) in rechargeStatusEnum"
:key="index"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
<el-select
v-model="parameter.params.enableMark"
placeholder="赊账还款审核"
clearable
>
<el-option
v-for="(item, index) in repaymentExamineEnum"
:key="index"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
<el-date-picker
v-model="datetime"
type="datetimerange"
align="right"
start-placeholder="开始时间"
end-placeholder="结束时间"
:default-time="['00:00:00', '23:59:59']"
value-format="yyyy-MM-dd HH:mm:ss"
@change="changeDateTime"
>
</el-date-picker>
<div class="buttons">
<el-button icon="el-icon-search" @click="search">查询</el-button>
<el-button icon="el-icon-refresh" @click="reset">重置</el-button>
</div>
</div>
<div class="table">
<div class="operation">
<!-- <el-button @click="addition">新增产品</el-button> -->
</div>
<el-table
v-if="tableHeight"
ref="multipleTable"
:height="tableHeight"
:data="tableData"
show-summary
:summary-method="getSummaries"
style="width: 100%"
>
>
<el-table-column type="selection" width="55"> </el-table-column>
<el-table-column
prop="companyName"
label="企业名称"
show-overflow-tooltip
>
</el-table-column>
<el-table-column label="交易类型">
<template slot-scope="{ row }">
<p>
{{
row.transactionType === "TURN"
? LoopBackTypeEnum.find((item) => item.value === row.turnType)
.label
: rechargeTypeEnum.find(
(item) => item.value === row.transactionType
).label
}}
</p>
</template>
</el-table-column>
<el-table-column label="交易状态">
<template slot-scope="{ row }">
<p v-if="row.transactionState">
{{
rechargeStatusEnum.find(
(item) => item.value === row.transactionState
).label
}}
</p>
</template>
</el-table-column>
<el-table-column
prop="transactionAmount"
label="交易金额"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
prop="rechargeRebate"
label="充值返利比例"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
prop="rechargeRebateAmount"
label="充值返利金额"
show-overflow-tooltip
>
</el-table-column>
<el-table-column label="赊账还款审核">
<template slot-scope="{ row }">
<p v-if="row.transactionType && row.chargeSalesAuditMark">
{{
row.transactionType !== "CHARGE_SALES" ||
(row.transactionType === "CHARGE_SALES" &&
row.transactionState === -1)
? "无状态"
: repaymentExamineEnum.find(
(item) => item.value === row.chargeSalesAuditMark
).label
}}
</p>
</template>
</el-table-column>
<el-table-column
prop="businessLeader"
label="业务负责人"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
show-overflow-tooltip
>
</el-table-column>
<el-table-column label="操作">
<template slot-scope="{ row }">
<span class="el-dropdown-link" @click="detail(row)">详情</span>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<pagination :parameter="parameter" @searchAgain="getByPage" />
</div>
<!-- 详情 -->
<el-drawer
title="详情"
direction="ltr"
size="60%"
:withHeader="false"
:visible="controlWindows.detail"
>
<general-details
title="详情"
:isHeader="true"
v-if="controlWindows.detail"
:sourceData="oilCompanyMatch"
:mappingData="mappingData"
@close="controlWindows.detail = false"
>
<template #offlineTransactionProof>
<el-image
style="width: 100px; height: 100px"
:src="oilCompanyMatch.offlineTransactionProof"
/>
</template>
</general-details>
</el-drawer>
</div>
</template>
<script>
import serve from "api/financialCenter/enterpriseRechargeDetails.js";
import commonServe from "api/common.js";
import autocomplete from "components/autocomplete/index.vue";
import pagination from "components/pagination/index.vue";
import generalDetails from "components/generalDetails/index.vue";
import {
rechargeTypeEnum,
rechargeStatusEnum,
repaymentExamineEnum,
} from "utils/dataType.js";
export default {
components: {
pagination,
autocomplete,
generalDetails,
},
data() {
return {
rechargeTypeEnum: rechargeTypeEnum,
rechargeStatusEnum: rechargeStatusEnum,
repaymentExamineEnum: repaymentExamineEnum,
controlWindows: {
detail: false,
},
datetime: [],
tableHeight: 0,
tableData: [],
configAutocomplete: {
serveTarget: commonServe.getRefineryCompanyList,
autocompleteKey: "name",
labelKey: "name",
valueKey: "id",
placeholder: "企业名称",
querykey: "companyId",
},
configAutocompleteSec: {
serveTarget: commonServe.liekQuery,
autocompleteKey: "",
labelKey: "nickName",
valueKey: "id",
placeholder: "业务负责人",
querykey: "businessLeader",
},
parameter: {
currentPage: 1,
pageSize: 10,
total: 0,
params: {},
},
// rechargeTypeEnum: [
// {
// label: "",
// value: "RECHARGE",
// },
// {
// label: "",
// value: "REVOKE",
// },
// {
// label: "",
// value: "CHARGE_SALES",
// },
// {
// label: "",
// value: "CONSUME_REBATE",
// },
// ],
LoopBackTypeEnum: [
{
label: "充值圈回",
value: 1,
},
{
label: "赊销圈回",
value: 2,
},
{
label: "充值返利圈回",
value: 3,
},
{
label: "消费返利圈回",
value: 4,
},
],
// rechargeStatusEnum: [
// {
// label: "",
// value: 0,
// },
// {
// label: "",
// value: 1,
// },
// {
// label: "",
// value: -1,
// },
// ],
// repaymentExamineEnum: [
// {
// label: "",
// value: 0,
// },
// {
// label: "",
// value: 1,
// },
// {
// label: "",
// value: -1,
// },
// {
// label: "",
// value: -2,
// },
// ],
oilCompanyMatch: {},
mappingData: [
{
carTitle: "",
carItems: [
{ label: "ID", value: "id" },
{ label: "交易类型", value: "transactionType" },
{ label: "交易状态", value: "transactionState" },
{ label: "交易金额", value: "transactionAmount" },
{ label: "充值返利比例", value: "rechargeRebate" },
{ label: "充值返利金额", value: "rechargeRebateAmount" },
{ label: "线下汇款公司账户", value: "offlinePaymentCompany" },
{ label: "线下交易发起时间", value: "offlineStartTime" },
{ label: "线下交易完成时间", value: "offlineCompleteTime" },
{ label: "线下交易凭证", value: "offlineTransactionProof" },
{ label: "交易审核标识", value: "auditMark" },
{ label: "审核人", value: "auditUserName" },
{ label: "交易说明", value: "reverseRemark" },
{ label: "审核时间", value: "auditTime" },
{ label: "审核系统来源", value: "auditSource" },
{ label: "赊销还款审核", value: "chargeSalesAuditMark" },
{ label: "赊销还款审核人", value: "chargeSalesAuditUser" },
{ label: "赊销还款审核时间", value: "chargeSalesAuditTime" },
{ label: "赊销还款审核来源", value: "chargeSalesAuditSource" },
{ label: "创建用户", value: "createUserName" },
{ label: "创建时间", value: "createTime" },
{ label: "创建数据来源", value: "createSource" },
{ label: "企业收款账户", value: "internalCompanyName" },
{ label: "开户行", value: "bankDeposit" },
{ label: "银行卡号", value: "bankCardNo" },
],
},
{
carTitle: "账户信息",
carItems: [
{ label: "账户总余额", value: "balance" },
{ label: "待还总金额", value: "totalChargeAmount" },
{ label: "账户状态", value: "accountState" },
{ label: "账户类型", value: "accountType" },
{ label: "账户充值余额", value: "rechargeBalance" },
{ label: "赊销充值余额", value: "chargeRechargeBalance" },
{ label: "充值返利余额", value: "rechargeRebateBalance" },
{ label: "消费返利余额", value: "consumeRebateBalance" },
{ label: "累计充值金额", value: "totalRechargeAmount" },
{ label: "累计赊销充值金额", value: "totalChargeRechargeAmount" },
{ label: "累计充值返利金额", value: "totalRechargeRebateAmount" },
{ label: "累计消费返利金额", value: "totalConsumeRebateAmount" },
],
},
],
};
},
created() {
this.initDateTime();
this.getByPage();
},
updated() {
this.$nextTick(() => {
this.$refs.multipleTable && this.$refs.multipleTable.doLayout();
});
},
mounted() {
this.$nextTick(() => {
this.heightHandle();
});
window.addEventListener(
"resize",
this.$utils.debounce(this.heightHandle, 500)
);
},
methods: {
search() {
this.parameter.currentPage = 1;
this.getByPage();
},
//table list
getByPage() {
// this.parameter.params.companyAccountType = "4";
serve.getByPage(this.parameter).then((res) => {
this.tableData = res.data.list;
this.parameter.total = res.data.totalCount;
});
},
//
addition() {
this.controlWindows.addInfo.title = "产品新增";
this.controlWindows.add = true;
},
detail(row) {
Promise.all([
serve.get(row.id),
serve.getByCompanyId(row.companyId),
]).then(([firstRes, secondRes]) => {
this.oilCompanyMatch = { ...firstRes.data, ...secondRes.data };
console.log("this.oilCompanyMatch", this.oilCompanyMatch);
this.controlWindows.detail = true;
});
},
getSummaries(param) {
const { columns, data } = param;
const sums = [];
let transactionAmount = 0; //
let rechargeRebateAmount = 0; //
data.forEach((item) => {
transactionAmount += item.transactionAmount
? item.transactionAmount
: 0;
rechargeRebateAmount += item.rechargeRebateAmount
? item.rechargeRebateAmount
: 0;
});
transactionAmount = transactionAmount.toFixed(2);
rechargeRebateAmount = rechargeRebateAmount.toFixed(2);
columns.forEach((item, index) => {
if (index === 1) {
sums[index] = "合计";
return;
}
switch (item.property) {
case "transactionAmount":
sums[index] = transactionAmount + "元";
break;
case "rechargeRebateAmount":
sums[index] = rechargeRebateAmount + "元";
break;
default:
break;
}
});
return sums;
},
//
reset() {
this.parameter = {
currentPage: 1,
pageSize: 10,
total: 0,
params: {},
};
this.initDateTime();
},
// init
initDateTime() {
let now = new Date().getTime();
let beforeDay30 = now - 1000 * 60 * 60 * 24 * 30;
let nowRes = this.$utils.parseTime(now);
let beforeDay30Res = this.$utils.parseTime(beforeDay30);
let { y, M, d } = nowRes;
let { y: beforey, M: beforeM, d: befored } = beforeDay30Res;
this.datetime = [
`${beforey}-${beforeM}-${befored} 00:00:00`,
`${y}-${M}-${d} 23:59:59`,
];
this.changeDateTime(this.datetime);
},
changeDateTime(val) {
if (val) {
this.parameter.params.createTimeStart = val[0];
this.parameter.params.createTimeEnd = val[1];
}
console.log(val);
},
// table height
heightHandle() {
let bodyHeight = document.body.clientHeight;
let frameHeight = this.obtainElement(".frame").clientHeight;
let operationHeight = this.obtainElement(".operation").clientHeight;
let paginationHeight = this.obtainElement(".el-pagination").clientHeight;
this.tableHeight =
bodyHeight - frameHeight - operationHeight - paginationHeight - 145;
},
obtainElement(className) {
return document.documentElement.querySelector(className);
},
},
};
</script>
<style lang="scss" scoped>
.enterprise-recharge-details {
.frame {
margin: 20px;
padding: 20px;
border-radius: 6px;
border: 1px solid #e3e3e5;
background: #fff;
.el-input,
.el-select {
width: 183px;
height: 40px;
}
.el-autocomplete + .el-input,
.el-input + .el-autocomplete,
.el-autocomplete + .el-select,
.el-input + .el-input,
.el-input + .el-select,
.el-select + .el-select,
.el-select + .el-input {
margin-right: 20px;
margin-bottom: 15px;
}
.mr20 {
margin-right: 20px;
}
.buttons {
text-align: right;
}
}
.table {
overflow: hidden;
margin: 0 20px;
padding-bottom: 20px;
background: #fff;
border-radius: 6px;
border: 1px solid #e3e3e5;
> .operation {
box-sizing: content-box;
padding: 15px;
}
.gray {
color: #999;
span {
color: #333;
}
}
.el-table {
margin-bottom: 20px;
border-radius: 10px 10px 0px 0px;
}
.el-dropdown-link {
margin-right: 10px;
cursor: pointer;
color: #409eff;
&.special {
margin-right: 0;
}
}
.el-icon-arrow-down {
font-size: 12px;
}
}
}
</style>

@ -29,7 +29,7 @@
</div>
<div class="table">
<div class="operation">
<el-button @click="addition">新增产品</el-button>
<!-- <el-button @click="addition">新增产品</el-button> -->
</div>
<el-table
v-if="tableHeight"

@ -0,0 +1,258 @@
<template>
<el-drawer
title="企业充值"
direction="ltr"
size="40%"
:visible="controlWindows.add"
@opened="openDrawer"
:before-close="closeWindow"
>
<div class="add">
<el-form ref="form" :model="form" :rules="rules" label-width="110px">
<el-form-item label="公司" prop="companyId">
<autocomplete :params="form" :config="configAutocomplete" />
</el-form-item>
<el-form-item label="交易类型" prop="productType">
<el-select v-model="form.productType" placeholder="请选择交易类型">
<el-option label="赊销" value="CHARGE_SALES" />
<el-option label="消费返利" value="CONSUME_REBATE" />
</el-select>
</el-form-item>
<el-form-item label="交易金额" prop="belongLibrary">
<el-input
v-checkNum
v-model="form.belongLibrary"
placeholder="请输入交易金额"
></el-input>
</el-form-item>
<el-form-item label="线下汇款公司账户" prop="belongLibrary">
<el-input
v-model="form.belongLibrary"
placeholder="请输入线下汇款公司账户"
></el-input>
</el-form-item>
<el-form-item label="线下交易发起时间" prop="belongLibrary">
<el-date-picker
v-model="value1"
type="datetime"
placeholder="线下交易发起时间"
>
</el-date-picker>
</el-form-item>
<el-form-item label="线下交易完成时间" prop="belongLibrary">
<el-date-picker
v-model="value1"
type="datetime"
placeholder="线下交易完成时间"
>
</el-date-picker>
</el-form-item>
<el-form-item label="线下交易凭证" prop="belongLibrary">
<el-upload
:action="uploadUrl"
list-type="picture-card"
:on-preview="offlineTransactionProofPreview"
:on-success="offlineTransactionProofSuccess"
:before-upload="imgCompress"
:on-remove="offlineTransactionProofRemove"
:data="{ ossKey: 'xingyou', pathKey: 'other', encrypt: 'PUBLIC' }"
:headers="headers"
:limit="1"
>
<i class="el-icon-plus" />
</el-upload>
</el-form-item>
<el-form-item label="交易说明" prop="belongLibrary">
<el-input
type="textarea"
:rows="2"
placeholder="请输入内容"
v-model="textarea"
>
</el-input>
</el-form-item>
</el-form>
</div>
<div class="buttons">
<el-button @click="closeWindow">取消 </el-button>
<el-button @click="submit">提交</el-button>
</div>
</el-drawer>
</template>
<script>
import serve from "api/financialCenter/enterpriseRechargeDetails.js";
import commonServe from "api/common.js";
import autocomplete from "components/autocomplete/index.vue";
import {
rechargeTypeEnum,
rechargeStatusEnum,
repaymentExamineEnum,
} from "utils/dataType.js";
export default {
components: {
autocomplete,
},
props: {
controlWindows: Object,
},
data() {
let validatorcompanyId = (rule, value, callback) => {
if (this.form.companyId) callback();
else callback("请选择公司");
};
return {
uploadUrl: process.env.VUE_APP_UPLOAD_URL,
form: {},
refineryList: [],
configAutocomplete: {
serveTarget: commonServe.getRefineryCompanyList,
autocompleteKey: "name",
labelKey: "name",
valueKey: "id",
placeholder: "企业名称",
querykey: "companyId",
},
productTypeList: [
{
label: "0#柴",
value: "0#",
},
{
label: "-10#柴",
value: "-10#",
},
{
label: "92#汽",
value: "92#",
},
{
label: "95#汽",
value: "95#",
},
],
rules: {
productName: [
{ required: true, message: "请输入产品名称", trigger: "blur" },
],
productType: [
{ required: true, message: "请选择产品类型", trigger: "change" },
],
companyId: [
{ required: true, validator: validatorcompanyId, trigger: "change" },
],
belongLibrary: [
{ required: true, message: "请输入所属炼厂库名", trigger: "blur" },
],
floorPrice: [
{ required: true, message: "请输入成本价", trigger: "blur" },
],
salePrice2company: [
{ required: true, message: "请输入企业销售价", trigger: "blur" },
],
salePrice2personal: [
{ required: true, message: "请输入个人销售价", trigger: "blur" },
],
measurement: [
{ required: true, message: "请输入计量单位", trigger: "blur" },
],
enableMark: [
{ required: true, message: "请选择启用状态", trigger: "change" },
],
},
};
},
methods: {
openDrawer() {
let { id } = this.controlWindows.addInfo;
if (id) {
//
this.form = JSON.parse(JSON.stringify(this.controlWindows.addInfo));
this.configAutocomplete.echoId = id;
this.configAutocomplete.echoName = this.form.refineryName;
console.log("this.form", this.form.floorPrice);
}
},
submit() {
console.log("this.form", this.form);
this.$refs["form"].validate((valid) => {
if (valid) {
this.judgeInterface(this.form).then((res) => {
if (res.code === 20000) {
this.$message.success(res.msg);
this.closeWindow();
}
});
}
});
},
judgeInterface(form) {
let { id } = this.controlWindows.addInfo;
if (id) return serve.update(form);
else return serve.save(form);
},
//list
// findByEntity() {
// refineryServe.findByEntity().then((res) => {
// this.refineryList = res.data;
// });
// },
//
// querySearchAsync(queryString, cb) {
// if (queryString) {
// refineryServe
// .findByEntity({ refineryName: queryString })
// .then((res) => {
// let timeInstance = setTimeout(() => {
// clearTimeout(timeInstance);
// if (res.data.length) {
// cb(res.data);
// } else cb([]);
// }, 1000 * Math.random());
// });
// } else cb([]);
// },
closeWindow() {
this.$emit("closeWindow");
this.form = {};
this.controlWindows.addInfo = {};
this.$nextTick(() => {
this.$refs.form.clearValidate();
this.controlWindows.add = false;
});
},
},
};
</script>
<style lang="scss" scoped>
.add {
padding: 20px;
.el-input,
.el-select,
.el-textarea,
.el-autocomplete {
width: 300px;
}
}
.buttons {
position: absolute;
left: 0;
bottom: 0;
padding-right: 40px;
width: 100%;
height: 80px;
line-height: 80px;
text-align: right;
border-top: 1px solid #f2f3f5;
.el-button {
text-align: right;
font-size: 14px;
border-radius: 5px;
}
}
</style>

@ -82,7 +82,7 @@
</div>
<div class="table">
<div class="operation">
<!-- <el-button @click="addition">新增产品</el-button> -->
<el-button @click="addition">企业充值</el-button>
</div>
<el-table
v-if="tableHeight"

Loading…
Cancel
Save