更新
This commit is contained in:
@@ -275,7 +275,7 @@
|
||||
align="center"
|
||||
>
|
||||
<template slot-scope="{ row }">
|
||||
<span class="el-dropdown-link">详情</span>
|
||||
<span class="el-dropdown-link" @click="detail(row)">详情</span>
|
||||
<el-dropdown
|
||||
@command="
|
||||
(val) => {
|
||||
@@ -314,6 +314,11 @@
|
||||
:companyNatureTypeEnum="companyNatureTypeEnum"
|
||||
@closeWindow="search"
|
||||
/>
|
||||
<!-- 认证 -->
|
||||
<attestation :controlWindows="controlWindows" @closeWindow="search" />
|
||||
<!-- 财务 -->
|
||||
<finance :controlWindows="controlWindows" @closeWindow="search" />
|
||||
|
||||
<!-- 详情 -->
|
||||
<el-drawer
|
||||
title="详情"
|
||||
@@ -330,12 +335,77 @@
|
||||
:mappingData="mappingData"
|
||||
@close="controlWindows.detail = false"
|
||||
>
|
||||
<template #offlineTransactionProof>
|
||||
<template #parentMark>
|
||||
<p>
|
||||
{{ oilCompanyMatch[0].parentMark === 0 ? "主体公司" : "分公司" }}
|
||||
</p>
|
||||
</template>
|
||||
<template #companyNature>
|
||||
<!-- <p v-if="oilCompanyMatch[0]">
|
||||
{{
|
||||
companyNatureEnum.find(
|
||||
(item) => item.value === oilCompanyMatch[0].companyNature
|
||||
).label
|
||||
}}
|
||||
</p> -->
|
||||
</template>
|
||||
<template #companyDockType>
|
||||
<p>
|
||||
{{
|
||||
oilCompanyMatch[0].companyDockType == 0 ? "对接客户" : "平台客户"
|
||||
}}
|
||||
</p>
|
||||
</template>
|
||||
<template #enableMark>
|
||||
<p>
|
||||
{{ oilCompanyMatch[0].enableMark == 0 ? "禁用" : "启用" }}
|
||||
</p>
|
||||
</template>
|
||||
<template #auditMark>
|
||||
<p>
|
||||
{{
|
||||
auditMarkEnum.find(
|
||||
(item) => item.value == oilCompanyMatch[0].enableMark
|
||||
).label
|
||||
}}
|
||||
</p>
|
||||
</template>
|
||||
<template #getInfoName>
|
||||
<p>
|
||||
{{ oilCompanyMatch[0].name }}
|
||||
</p>
|
||||
</template>
|
||||
|
||||
<template #businessLienceImg>
|
||||
<el-image
|
||||
style="width: 100px; height: 100px"
|
||||
:src="oilCompanyMatch.offlineTransactionProof"
|
||||
:src="oilCompanyMatch[1].businessLienceImg"
|
||||
/>
|
||||
</template>
|
||||
<template #settlementModes>
|
||||
<p v-if="oilCompanyMatch[2]">
|
||||
{{ settlementModesEnum[oilCompanyMatch[2].settlementModes] }}
|
||||
</p>
|
||||
</template>
|
||||
<template #defaultShare>
|
||||
<p v-if="oilCompanyMatch[2]">
|
||||
{{ oilCompanyMatch[2].defaultShare === 1 ? "共享" : "不共享" }}
|
||||
</p>
|
||||
</template>
|
||||
<template #accountState>
|
||||
<p v-if="oilCompanyMatch[3]">
|
||||
{{
|
||||
accountStatusEnum.find(
|
||||
(item) => item.value === oilCompanyMatch[3].accountState
|
||||
).label
|
||||
}}
|
||||
</p>
|
||||
</template>
|
||||
<template #accountType>
|
||||
<p v-if="oilCompanyMatch[3]">
|
||||
{{ oilCompanyMatch[3].accountType == 0 ? "基础账户" : "" }}
|
||||
</p>
|
||||
</template>
|
||||
</general-details>
|
||||
</el-drawer>
|
||||
|
||||
@@ -393,6 +463,8 @@ import pagination from "components/pagination/index.vue";
|
||||
import generalDetails from "components/generalDetails/index.vue";
|
||||
|
||||
import add from "./components/add.vue";
|
||||
import attestation from "./components/attestation.vue";
|
||||
import finance from "./components/finance.vue";
|
||||
|
||||
import { rechargeTypeEnum, rechargeStatusEnum } from "utils/dataType.js";
|
||||
|
||||
@@ -401,6 +473,8 @@ export default {
|
||||
// OilCompanyInfoUpdate,
|
||||
// OilCompanyInfoAdd,
|
||||
add,
|
||||
attestation,
|
||||
finance,
|
||||
|
||||
pagination,
|
||||
autocomplete,
|
||||
@@ -412,6 +486,8 @@ export default {
|
||||
add: false,
|
||||
addInfo: {},
|
||||
detail: false,
|
||||
attestation: false,
|
||||
finance: false,
|
||||
},
|
||||
tableData: [],
|
||||
userList: [],
|
||||
@@ -502,53 +578,79 @@ export default {
|
||||
value: "6",
|
||||
},
|
||||
],
|
||||
settlementModesEnum: {
|
||||
1: "充值返利",
|
||||
2: "消费返利",
|
||||
3: "充值返利+消费返利",
|
||||
},
|
||||
oilCompanyMatch: {},
|
||||
mappingData: [
|
||||
{
|
||||
carTitle: "",
|
||||
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: "账户ID", value: "id" },
|
||||
{ label: "企业名称", value: "name" },
|
||||
{ label: "企业简称", value: "abbreviaName" },
|
||||
// { label: "是否为主体公司", value: "parentMark" },
|
||||
// { label: "上级公司", value: "name" },
|
||||
{ label: "公司性质", value: "parentMark" },
|
||||
{ label: "企业性质", value: "companyNature" },
|
||||
{ label: "公司对接类型", value: "companyDockType" },
|
||||
{ label: "启用标识", value: "enableMark" },
|
||||
{ label: "审核标识", value: "auditMark" },
|
||||
{ label: "审核说明", value: "auditRemarks" },
|
||||
],
|
||||
},
|
||||
{
|
||||
carTitle: "认证信息",
|
||||
carItems: [
|
||||
{ label: "公司名称", value: "getInfoName" },
|
||||
{ label: "省份名称", value: "provinceName" },
|
||||
{ label: "城市名称", value: "cityName" },
|
||||
{ label: "区县名称", value: "areaName" },
|
||||
{ label: "详细地址", value: "address" },
|
||||
{ label: "法人代表", value: "companyLegalPerson" },
|
||||
{ label: "注册资本", value: "registeredCapital" },
|
||||
{ label: "经营范围", value: "businessScope" },
|
||||
{ label: "经营资质", value: "businessQualia" },
|
||||
{ label: "联系方式", value: "contactPhone" },
|
||||
{ label: "企业网址", value: "website" },
|
||||
{ label: "营业执照号码", value: "businessLienceId" },
|
||||
{ label: "营业执照照片", value: "businessLienceImg" },
|
||||
{ label: "GScode", value: "gsCode" },
|
||||
],
|
||||
},
|
||||
{
|
||||
carTitle: "财务信息",
|
||||
carItems: [
|
||||
{ label: "结算方式", value: "settlementModes" },
|
||||
{ label: "充值返利费率", value: "rechargeRebate" },
|
||||
{ label: "消费返利叠加费率", value: "consumptionRebate" },
|
||||
{ label: "结账周期", value: "billingCycle" },
|
||||
{ label: "是否开启企业共享额度", value: "defaultShare" },
|
||||
{ label: "默认单次额度上限", value: "defaultOnceUp" },
|
||||
{ label: "默认单日加油额度上限", value: "defaultDayUp" },
|
||||
{ label: "创建人编号", value: "createUser" },
|
||||
{ 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: "balance" },
|
||||
{ label: "待还总金额", value: "totalChargeAmount" },
|
||||
{ label: "账户充值余额", value: "rechargeBalance" },
|
||||
{ label: "赊销充值余额", value: "chargeRechargeBalance" },
|
||||
{ label: "充值返利余额", value: "rechargeRebateBalance" },
|
||||
{ label: "消费返利余额", value: "consumeRebateBalance" },
|
||||
{ label: "累计充值金额", value: "totalRechargeAmount" },
|
||||
{ label: "累计赊销充值金额", value: "totalChargeRechargeAmount" },
|
||||
{ label: "累计充值返利金额", value: "totalRechargeRebateAmount" },
|
||||
{ label: "累计消费返利金额", value: "totalConsumeRebateAmount" },
|
||||
{ label: "累计开票金额", value: "totalInvoiceAmount" },
|
||||
{ label: "创建人编号", value: "createUser" },
|
||||
{ label: "创建时间", value: "createTime" },
|
||||
],
|
||||
},
|
||||
],
|
||||
@@ -623,7 +725,7 @@ export default {
|
||||
//更多
|
||||
commandMore(val, row) {
|
||||
if (val === "base") {
|
||||
serve.getInfo(row.id).then((res) => {
|
||||
commonServe.getInfo(row.id).then((res) => {
|
||||
this.controlWindows.addInfo = {
|
||||
title: "修改",
|
||||
...res.data,
|
||||
@@ -631,18 +733,61 @@ export default {
|
||||
this.controlWindows.add = true;
|
||||
});
|
||||
}
|
||||
if (val === "attestation") {
|
||||
commonServe.getByCompanyIdAuth(row.id).then((res) => {
|
||||
this.controlWindows.addInfo = {
|
||||
...res.data,
|
||||
// 由于该接口没有查询auditmark 而旧逻辑是通过auditmark来区分对认证信息是新增还是修改
|
||||
// 因此此处使用列表接口返回的auditmark覆盖掉该接口返回的auditmark
|
||||
auditMark: row.auditMark,
|
||||
title: row.auditMark == 0 ? "新增认证信息" : "修改认证信息",
|
||||
};
|
||||
this.controlWindows.attestation = true;
|
||||
console.log(this.controlWindows.attestation);
|
||||
});
|
||||
}
|
||||
if (val === "finance") {
|
||||
commonServe.getByCompanyIdFinance(row.id).then((res) => {
|
||||
if (res.data) {
|
||||
this.controlWindows.addInfo = {
|
||||
currentType: "update",
|
||||
title: "修改财务信息",
|
||||
...res.data,
|
||||
};
|
||||
} else {
|
||||
commonServe.getInfo(row.id).then((res) => {
|
||||
this.controlWindows.addInfo = {
|
||||
currentType: "add",
|
||||
title: "新增财务信息",
|
||||
...res.data,
|
||||
};
|
||||
});
|
||||
}
|
||||
this.controlWindows.finance = true;
|
||||
});
|
||||
}
|
||||
},
|
||||
detail(row) {
|
||||
// commonServe.getInfo(row.id).then((res) => {
|
||||
Promise.allSettled([
|
||||
commonServe.getInfo(row.id),
|
||||
commonServe.getByCompanyIdAuth(row.id),
|
||||
commonServe.getByCompanyIdFinance(row.id),
|
||||
commonServe.getByCompanyIdAccount(row.id),
|
||||
]).then((res) => {
|
||||
// console.log("res", res);
|
||||
// return;
|
||||
this.oilCompanyMatch = [];
|
||||
res.forEach((item) => {
|
||||
let result = item.status === "fulfilled" ? item.value.data : null;
|
||||
this.oilCompanyMatch.push(result);
|
||||
});
|
||||
// this.oilCompanyMatch = [infoRes, financeRes, authRes, accountRes];
|
||||
console.log("this.oilCompanyMatch", this.oilCompanyMatch);
|
||||
this.controlWindows.detail = 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;
|
||||
// });
|
||||
// },
|
||||
// 启用禁用点击
|
||||
enableMark(val, row) {
|
||||
row.enableMark = val == 1 ? 0 : 1;
|
||||
|
||||
Reference in New Issue
Block a user