Merge branch 'xiaozy_产品列表' of http://121.196.213.68:3000/xiaozhiyong/refinery-admin into xiaozy_产品列表

src/utils/dataType.js

@@ -65,3 +65,18 @@ export const repaymentExamineEnum = [
     value: -2,
   },
 ];
+// 账户状态
+export const accountStatusEnum = [
+  {
+    label: "禁用",
+    value: 0,
+  },
+  {
+    label: "启用",
+    value: 1,
+  },
+  {
+    label: "冻结",
+    value: -1,
+  },
+];

src/views/financialCenter/enterpriseRecharge/index.vue

@@ -290,6 +290,51 @@
             :src="oilCompanyMatch.offlineTransactionProof"
           />
         </template>
+        <template #transactionType>
+          <p class="ft14">
+            {{
+              oilCompanyMatch.transactionType === "TURN"
+                ? LoopBackTypeEnum.find(
+                    (item) => item.value === oilCompanyMatch.turnType
+                  ).label
+                : rechargeTypeEnum.find(
+                    (item) => item.value === oilCompanyMatch.transactionType
+                  ).label
+            }}
+          </p>
+        </template>
+        <template #transactionState>
+          <p class="ft14">
+            {{
+              rechargeStatusEnum.find(
+                (item) => item.value === oilCompanyMatch.transactionState
+              ).label
+            }}
+          </p>
+        </template>
+        <template #auditMark>
+          <p class="ft14">
+            {{
+              auditMarkEnum.find(
+                (item) => item.value === oilCompanyMatch.auditMark
+              ).label
+            }}
+          </p>
+        </template>
+        <template #accountState>
+          <p class="ft14">
+            {{
+              accountStatusEnum.find(
+                (item) => item.value === oilCompanyMatch.accountState
+              ).label
+            }}
+          </p>
+        </template>
+        <template #accountType>
+          <p class="ft14">
+            {{ oilCompanyMatch.accountType === "0" ? "基础账户" : "" }}
+          </p>
+        </template>
         <template v-if="controlWindows.addInfo.examineMark" #footer>
           <el-button type="success" @click="examineAdopt">审核通过</el-button>
           <el-button type="danger" @click="examineFail">审核不通过</el-button>
@@ -317,6 +362,7 @@ import {
   rechargeTypeEnum,
   rechargeStatusEnum,
   repaymentExamineEnum,
+  accountStatusEnum,
 } from "utils/dataType.js";
 
 export default {
@@ -338,6 +384,7 @@ export default {
         detail: false,
         examine: false,
       },
+      accountStatusEnum: accountStatusEnum,
       rechargeTypeEnum: [
         {
           label: "圈回",
@@ -468,6 +515,7 @@ export default {
       mappingData: [
         {
           carTitle: "",
+          // 标记
           carItems: [
             { label: "ID", value: "id" },
             { label: "交易类型", value: "transactionType" },
@@ -484,10 +532,10 @@ export default {
             { label: "交易说明", value: "reverseRemark" },
             { label: "审核时间", value: "auditTime" },
             { label: "审核系统来源", value: "auditSource" },
-            { label: "赊销还款审核", value: "chargeSalesAuditMark" },
-            { label: "赊销还款审核人", value: "chargeSalesAuditUser" },
-            { label: "赊销还款审核时间", value: "chargeSalesAuditTime" },
-            { label: "赊销还款审核来源", value: "chargeSalesAuditSource" },
+            // { label: "赊销还款审核", value: "chargeSalesAuditMark" },
+            // { label: "赊销还款审核人", value: "chargeSalesAuditUser" },
+            // { label: "赊销还款审核时间", value: "chargeSalesAuditTime" },
+            // { label: "赊销还款审核来源", value: "chargeSalesAuditSource" },
             { label: "创建用户", value: "createUserName" },
             { label: "创建时间", value: "createTime" },
             { label: "创建数据来源", value: "createSource" },
@@ -504,11 +552,11 @@ export default {
             { label: "账户状态", value: "accountState" },
             { label: "账户类型", value: "accountType" },
             { label: "账户充值余额", value: "rechargeBalance" },
-            { label: "赊销充值余额", value: "chargeRechargeBalance" },
+            // { label: "赊销充值余额", value: "chargeRechargeBalance" },
             { label: "充值返利余额", value: "rechargeRebateBalance" },
             { label: "消费返利余额", value: "consumeRebateBalance" },
             { label: "累计充值金额", value: "totalRechargeAmount" },
-            { label: "累计赊销充值金额", value: "totalChargeRechargeAmount" },
+            // { label: "累计赊销充值金额", value: "totalChargeRechargeAmount" },
             { label: "累计充值返利金额", value: "totalRechargeRebateAmount" },
             { label: "累计消费返利金额", value: "totalConsumeRebateAmount" },
           ],
@@ -765,5 +813,8 @@ export default {
       font-size: 12px;
     }
   }
+  .ft14 {
+    font-size: 14px;
+  }
 }
 </style>