From fb1300a70e32df3a54a9ceb6bdb94c6db76d8722 Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Tue, 21 Feb 2023 09:22:53 +0800
Subject: [PATCH 01/18] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/common.js                             |  19 +
 src/api/financialCenter/billDetails.js        |  19 +
 src/api/financialCenter/enterpriseRecharge.js |  21 +
 .../enterpriseRechargeDetails.js              |  21 +
 src/components/autocomplete/index.vue         |   4 +-
 src/components/generalDetails/index.vue       |  36 +-
 src/utils/dataType.js                         |  55 ++
 .../financialCenter/billDetails/index.vue     | 474 +++++++++++++
 .../enterpriseRecharge/index.vue              | 653 ++++++++++++++++++
 .../enterpriseRechargeDetails/index.vue       | 570 +++++++++++++++
 src/views/product/index.vue                   |  35 +-
 11 files changed, 1868 insertions(+), 39 deletions(-)
 create mode 100644 src/api/common.js
 create mode 100644 src/api/financialCenter/billDetails.js
 create mode 100644 src/api/financialCenter/enterpriseRecharge.js
 create mode 100644 src/api/financialCenter/enterpriseRechargeDetails.js
 create mode 100644 src/views/financialCenter/billDetails/index.vue
 create mode 100644 src/views/financialCenter/enterpriseRecharge/index.vue
 create mode 100644 src/views/financialCenter/enterpriseRechargeDetails/index.vue

diff --git a/src/api/common.js b/src/api/common.js
new file mode 100644
index 0000000..2a1f213
--- /dev/null
+++ b/src/api/common.js
@@ -0,0 +1,19 @@
+import request from "utils/axios.js";
+// 远程搜索公司
+const getRefineryCompanyList = (params) => {
+  return request.postJson(
+    "/oil-user/oilCompanyInfo/getRefineryCompanyList",
+    params
+  );
+};
+// 远程搜索用户
+const liekQuery = (query) => {
+  return request.get(
+    `oil-user/sysCustomerInfo/liekQuery/${query.queryTypeGet}`
+  );
+};
+
+export default {
+  getRefineryCompanyList,
+  liekQuery,
+};
diff --git a/src/api/financialCenter/billDetails.js b/src/api/financialCenter/billDetails.js
new file mode 100644
index 0000000..8f1de92
--- /dev/null
+++ b/src/api/financialCenter/billDetails.js
@@ -0,0 +1,19 @@
+import request from "utils/axios.js";
+// table
+const getByPage = (params) => {
+  return request.postJson(
+    "/oil-finance/oilCompanyAccountRecord/getByPage",
+    params
+  );
+};
+//详情
+const getCompanyAccountRecord = (params) => {
+  return request.postJson(
+    "oil-finance/oilCompanyAccountRecord/getCompanyAccountRecord",
+    params
+  );
+};
+export default {
+  getByPage,
+  getCompanyAccountRecord,
+};
diff --git a/src/api/financialCenter/enterpriseRecharge.js b/src/api/financialCenter/enterpriseRecharge.js
new file mode 100644
index 0000000..d6857a6
--- /dev/null
+++ b/src/api/financialCenter/enterpriseRecharge.js
@@ -0,0 +1,21 @@
+import request from "utils/axios.js";
+// table
+const getByPage = (params) => {
+  return request.postJson(
+    "/oil-finance/oilCompanyAccountReverse/getByPage",
+    params
+  );
+};
+//详情
+const get = (query) => {
+  return request.get(`/oil-finance/oilCompanyAccountReverse/get/${query}`);
+};
+//详情
+const getByCompanyId = (query) => {
+  return request.get(`/oil-finance/oilCompanyAccount/getByCompanyId/${query}`);
+};
+export default {
+  getByPage,
+  get,
+  getByCompanyId,
+};
diff --git a/src/api/financialCenter/enterpriseRechargeDetails.js b/src/api/financialCenter/enterpriseRechargeDetails.js
new file mode 100644
index 0000000..d6857a6
--- /dev/null
+++ b/src/api/financialCenter/enterpriseRechargeDetails.js
@@ -0,0 +1,21 @@
+import request from "utils/axios.js";
+// table
+const getByPage = (params) => {
+  return request.postJson(
+    "/oil-finance/oilCompanyAccountReverse/getByPage",
+    params
+  );
+};
+//详情
+const get = (query) => {
+  return request.get(`/oil-finance/oilCompanyAccountReverse/get/${query}`);
+};
+//详情
+const getByCompanyId = (query) => {
+  return request.get(`/oil-finance/oilCompanyAccount/getByCompanyId/${query}`);
+};
+export default {
+  getByPage,
+  get,
+  getByCompanyId,
+};
diff --git a/src/components/autocomplete/index.vue b/src/components/autocomplete/index.vue
index 1d3b1dd..2bb9ffd 100644
--- a/src/components/autocomplete/index.vue
+++ b/src/components/autocomplete/index.vue
@@ -66,7 +66,9 @@ export default {
       if (query !== "") {
         this.loading = true;
         let params = {};
-        params[this.config.autocompleteKey] = query;
+        this.config.autocompleteKey
+          ? (params[this.config.autocompleteKey] = query)
+          : (params["queryTypeGet"] = query);
         this.config.serveTarget(params).then((res) => {
           let timeInstance = setTimeout(() => {
             this.loading = false;
diff --git a/src/components/generalDetails/index.vue b/src/components/generalDetails/index.vue
index 6509990..680e534 100644
--- a/src/components/generalDetails/index.vue
+++ b/src/components/generalDetails/index.vue
@@ -37,21 +37,27 @@
             :style="{ maxHeight: item.isFold ? '100vh' : '0px' }"
             class="my-cell"
           >
-            <div v-for="(i, x) in item.listData" :key="x" class="cell-item">
-              <span :title="i.remark" class="color-999 test-tst">
-                {{ i.label }}
-                <i v-if="i.remark" class="header-icon el-icon-info"></i>
-                <i
-                  @click="isCopy($event)"
-                  v-if="i.isCopy"
-                  class="el-icon-document-copy"
-                ></i>
-              </span>
-              <br />
-              <slot class="inner-data" :name="`${i.field}`">
-                <span class="inner-data">{{ i.value }}</span>
-              </slot>
-            </div>
+            <template
+              v-if="item.listData.length && item.listData[0].field !== 'table'"
+            >
+              <div v-for="(i, x) in item.listData" :key="x" class="cell-item">
+                <span :title="i.remark" class="color-999 test-tst">
+                  {{ i.label }}
+                  <i v-if="i.remark" class="header-icon el-icon-info"></i>
+                  <i
+                    @click="isCopy($event)"
+                    v-if="i.isCopy"
+                    class="el-icon-document-copy"
+                  ></i>
+                </span>
+                <br />
+                <slot class="inner-data" :name="`${i.field}`">
+                  <span class="inner-data">{{ i.value }}</span>
+                </slot>
+              </div>
+            </template>
+
+            <slot v-else name="table"> </slot>
           </div>
         </el-card>
         <div>
diff --git a/src/utils/dataType.js b/src/utils/dataType.js
index 8a56550..22a5192 100644
--- a/src/utils/dataType.js
+++ b/src/utils/dataType.js
@@ -1,12 +1,67 @@
+// 炼厂类型
 export const refineryTypeEnum = [
   {
     label: "普通炼厂",
     value: "COMMON",
   },
 ];
+// 炼厂账户类型
 export const refineryAccountTypeEnum = [
   {
     label: "普通炼厂",
     value: "COMMON",
   },
 ];
+// 交易类型
+export const rechargeTypeEnum = [
+  {
+    label: "充值",
+    value: "RECHARGE",
+  },
+  {
+    label: "销账",
+    value: "REVOKE",
+  },
+  {
+    label: "赊销",
+    value: "CHARGE_SALES",
+  },
+  {
+    label: "消费返利",
+    value: "CONSUME_REBATE",
+  },
+];
+// 交易状态
+export const rechargeStatusEnum = [
+  {
+    label: "已申请",
+    value: 0,
+  },
+  {
+    label: "已成功",
+    value: 1,
+  },
+  {
+    label: "已撤销",
+    value: -1,
+  },
+];
+// 赊销还款审核
+export const repaymentExamineEnum = [
+  {
+    label: "还款待审核",
+    value: 0,
+  },
+  {
+    label: "还款成功",
+    value: 1,
+  },
+  {
+    label: "还款失败",
+    value: -1,
+  },
+  {
+    label: "待还款",
+    value: -2,
+  },
+];
diff --git a/src/views/financialCenter/billDetails/index.vue b/src/views/financialCenter/billDetails/index.vue
new file mode 100644
index 0000000..66bd0ea
--- /dev/null
+++ b/src/views/financialCenter/billDetails/index.vue
@@ -0,0 +1,474 @@
+<template>
+  <div class="bill-details">
+    <div class="frame">
+      <!-- 公司名称 -->
+      <autocomplete
+        class="mr20"
+        :params="parameter.params"
+        :config="configAutocomplete"
+      />
+
+      <el-select
+        v-model="parameter.params.billType"
+        placeholder="交易类型"
+        clearable
+      >
+        <el-option
+          v-for="(item, index) in rechargeTypeEnum"
+          :key="index"
+          :label="item.label"
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+
+      <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"
+        style="width: 100%"
+      >
+        >
+        <el-table-column type="selection" width="55"> </el-table-column>
+        <el-table-column prop="name" label="公司名称" show-overflow-tooltip>
+        </el-table-column>
+
+        <el-table-column label="交易类型/发生金额">
+          <template slot-scope="{ row }">
+            <p v-if="!/\W+/.test(row.billType)">
+              {{
+                rechargeTypeEnum.find((item) => item.value === row.billType)
+                  .label
+              }}
+            </p>
+            <p v-else>{{ row.billType }}</p>
+
+            <p>{{ row.occurTotalAmount }}</p>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="账户余额">
+          <template slot-scope="{ row }">
+            <p>
+              上次 <span>{{ row.lastBalance }}</span>
+            </p>
+            <p>
+              本次 <span>{{ row.currentBalance }}</span>
+            </p>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="充值余额">
+          <template slot-scope="{ row }">
+            <p>
+              上次 <span>{{ row.lastRechargeBalance }}</span>
+            </p>
+            <p>
+              本次 <span>{{ row.currentRechargeBalance }}</span>
+            </p>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="赊销余额">
+          <template slot-scope="{ row }">
+            <p>
+              上次 <span>{{ row.lastChargeRechargeBalance }}</span>
+            </p>
+            <p>
+              本次 <span>{{ row.currentChargeRechargeBalance }}</span>
+            </p>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="充值返利余额">
+          <template slot-scope="{ row }">
+            <p>
+              上次 <span>{{ row.lastRechargeRebateBalance }}</span>
+            </p>
+            <p>
+              本次 <span>{{ row.currentRechargeRebateBalance }}</span>
+            </p>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="消费返利余额">
+          <template slot-scope="{ row }">
+            <p>
+              上次 <span>{{ row.lastConsumeRebateAmount }}</span>
+            </p>
+            <p>
+              本次 <span>{{ row.currentConsumeRebateAmount }}</span>
+            </p>
+          </template>
+        </el-table-column>
+
+        <el-table-column prop="createTime" label="创建时间"> </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 #balance>
+          <p class="ft14">
+            上次:<span>{{ oilCompanyMatch.lastBalance }}</span>
+          </p>
+          <p class="ft14">
+            本次:<span>{{ oilCompanyMatch.currentBalance }}</span>
+          </p>
+        </template>
+        <template #rechargeBalance>
+          <p class="ft14">
+            上次:<span>{{ oilCompanyMatch.lastRechargeBalance }}</span>
+          </p>
+          <p class="ft14">
+            本次:<span>{{ oilCompanyMatch.currentRechargeBalance }}</span>
+          </p>
+        </template>
+        <template #chargeRechargeBalance>
+          <p class="ft14">
+            上次:<span>{{ oilCompanyMatch.lastChargeRechargeBalance }}</span>
+          </p>
+          <p class="ft14">
+            本次:<span>{{ oilCompanyMatch.currentChargeRechargeBalance }}</span>
+          </p>
+        </template>
+        <template #rechargeRebateBalance>
+          <p class="ft14">
+            上次:<span>{{ oilCompanyMatch.lastRechargeRebateBalance }}</span>
+          </p>
+          <p class="ft14">
+            本次:<span>{{ oilCompanyMatch.currentRechargeRebateBalance }}</span>
+          </p>
+        </template>
+        <template #consumeRebateAmount>
+          <p class="ft14">
+            上次:<span>{{ oilCompanyMatch.lastConsumeRebateAmount }}</span>
+          </p>
+          <p class="ft14">
+            本次:<span>{{ oilCompanyMatch.currentConsumeRebateAmount }}</span>
+          </p>
+        </template>
+        <template #table>
+          <el-table :data="tableDataSec" style="width: 100%">
+            <el-table-column
+              prop="businessOrderId"
+              label="关联订单"
+            ></el-table-column>
+            <el-table-column label="交易类型">
+              <template slot-scope="{ row }">
+                <p v-if="!/\W+/.test(row.billType)">
+                  {{
+                    rechargeTypeEnum.find(
+                      (item) => item.value === row.billTypes
+                    ).label
+                  }}
+                </p>
+                <p v-else>
+                  {{ row.billTypes }}
+                </p>
+              </template>
+            </el-table-column>
+            <el-table-column prop="nickName" label="司机"></el-table-column>
+            <el-table-column
+              prop="plateNumber"
+              label="车牌号"
+            ></el-table-column>
+            <el-table-column
+              prop="payRealAmount"
+              label="订单金额"
+            ></el-table-column>
+            <el-table-column
+              prop="createTime"
+              label="创建时间"
+            ></el-table-column>
+          </el-table>
+        </template>
+      </general-details>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+import serve from "api/financialCenter/billDetails.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";
+export default {
+  components: {
+    pagination,
+    autocomplete,
+    generalDetails,
+  },
+  data() {
+    return {
+      controlWindows: {
+        detail: false,
+      },
+      tableDataSec: [],
+      tableHeight: 0,
+      tableData: [],
+      configAutocomplete: {
+        serveTarget: commonServe.getRefineryCompanyList,
+        autocompleteKey: "name",
+        labelKey: "name",
+        valueKey: "id",
+        placeholder: "企业名称",
+        querykey: "companyId",
+      },
+      parameter: {
+        currentPage: 1,
+        pageSize: 10,
+        total: 0,
+        params: {},
+      },
+      rechargeTypeEnum: [
+        {
+          label: "分油",
+          value: "SEPARATION_OIL",
+        },
+        {
+          label: "充值",
+          value: "RECHARGE",
+        },
+        {
+          label: "圈回",
+          value: "TURN",
+        },
+        {
+          label: "销账",
+          value: "REVOKE",
+        },
+        {
+          label: "赊销",
+          value: "CHARGE_SALES",
+        },
+        {
+          label: "充值返利",
+          value: "RECHARGE_REBETE",
+        },
+        {
+          label: "消费返利",
+          value: "CONSUME_REBATE",
+        },
+      ],
+
+      oilCompanyMatch: {},
+      mappingData: [
+        {
+          carTitle: "企业账单明细详情",
+          carItems: [
+            { label: "企业名称", value: "name" },
+            { label: "发生金额", value: "occurTotalAmount" },
+            { label: "交易类型", value: "billType" },
+            { label: "交易时间", value: "createTime" },
+            { label: "账户余额（元）", value: "balance" },
+            { label: "充值余额（元）", value: "rechargeBalance" },
+            { label: "赊销余额（元）", value: "chargeRechargeBalance" },
+            { label: "充值返利余额（元）", value: "rechargeRebateBalance" },
+            { label: "消费返利余额（元）", value: "consumeRebateAmount" },
+            {
+              label: "赊销待还款金额（元）",
+              value: "currentTotalChargeAmount",
+            },
+            {
+              label: "累计返利总金额（元）",
+              value: "currentTotalRebateAmount",
+            },
+            {
+              label: "累计充值返利总金额（元）",
+              value: "currentTotalRechargeRebateAmount",
+            },
+            {
+              label: "累计消费返利总金额（元）",
+              value: "currentTotalConsumeRebateAmount",
+            },
+          ],
+        },
+        {
+          carTitle: "账单关联订单",
+          carItems: [
+            {
+              value: "table",
+            },
+          ],
+        },
+      ],
+    };
+  },
+  created() {
+    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() {
+      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) {
+      let params = {
+        businessOrderId: row.businessOrderId,
+        billType:
+          row.billType == "分油" || row.billType == "SEPARATION_OIL"
+            ? "SEPARATION_OIL"
+            : "TURN",
+      };
+      serve.getCompanyAccountRecord(params).then((res) => {
+        this.tableDataSec = [];
+        this.oilCompanyMatch = row;
+        this.controlWindows.detail = true;
+      });
+    },
+    //重置
+    reset() {
+      this.parameter = {
+        currentPage: 1,
+        pageSize: 10,
+        total: 0,
+        params: {},
+      };
+    },
+
+    // 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>
+.bill-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;
+    }
+  }
+  .ft14 {
+    font-size: 14px;
+  }
+}
+</style>
diff --git a/src/views/financialCenter/enterpriseRecharge/index.vue b/src/views/financialCenter/enterpriseRecharge/index.vue
new file mode 100644
index 0000000..a1013f5
--- /dev/null
+++ b/src/views/financialCenter/enterpriseRecharge/index.vue
@@ -0,0 +1,653 @@
+<template>
+  <div class="enterprise-recharge">
+    <div class="frame">
+      <!-- 公司名称 -->
+      <autocomplete
+        class="mr20"
+        :params="parameter.params"
+        :config="configAutocomplete"
+      />
+      <!-- 业务负责人 -->
+      <autocomplete
+        :params="parameter.params"
+        :config="configAutocompleteSec"
+      />
+      <el-select
+        v-model="parameter.params.transactionType"
+        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.transactionState"
+        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.auditMark"
+        placeholder="交易审核标识"
+        clearable
+      >
+        <el-option
+          v-for="(item, index) in auditMarkEnum"
+          :key="index"
+          :label="item.label"
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+      <el-select
+        v-model="parameter.params.chargeSalesAuditMark"
+        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 label="企业名称" show-overflow-tooltip>
+          <template slot-scope="{ row }">
+            <el-tag
+              size="small"
+              type="danger"
+              effect="dark"
+              v-show="row.operationCode"
+              >急</el-tag
+            >
+            <span style="margin-left: 10px">{{ row.companyName }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="交易类型">
+          <template slot-scope="{ row }">
+            <span>
+              {{
+                row.transactionType === "TURN"
+                  ? LoopBackTypeEnum.find((item) => item.value === row.turnType)
+                      .label
+                  : rechargeTypeEnum.find(
+                      (item) => item.value === row.transactionType
+                    ).label
+              }}
+            </span>
+            <el-popover
+              placement="top-start"
+              trigger="click"
+              content="{row.settlementNo}"
+            >
+              <el-tag
+                style="cursor: pointer"
+                slot="reference"
+                size="small"
+                type="p"
+                effect="dark"
+                v-show="row.settlementNo"
+                >结</el-tag
+              >
+            </el-popover>
+          </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="rechargeRebateAmount"
+          label="充值返利比例/金额"
+          show-overflow-tooltip
+        >
+          <template slot-scope="{ row }">
+            {{ row.rechargeRebate }}/{{ row.rechargeRebateAmount }}
+          </template>
+        </el-table-column>
+        <el-table-column label="付款/收款公司账户">
+          <template slot-scope="{ row }">
+            <el-tooltip
+              className="item"
+              effect="dark"
+              placement="top"
+              :disabled="!row.internalCompanyName"
+            >
+              <div slot="content">
+                <p>收款公司账户：{{ row.internalCompanyName }}</p>
+                <p>收款开户行：{{ row.bankDeposit }}</p>
+                <p>收款银行卡号：{{ row.bankCardNo }}</p>
+              </div>
+              <div>
+                <el-tag size="mini">付</el-tag>
+                <span>{{
+                  row.offlinePaymentCompany ? row.offlinePaymentCompany : "暂无"
+                }}</span>
+                <br />
+                <el-tag size="mini" type="success">收</el-tag>
+                <span>{{
+                  row.internalCompanyName ? row.internalCompanyName : "暂无"
+                }}</span>
+              </div>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+        <el-table-column label="交易审核标识" show-overflow-tooltip>
+          <template slot-scope="{ row }">
+            {{
+              auditMarkEnum.find((item) => item.value === row.auditMark).label
+            }}
+          </template>
+        </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="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: [
+        {
+          label: "圈回",
+          value: "TURN",
+        },
+        ...rechargeTypeEnum,
+      ],
+      rechargeStatusEnum: rechargeStatusEnum,
+      repaymentExamineEnum: [
+        {
+          label: "已拆分",
+          value: -3,
+        },
+        ...repaymentExamineEnum,
+      ],
+      auditMarkEnum: [
+        {
+          label: "待审核",
+          value: 0,
+        },
+        {
+          label: "已审核",
+          value: 1,
+        },
+        {
+          label: "审核失败",
+          value: -1,
+        },
+      ],
+      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 {
+  .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>
diff --git a/src/views/financialCenter/enterpriseRechargeDetails/index.vue b/src/views/financialCenter/enterpriseRechargeDetails/index.vue
new file mode 100644
index 0000000..368ab55
--- /dev/null
+++ b/src/views/financialCenter/enterpriseRechargeDetails/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>
diff --git a/src/views/product/index.vue b/src/views/product/index.vue
index 88a1c54..3105297 100644
--- a/src/views/product/index.vue
+++ b/src/views/product/index.vue
@@ -7,19 +7,8 @@
         placeholder="产品名称"
         clearable
       ></el-input>
-
+      <!-- 炼厂名称 -->
       <autocomplete :params="parameter.params" :config="configAutocomplete" />
-
-      <!-- <el-autocomplete
-        v-model="parameter.params.refineryName"
-        :fetch-suggestions="querySearchAsync"
-        @select="selectAutocomplete"
-        value-key="refineryName"
-        placeholder="炼厂名称"
-        clearable
-        @clear="parameter.params.refineryId = ''"
-      ></el-autocomplete> -->
-
       <el-input
         v-model="parameter.params.belongLibrary"
         placeholder="所处炼厂库"
@@ -211,6 +200,17 @@ import pagination from "components/pagination/index.vue";
 import generalDetails from "components/generalDetails/index.vue";
 
 export default {
+  components: {
+    add,
+    create,
+    record,
+    batch,
+    adjust,
+
+    pagination,
+    autocomplete,
+    generalDetails,
+  },
   data() {
     return {
       controlWindows: {
@@ -264,17 +264,6 @@ export default {
       ],
     };
   },
-  components: {
-    add,
-    create,
-    record,
-    batch,
-    adjust,
-
-    pagination,
-    autocomplete,
-    generalDetails,
-  },
   mounted() {
     this.$nextTick(() => {
       this.heightHandle();

From b1c894f96cc2b1939ac27f03f4e7608d40ee635b Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Tue, 21 Feb 2023 09:35:01 +0800
Subject: [PATCH 02/18] gengxin

---
 .../accountManagement/index.vue               | 474 ++++++++++++++++++
 .../financialCenter/billDetails/index.vue     |   2 +-
 src/views/refineryAccount/index.vue           |   6 +-
 src/views/refineryInfo/index.vue              |   6 +-
 4 files changed, 485 insertions(+), 3 deletions(-)
 create mode 100644 src/views/financialCenter/accountManagement/index.vue

diff --git a/src/views/financialCenter/accountManagement/index.vue b/src/views/financialCenter/accountManagement/index.vue
new file mode 100644
index 0000000..7270f13
--- /dev/null
+++ b/src/views/financialCenter/accountManagement/index.vue
@@ -0,0 +1,474 @@
+<template>
+  <div class="bill-details">
+    <div class="frame">
+      <!-- 公司名称 -->
+      <autocomplete
+        class="mr20"
+        :params="parameter.params"
+        :config="configAutocomplete"
+      />
+
+      <el-select
+        v-model="parameter.params.billType"
+        placeholder="交易类型"
+        clearable
+      >
+        <el-option
+          v-for="(item, index) in rechargeTypeEnum"
+          :key="index"
+          :label="item.label"
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+
+      <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"
+        style="width: 100%"
+      >
+        >
+        <el-table-column type="selection" width="55"> </el-table-column>
+        <el-table-column prop="name" label="公司名称" show-overflow-tooltip>
+        </el-table-column>
+
+        <el-table-column label="交易类型/发生金额">
+          <template slot-scope="{ row }">
+            <p v-if="!/\W+/.test(row.billType)">
+              {{
+                rechargeTypeEnum.find((item) => item.value === row.billType)
+                  .label
+              }}
+            </p>
+            <p v-else>{{ row.billType }}</p>
+
+            <p>{{ row.occurTotalAmount }}</p>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="账户余额">
+          <template slot-scope="{ row }">
+            <p>
+              上次 <span>{{ row.lastBalance }}</span>
+            </p>
+            <p>
+              本次 <span>{{ row.currentBalance }}</span>
+            </p>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="充值余额">
+          <template slot-scope="{ row }">
+            <p>
+              上次 <span>{{ row.lastRechargeBalance }}</span>
+            </p>
+            <p>
+              本次 <span>{{ row.currentRechargeBalance }}</span>
+            </p>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="赊销余额">
+          <template slot-scope="{ row }">
+            <p>
+              上次 <span>{{ row.lastChargeRechargeBalance }}</span>
+            </p>
+            <p>
+              本次 <span>{{ row.currentChargeRechargeBalance }}</span>
+            </p>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="充值返利余额">
+          <template slot-scope="{ row }">
+            <p>
+              上次 <span>{{ row.lastRechargeRebateBalance }}</span>
+            </p>
+            <p>
+              本次 <span>{{ row.currentRechargeRebateBalance }}</span>
+            </p>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="消费返利余额">
+          <template slot-scope="{ row }">
+            <p>
+              上次 <span>{{ row.lastConsumeRebateAmount }}</span>
+            </p>
+            <p>
+              本次 <span>{{ row.currentConsumeRebateAmount }}</span>
+            </p>
+          </template>
+        </el-table-column>
+
+        <el-table-column prop="createTime" label="创建时间"> </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 #balance>
+          <p class="ft14">
+            上次:<span>{{ oilCompanyMatch.lastBalance }}</span>
+          </p>
+          <p class="ft14">
+            本次:<span>{{ oilCompanyMatch.currentBalance }}</span>
+          </p>
+        </template>
+        <template #rechargeBalance>
+          <p class="ft14">
+            上次:<span>{{ oilCompanyMatch.lastRechargeBalance }}</span>
+          </p>
+          <p class="ft14">
+            本次:<span>{{ oilCompanyMatch.currentRechargeBalance }}</span>
+          </p>
+        </template>
+        <template #chargeRechargeBalance>
+          <p class="ft14">
+            上次:<span>{{ oilCompanyMatch.lastChargeRechargeBalance }}</span>
+          </p>
+          <p class="ft14">
+            本次:<span>{{ oilCompanyMatch.currentChargeRechargeBalance }}</span>
+          </p>
+        </template>
+        <template #rechargeRebateBalance>
+          <p class="ft14">
+            上次:<span>{{ oilCompanyMatch.lastRechargeRebateBalance }}</span>
+          </p>
+          <p class="ft14">
+            本次:<span>{{ oilCompanyMatch.currentRechargeRebateBalance }}</span>
+          </p>
+        </template>
+        <template #consumeRebateAmount>
+          <p class="ft14">
+            上次:<span>{{ oilCompanyMatch.lastConsumeRebateAmount }}</span>
+          </p>
+          <p class="ft14">
+            本次:<span>{{ oilCompanyMatch.currentConsumeRebateAmount }}</span>
+          </p>
+        </template>
+        <template #table>
+          <el-table :data="tableDataSec" style="width: 100%">
+            <el-table-column
+              prop="businessOrderId"
+              label="关联订单"
+            ></el-table-column>
+            <el-table-column label="交易类型">
+              <template slot-scope="{ row }">
+                <p v-if="!/\W+/.test(row.billType)">
+                  {{
+                    rechargeTypeEnum.find(
+                      (item) => item.value === row.billTypes
+                    ).label
+                  }}
+                </p>
+                <p v-else>
+                  {{ row.billTypes }}
+                </p>
+              </template>
+            </el-table-column>
+            <el-table-column prop="nickName" label="司机"></el-table-column>
+            <el-table-column
+              prop="plateNumber"
+              label="车牌号"
+            ></el-table-column>
+            <el-table-column
+              prop="payRealAmount"
+              label="订单金额"
+            ></el-table-column>
+            <el-table-column
+              prop="createTime"
+              label="创建时间"
+            ></el-table-column>
+          </el-table>
+        </template>
+      </general-details>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+import serve from "api/financialCenter/billDetails.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";
+export default {
+  components: {
+    pagination,
+    autocomplete,
+    generalDetails,
+  },
+  data() {
+    return {
+      controlWindows: {
+        detail: false,
+      },
+      tableDataSec: [],
+      tableHeight: 0,
+      tableData: [],
+      configAutocomplete: {
+        serveTarget: commonServe.getRefineryCompanyList,
+        autocompleteKey: "name",
+        labelKey: "name",
+        valueKey: "id",
+        placeholder: "企业名称",
+        querykey: "companyId",
+      },
+      parameter: {
+        currentPage: 1,
+        pageSize: 10,
+        total: 0,
+        params: {},
+      },
+      rechargeTypeEnum: [
+        {
+          label: "分油",
+          value: "SEPARATION_OIL",
+        },
+        {
+          label: "充值",
+          value: "RECHARGE",
+        },
+        {
+          label: "圈回",
+          value: "TURN",
+        },
+        {
+          label: "销账",
+          value: "REVOKE",
+        },
+        {
+          label: "赊销",
+          value: "CHARGE_SALES",
+        },
+        {
+          label: "充值返利",
+          value: "RECHARGE_REBETE",
+        },
+        {
+          label: "消费返利",
+          value: "CONSUME_REBATE",
+        },
+      ],
+
+      oilCompanyMatch: {},
+      mappingData: [
+        {
+          carTitle: "企业账单明细详情",
+          carItems: [
+            { label: "企业名称", value: "name" },
+            { label: "发生金额", value: "occurTotalAmount" },
+            { label: "交易类型", value: "billType" },
+            { label: "交易时间", value: "createTime" },
+            { label: "账户余额（元）", value: "balance" },
+            { label: "充值余额（元）", value: "rechargeBalance" },
+            { label: "赊销余额（元）", value: "chargeRechargeBalance" },
+            { label: "充值返利余额（元）", value: "rechargeRebateBalance" },
+            { label: "消费返利余额（元）", value: "consumeRebateAmount" },
+            {
+              label: "赊销待还款金额（元）",
+              value: "currentTotalChargeAmount",
+            },
+            {
+              label: "累计返利总金额（元）",
+              value: "currentTotalRebateAmount",
+            },
+            {
+              label: "累计充值返利总金额（元）",
+              value: "currentTotalRechargeRebateAmount",
+            },
+            {
+              label: "累计消费返利总金额（元）",
+              value: "currentTotalConsumeRebateAmount",
+            },
+          ],
+        },
+        {
+          carTitle: "账单关联订单",
+          carItems: [
+            {
+              value: "table",
+            },
+          ],
+        },
+      ],
+    };
+  },
+  created() {
+    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() {
+      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) {
+      let params = {
+        businessOrderId: row.businessOrderId,
+        billType:
+          row.billType == "分油" || row.billType == "SEPARATION_OIL"
+            ? "SEPARATION_OIL"
+            : "TURN",
+      };
+      serve.getCompanyAccountRecord(params).then((res) => {
+        this.tableDataSec = [];
+        this.oilCompanyMatch = row;
+        this.controlWindows.detail = true;
+      });
+    },
+    //重置
+    reset() {
+      this.parameter = {
+        currentPage: 1,
+        pageSize: 10,
+        total: 0,
+        params: {},
+      };
+    },
+
+    // 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>
+.bill-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;
+    }
+  }
+  .ft14 {
+    font-size: 14px;
+  }
+}
+</style>
diff --git a/src/views/financialCenter/billDetails/index.vue b/src/views/financialCenter/billDetails/index.vue
index 66bd0ea..7270f13 100644
--- a/src/views/financialCenter/billDetails/index.vue
+++ b/src/views/financialCenter/billDetails/index.vue
@@ -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"
diff --git a/src/views/refineryAccount/index.vue b/src/views/refineryAccount/index.vue
index d5efdd6..61bda8a 100644
--- a/src/views/refineryAccount/index.vue
+++ b/src/views/refineryAccount/index.vue
@@ -11,7 +11,11 @@
         placeholder="炼厂名称"
       ></el-autocomplete> -->
 
-      <autocomplete :params="parameter.params" :config="configAutocomplete" />
+      <autocomplete
+        class="mr20"
+        :params="parameter.params"
+        :config="configAutocomplete"
+      />
 
       <el-select
         v-model="parameter.params.refineryType"
diff --git a/src/views/refineryInfo/index.vue b/src/views/refineryInfo/index.vue
index a6a8179..ecb5f23 100644
--- a/src/views/refineryInfo/index.vue
+++ b/src/views/refineryInfo/index.vue
@@ -11,7 +11,11 @@
         placeholder="炼厂名称"
       ></el-autocomplete> -->
 
-      <autocomplete :params="parameter.params" :config="configAutocomplete" />
+      <autocomplete
+        class="mr20"
+        :params="parameter.params"
+        :config="configAutocomplete"
+      />
 
       <el-select
         v-model="parameter.params.refineryType"

From 96233ead10d49819562a66771459552cc03d5d3a Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Tue, 21 Feb 2023 10:21:10 +0800
Subject: [PATCH 03/18] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../companyManagement/index.vue               | 570 ++++++++++++++++++
 .../financialCenter/billDetails/index.vue     |   2 +-
 .../enterpriseRecharge/components/add.vue     | 258 ++++++++
 .../enterpriseRecharge/index.vue              |   2 +-
 4 files changed, 830 insertions(+), 2 deletions(-)
 create mode 100644 src/views/customerManagement/companyManagement/index.vue
 create mode 100644 src/views/financialCenter/enterpriseRecharge/components/add.vue

diff --git a/src/views/customerManagement/companyManagement/index.vue b/src/views/customerManagement/companyManagement/index.vue
new file mode 100644
index 0000000..368ab55
--- /dev/null
+++ b/src/views/customerManagement/companyManagement/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>
diff --git a/src/views/financialCenter/billDetails/index.vue b/src/views/financialCenter/billDetails/index.vue
index 7270f13..66bd0ea 100644
--- a/src/views/financialCenter/billDetails/index.vue
+++ b/src/views/financialCenter/billDetails/index.vue
@@ -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"
diff --git a/src/views/financialCenter/enterpriseRecharge/components/add.vue b/src/views/financialCenter/enterpriseRecharge/components/add.vue
new file mode 100644
index 0000000..97e116f
--- /dev/null
+++ b/src/views/financialCenter/enterpriseRecharge/components/add.vue
@@ -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>
diff --git a/src/views/financialCenter/enterpriseRecharge/index.vue b/src/views/financialCenter/enterpriseRecharge/index.vue
index a1013f5..8f98f37 100644
--- a/src/views/financialCenter/enterpriseRecharge/index.vue
+++ b/src/views/financialCenter/enterpriseRecharge/index.vue
@@ -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"

From 6dd00a42b1cf315525e69dc0ebb01ab86727c305 Mon Sep 17 00:00:00 2001
From: douqi <630797947@qq.com>
Date: Tue, 21 Feb 2023 13:13:06 +0800
Subject: [PATCH 04/18] =?UTF-8?q?feat:=E8=B4=A2=E5=8A=A1=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?-=E5=85=AC=E5=8F=B8=E8=B4=A6=E6=88=B7=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E8=B4=A6=E6=88=B7=E7=AE=A1=E7=90=86=20=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/financialCenter/accountManagement.js  |  31 +
 .../accountManagement/components/recharge.vue |  81 ++
 .../accountManagement/index.vue               | 716 ++++++++----------
 3 files changed, 423 insertions(+), 405 deletions(-)
 create mode 100644 src/api/financialCenter/accountManagement.js
 create mode 100644 src/views/financialCenter/accountManagement/components/recharge.vue

diff --git a/src/api/financialCenter/accountManagement.js b/src/api/financialCenter/accountManagement.js
new file mode 100644
index 0000000..59ea848
--- /dev/null
+++ b/src/api/financialCenter/accountManagement.js
@@ -0,0 +1,31 @@
+import request from "utils/axios.js";
+// table
+const getByPage = (params) => {
+  return request.postJson(
+    "/oil-finance/oilCompanyAccount/getByPage",
+    params
+  );
+};
+//修改账户状态
+const updateAccountState = (params) => {
+  return request.postJson(
+    "/oil-finance/oilCompanyAccount/getByPage",
+    params
+  );
+};
+//详情
+const get = (id) => {
+  return request.get(`/oil-finance/oilCompanyAccount/get/${id}`);
+};
+// //详情
+// const getCompanyAccountRecord = (params) => {
+//   return request.postJson(
+//     "oil-finance/oilCompanyAccountRecord/getCompanyAccountRecord",
+//     params
+//   );
+// };
+export default {
+  getByPage,
+  updateAccountState,
+  get
+};
diff --git a/src/views/financialCenter/accountManagement/components/recharge.vue b/src/views/financialCenter/accountManagement/components/recharge.vue
new file mode 100644
index 0000000..5ce448c
--- /dev/null
+++ b/src/views/financialCenter/accountManagement/components/recharge.vue
@@ -0,0 +1,81 @@
+<template>
+  <el-dialog
+    title="充值"
+    :visible="controlWindows.recharge"
+    width="30%"
+    :before-close="closeWindow"
+    @opened="openDrawer"
+  >
+    <div class="recharge.vue">
+      <el-form ref="form" :rules="rules" :model="form" label-width="120px">
+        <el-form-item label="成本价" prop="floorPrice">
+          <el-input
+            maxlength="50"
+            v-checkNum
+            v-model="form.floorPrice"
+            placeholder="请输入成本价"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="企业销售价" prop="salePrice2company">
+          <el-input
+            maxlength="50"
+            v-checkNum
+            v-model="form.salePrice2company"
+            placeholder="请输入企业销售价"
+          ></el-input>
+        </el-form-item>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="controlWindows.recharge = false">取 消</el-button>
+      <el-button type="primary" @click="submit">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import serve from "api/financialCenter/accountManagement.js";
+
+export default {
+  props: {
+    controlWindows: Object,
+  },
+  data() {
+    return {
+      form: {},
+      rules: {
+        floorPrice: [
+          { required: true, message: "请输入成本价", trigger: "blur" },
+        ],
+        salePrice2company: [
+          { required: true, message: "请输入企业销售价", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  methods: {
+    openDrawer() {},
+    submit() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          Object.assign(this.form, this.controlWindows.addInfo);
+          serve.modifyPrice(this.form).then((res) => {
+            this.$message.success(res.msg);
+            this.closeWindow();
+          });
+        }
+      });
+    },
+    closeWindow() {
+      this.form = {};
+      this.$emit("closeWindow");
+      this.$nextTick(() => {
+        this.$refs.form.clearValidate();
+        this.controlWindows.recharge = false;
+      });
+    },
+  },
+};
+</script>
+
+</style>
diff --git a/src/views/financialCenter/accountManagement/index.vue b/src/views/financialCenter/accountManagement/index.vue
index 7270f13..15c9cb5 100644
--- a/src/views/financialCenter/accountManagement/index.vue
+++ b/src/views/financialCenter/accountManagement/index.vue
@@ -2,26 +2,30 @@
   <div class="bill-details">
     <div class="frame">
       <!-- 公司名称 -->
-      <autocomplete
-        class="mr20"
-        :params="parameter.params"
-        :config="configAutocomplete"
-      />
+      <autocomplete class="mr20" :params="parameter.params" :config="configAutocomplete"/>
+      <!-- 总公司名称 -->
+      <autocomplete class="mr20" :params="parameter.params" :config="configAutocompleteSec"/>
 
-      <el-select
-        v-model="parameter.params.billType"
-        placeholder="交易类型"
-        clearable
-      >
+      <el-select v-model="parameter.params.accountState" placeholder="账户状态" clearable>
         <el-option
-          v-for="(item, index) in rechargeTypeEnum"
+          v-for="(item, index) in accountStateEnum"
           :key="index"
           :label="item.label"
           :value="item.value"
-        >
-        </el-option>
+        />
       </el-select>
 
+      <el-select v-model="parameter.params.companyNature" placeholder="企业性质" clearable>
+        <el-option
+          v-for="(item, index) in companyNatureEnum"
+          :key="index"
+          :label="item.label"
+          :value="item.value"
+        />
+      </el-select>
+      <!-- 业务负责人 -->
+      <autocomplete :params="parameter.params" :config="configAutocompleteBusinessLeader"/>
+
       <div class="buttons">
         <el-button icon="el-icon-search" @click="search">查询</el-button>
         <el-button icon="el-icon-refresh" @click="reset">重置</el-button>
@@ -29,7 +33,9 @@
     </div>
     <div class="table">
       <div class="operation">
-        <el-button @click="addition">新增产品</el-button>
+        <el-button @click="accountTypeHandler(0)">禁用</el-button>
+        <el-button @click="accountTypeHandler(1)">启用</el-button>
+        <el-button @click="accountTypeHandler(-1)">冻结</el-button>
       </div>
       <el-table
         v-if="tableHeight"
@@ -39,436 +45,336 @@
         style="width: 100%"
       >
         >
-        <el-table-column type="selection" width="55"> </el-table-column>
-        <el-table-column prop="name" label="公司名称" show-overflow-tooltip>
-        </el-table-column>
-
-        <el-table-column label="交易类型/发生金额">
+        <el-table-column type="selection" width="55"/>
+        <el-table-column prop="companyName" label="公司名称" minWidth="300">
           <template slot-scope="{ row }">
-            <p v-if="!/\W+/.test(row.billType)">
-              {{
-                rechargeTypeEnum.find((item) => item.value === row.billType)
-                  .label
-              }}
-            </p>
-            <p v-else>{{ row.billType }}</p>
-
-            <p>{{ row.occurTotalAmount }}</p>
+            <span style='padding-left:8px;'>{{row.companyName}}</span>
+            <br/>
+            <span style='padding-left:8px;'>业务负责人:{{row.businessLeader}}</span>
           </template>
         </el-table-column>
-
-        <el-table-column label="账户余额">
+        <el-table-column label="企业性质" minWidth="120">
           <template slot-scope="{ row }">
-            <p>
-              上次 <span>{{ row.lastBalance }}</span>
-            </p>
-            <p>
-              本次 <span>{{ row.currentBalance }}</span>
-            </p>
+            {{companyNatureEnum.find((item) => item.value === row.companyNature).label}}
           </template>
         </el-table-column>
-
-        <el-table-column label="充值余额">
+        <el-table-column prop="totalBalance" label="公司企业总余额" minWidth="120"/>
+        <el-table-column label="司机油卡余额" minWidth="130">
           <template slot-scope="{ row }">
-            <p>
-              上次 <span>{{ row.lastRechargeBalance }}</span>
-            </p>
-            <p>
-              本次 <span>{{ row.currentRechargeBalance }}</span>
-            </p>
+            <span>外:{{row.outCountBalance}}</span>
+            <br/>
+            <span>自:{{row.inCountBalance}}</span>
           </template>
         </el-table-column>
+        <el-table-column prop="balance" label="账户总余额" minWidth="120"/>
+        <el-table-column prop="rechargeBalance" label="充值余额" minWidth="120"/>
+        <el-table-column prop="chargeRechargeBalance" label="赊销充值余额" minWidth="120"/>
+        <el-table-column prop="rechargeRebateBalance" label="充值返利余额" minWidth="120"/>
+        <el-table-column prop="consumeRebateBalance" label="消费返利余额" minWidth="120"/>
+        <el-table-column prop="totalChargeAmount" label="赊销待还" minWidth="120"/>
+        <el-table-column prop="createTime" label="创建时间" minWidth="200"/>
 
-        <el-table-column label="赊销余额">
-          <template slot-scope="{ row }">
-            <p>
-              上次 <span>{{ row.lastChargeRechargeBalance }}</span>
-            </p>
-            <p>
-              本次 <span>{{ row.currentChargeRechargeBalance }}</span>
-            </p>
-          </template>
-        </el-table-column>
-
-        <el-table-column label="充值返利余额">
-          <template slot-scope="{ row }">
-            <p>
-              上次 <span>{{ row.lastRechargeRebateBalance }}</span>
-            </p>
-            <p>
-              本次 <span>{{ row.currentRechargeRebateBalance }}</span>
-            </p>
-          </template>
-        </el-table-column>
-
-        <el-table-column label="消费返利余额">
-          <template slot-scope="{ row }">
-            <p>
-              上次 <span>{{ row.lastConsumeRebateAmount }}</span>
-            </p>
-            <p>
-              本次 <span>{{ row.currentConsumeRebateAmount }}</span>
-            </p>
-          </template>
-        </el-table-column>
-
-        <el-table-column prop="createTime" label="创建时间"> </el-table-column>
-
-        <el-table-column label="操作">
+        <el-table-column fixed="right" label="操作" width="150px">
           <template slot-scope="{ row }">
             <span class="el-dropdown-link" @click="detail(row)">详情</span>
+            <el-dropdown>
+              <el-button type="text">
+                更多<i class="el-icon-arrow-down el-icon--right"/>
+              </el-button>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item
+                  @click.native="toRecharge(row.id)"
+                >
+                  <el-button
+                    :size="$store.getters.size"
+                    type="text"
+                  >
+                    <svg-icon icon-class="iconicon-"/>
+                    充值
+                  </el-button>
+                </el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
           </template>
         </el-table-column>
       </el-table>
       <!-- 分页 -->
-      <pagination :parameter="parameter" @searchAgain="getByPage" />
+      <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 #balance>
-          <p class="ft14">
-            上次:<span>{{ oilCompanyMatch.lastBalance }}</span>
-          </p>
-          <p class="ft14">
-            本次:<span>{{ oilCompanyMatch.currentBalance }}</span>
-          </p>
-        </template>
-        <template #rechargeBalance>
-          <p class="ft14">
-            上次:<span>{{ oilCompanyMatch.lastRechargeBalance }}</span>
-          </p>
-          <p class="ft14">
-            本次:<span>{{ oilCompanyMatch.currentRechargeBalance }}</span>
-          </p>
-        </template>
-        <template #chargeRechargeBalance>
-          <p class="ft14">
-            上次:<span>{{ oilCompanyMatch.lastChargeRechargeBalance }}</span>
-          </p>
-          <p class="ft14">
-            本次:<span>{{ oilCompanyMatch.currentChargeRechargeBalance }}</span>
-          </p>
-        </template>
-        <template #rechargeRebateBalance>
-          <p class="ft14">
-            上次:<span>{{ oilCompanyMatch.lastRechargeRebateBalance }}</span>
-          </p>
-          <p class="ft14">
-            本次:<span>{{ oilCompanyMatch.currentRechargeRebateBalance }}</span>
-          </p>
-        </template>
-        <template #consumeRebateAmount>
-          <p class="ft14">
-            上次:<span>{{ oilCompanyMatch.lastConsumeRebateAmount }}</span>
-          </p>
-          <p class="ft14">
-            本次:<span>{{ oilCompanyMatch.currentConsumeRebateAmount }}</span>
-          </p>
-        </template>
-        <template #table>
-          <el-table :data="tableDataSec" style="width: 100%">
-            <el-table-column
-              prop="businessOrderId"
-              label="关联订单"
-            ></el-table-column>
-            <el-table-column label="交易类型">
-              <template slot-scope="{ row }">
-                <p v-if="!/\W+/.test(row.billType)">
-                  {{
-                    rechargeTypeEnum.find(
-                      (item) => item.value === row.billTypes
-                    ).label
-                  }}
-                </p>
-                <p v-else>
-                  {{ row.billTypes }}
-                </p>
-              </template>
-            </el-table-column>
-            <el-table-column prop="nickName" label="司机"></el-table-column>
-            <el-table-column
-              prop="plateNumber"
-              label="车牌号"
-            ></el-table-column>
-            <el-table-column
-              prop="payRealAmount"
-              label="订单金额"
-            ></el-table-column>
-            <el-table-column
-              prop="createTime"
-              label="创建时间"
-            ></el-table-column>
-          </el-table>
-        </template>
-      </general-details>
-    </el-drawer>
+
+    <!-- 添加充值 -->
+    <recharge :controlWindows="controlWindows" @closeWindow="closeDialog" />
+
   </div>
 </template>
 
 <script>
-import serve from "api/financialCenter/billDetails.js";
-import commonServe from "api/common.js";
+  import serve from 'api/financialCenter/accountManagement.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";
-export default {
-  components: {
-    pagination,
-    autocomplete,
-    generalDetails,
-  },
-  data() {
-    return {
-      controlWindows: {
-        detail: false,
-      },
-      tableDataSec: [],
-      tableHeight: 0,
-      tableData: [],
-      configAutocomplete: {
-        serveTarget: commonServe.getRefineryCompanyList,
-        autocompleteKey: "name",
-        labelKey: "name",
-        valueKey: "id",
-        placeholder: "企业名称",
-        querykey: "companyId",
-      },
-      parameter: {
-        currentPage: 1,
-        pageSize: 10,
-        total: 0,
-        params: {},
-      },
-      rechargeTypeEnum: [
-        {
-          label: "分油",
-          value: "SEPARATION_OIL",
-        },
-        {
-          label: "充值",
-          value: "RECHARGE",
-        },
-        {
-          label: "圈回",
-          value: "TURN",
-        },
-        {
-          label: "销账",
-          value: "REVOKE",
-        },
-        {
-          label: "赊销",
-          value: "CHARGE_SALES",
-        },
-        {
-          label: "充值返利",
-          value: "RECHARGE_REBETE",
-        },
-        {
-          label: "消费返利",
-          value: "CONSUME_REBATE",
-        },
-      ],
+  import recharge from "./components/recharge.vue";
+  import autocomplete from 'components/autocomplete/index.vue'
+  import pagination from 'components/pagination/index.vue'
+  import generalDetails from 'components/generalDetails/index.vue'
 
-      oilCompanyMatch: {},
-      mappingData: [
-        {
-          carTitle: "企业账单明细详情",
-          carItems: [
-            { label: "企业名称", value: "name" },
-            { label: "发生金额", value: "occurTotalAmount" },
-            { label: "交易类型", value: "billType" },
-            { label: "交易时间", value: "createTime" },
-            { label: "账户余额（元）", value: "balance" },
-            { label: "充值余额（元）", value: "rechargeBalance" },
-            { label: "赊销余额（元）", value: "chargeRechargeBalance" },
-            { label: "充值返利余额（元）", value: "rechargeRebateBalance" },
-            { label: "消费返利余额（元）", value: "consumeRebateAmount" },
-            {
-              label: "赊销待还款金额（元）",
-              value: "currentTotalChargeAmount",
-            },
-            {
-              label: "累计返利总金额（元）",
-              value: "currentTotalRebateAmount",
-            },
-            {
-              label: "累计充值返利总金额（元）",
-              value: "currentTotalRechargeRebateAmount",
-            },
-            {
-              label: "累计消费返利总金额（元）",
-              value: "currentTotalConsumeRebateAmount",
-            },
-          ],
+  export default {
+    components: {
+      recharge,
+      pagination,
+      autocomplete,
+      generalDetails
+    },
+    data() {
+      return {
+        oilCompanyAccount: {},
+        controlWindows: {
+          detail: false,
+          recharge:false // 充值弹窗
         },
-        {
-          carTitle: "账单关联订单",
-          carItems: [
-            {
-              value: "table",
-            },
-          ],
+        tableDataSec: [],
+        tableHeight: 0,
+        tableData: [],
+        multipleSelection: [],// 选择表格数据集合
+        configAutocomplete: {
+          serveTarget: commonServe.getRefineryCompanyList,
+          autocompleteKey: 'name',
+          labelKey: 'name',
+          valueKey: 'id',
+          placeholder: '企业名称',
+          querykey: 'companyId'
         },
-      ],
-    };
-  },
-  created() {
-    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();
+        configAutocompleteSec: {
+          serveTarget: commonServe.getRefineryCompanyList,
+          autocompleteKey: 'name',
+          labelKey: 'name',
+          valueKey: 'id',
+          placeholder: '总公司名称',
+          querykey: 'name'
+        },
+        configAutocompleteBusinessLeader: {
+          serveTarget: commonServe.liekQuery,
+          autocompleteKey: '',
+          labelKey: 'nickName',
+          valueKey: 'id',
+          placeholder: '业务负责人',
+          querykey: 'businessLeader'
+        },
+        parameter: {
+          currentPage: 1,
+          pageSize: 10,
+          total: 0,
+          params: {}
+        },
+        accountStateEnum: [
+          {
+            label: '禁用',
+            value: 0
+          },
+          {
+            label: '启用',
+            value: 1
+          },
+          {
+            label: '冻结',
+            value: -1
+          }
+        ],
+        companyNatureEnum: [
+          {
+            label: '零售客户',
+            value: 0
+          },
+          {
+            label: '外请客户',
+            value: 1
+          },
+          {
+            label: '渠道客户',
+            value: 2
+          },
+          {
+            label: '存量客户',
+            value: 3
+          },
+          {
+            label: '批发客户',
+            value: 4
+          },
+          {
+            label: 'LNG客户',
+            value: 5
+          }
+          ,
+          {
+            label: '推广业务',
+            value: 6
+          }
+        ]
+      }
     },
-    //table list
-    getByPage() {
-      serve.getByPage(this.parameter).then((res) => {
-        this.tableData = res.data.list;
-        this.parameter.total = res.data.totalCount;
-      });
+    created() {
+      this.getByPage()
     },
-    //新增
-    addition() {
-      this.controlWindows.addInfo.title = "产品新增";
-      this.controlWindows.add = true;
+    updated() {
+      this.$nextTick(() => {
+        this.$refs.multipleTable && this.$refs.multipleTable.doLayout()
+      })
     },
-    detail(row) {
-      let params = {
-        businessOrderId: row.businessOrderId,
-        billType:
-          row.billType == "分油" || row.billType == "SEPARATION_OIL"
-            ? "SEPARATION_OIL"
-            : "TURN",
-      };
-      serve.getCompanyAccountRecord(params).then((res) => {
-        this.tableDataSec = [];
-        this.oilCompanyMatch = row;
-        this.controlWindows.detail = true;
-      });
-    },
-    //重置
-    reset() {
-      this.parameter = {
-        currentPage: 1,
-        pageSize: 10,
-        total: 0,
-        params: {},
-      };
+    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() {
+        serve.getByPage(this.parameter).then((res) => {
+          this.tableData = res.data.list
+          this.parameter.total = res.data.totalCount
+        })
+      },
 
-    // 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);
-    },
-  },
-};
+      //修改账户状态
+      accountTypeHandler(type) {
+        //0:禁用 1:启用 -1:冻结
+        if (!this.multipleSelection || this.multipleSelection.length < 1) {
+          this.$message.error('请选择需要操作的数据')
+          return
+        }
+        this.multipleSelection.forEach(item => {
+          item.accountState = type
+        })
+        serve.updateAccountState(this.multipleSelection).then(res => {
+          if (res.code === 20000) {
+            this.$message.success(res.msg)
+          }
+          this.getByPage()
+        })
+      },
+      detail(row) {
+        //TODO
+      },
+      toRecharge(id) {
+        // 跳转到充值
+        serve.get(id).then(res => {
+          this.oilCompanyAccount = res.data
+          this.controlWindows.recharge = true
+        })
+      },
+      //重置
+      reset() {
+        this.parameter = {
+          currentPage: 1,
+          pageSize: 10,
+          total: 0,
+          params: {}
+        }
+      },
+      closeDialog() {
+        this.controlWindows.recharge = false
+      },
+      // 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>
-.bill-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;
-    }
-  }
+  .bill-details {
+    .frame {
+      margin: 20px;
+      padding: 20px;
+      border-radius: 6px;
+      border: 1px solid #e3e3e5;
+      background: #fff;
 
-  .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-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;
       }
     }
-    .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;
+    .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;
       }
     }
-    .el-icon-arrow-down {
-      font-size: 12px;
+
+    .ft14 {
+      font-size: 14px;
     }
   }
-  .ft14 {
-    font-size: 14px;
-  }
-}
 </style>

From 955ab6840c9c8b7d6cfdf4c6acb2f1a59b451499 Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Tue, 21 Feb 2023 13:47:04 +0800
Subject: [PATCH 05/18] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/financialCenter/enterpriseRecharge.js |  14 ++
 src/components/autocomplete/index.vue         |  31 +--
 .../companyManagement/index.vue               |   2 -
 .../enterpriseRecharge/components/add.vue     | 208 ++++++++----------
 .../enterpriseRecharge/index.vue              |  59 ++++-
 .../enterpriseRechargeDetails/index.vue       |   2 -
 src/views/product/components/add.vue          |  24 +-
 src/views/product/index.vue                   |  21 +-
 8 files changed, 164 insertions(+), 197 deletions(-)

diff --git a/src/api/financialCenter/enterpriseRecharge.js b/src/api/financialCenter/enterpriseRecharge.js
index d6857a6..f31b7d2 100644
--- a/src/api/financialCenter/enterpriseRecharge.js
+++ b/src/api/financialCenter/enterpriseRecharge.js
@@ -14,8 +14,22 @@ const get = (query) => {
 const getByCompanyId = (query) => {
   return request.get(`/oil-finance/oilCompanyAccount/getByCompanyId/${query}`);
 };
+// 新增
+const save = (params) => {
+  return request.postJson("/oil-finance/oilCompanyAccountReverse/save", params);
+};
+// 修改
+const update = (params) => {
+  return request.postJson(
+    "/oil-finance/oilCompanyAccountReverse/update",
+    params
+  );
+};
+
 export default {
   getByPage,
   get,
   getByCompanyId,
+  save,
+  update,
 };
diff --git a/src/components/autocomplete/index.vue b/src/components/autocomplete/index.vue
index 2bb9ffd..ec58e59 100644
--- a/src/components/autocomplete/index.vue
+++ b/src/components/autocomplete/index.vue
@@ -1,14 +1,4 @@
 <template>
-  <!-- <el-autocomplete
-    v-model="text"
-    :fetch-suggestions="querySearchAsync"
-    :value-key="config.valueKey"
-    :placeholder="config.placeholder"
-    clearable
-    @select="selectAutocomplete"
-    @clear="params[config.querykey] = ''"
-  ></el-autocomplete> -->
-
   <el-select
     v-model="params[config.querykey]"
     filterable
@@ -18,6 +8,7 @@
     :placeholder="config.placeholder"
     :remote-method="remoteMethod"
     @clear="list = []"
+    :disabled="isDisabled"
   >
     <el-option
       v-for="(item, index) in list"
@@ -46,15 +37,16 @@ export default {
     return {
       text: "",
       list: [],
+      isDisabled: false,
     };
   },
   watch: {
     "config.echoId": {
       handler(nval, oval) {
         if (nval) {
-          console.log(nval);
           this.remoteMethod(this.config.echoName);
         }
+        this.isDisabled = !!this.config.isDisabled;
       },
       deep: true,
       immediate: true,
@@ -82,23 +74,6 @@ export default {
         this.list = [];
       }
     },
-    // querySearchAsync(queryString, cb) {
-    //   if (queryString) {
-    //     let params = {};
-    //     params[this.config.autocompleteKey] = queryString;
-    //     this.config.serveTarget(params).then((res) => {
-    //       let timeInstance = setTimeout(() => {
-    //         clearTimeout(timeInstance);
-    //         if (res.data.length) {
-    //           cb(res.data);
-    //         } else cb([]);
-    //       }, 1000 * Math.random());
-    //     });
-    //   } else cb([]);
-    // },
-    // selectAutocomplete(item) {
-    //   this.params[this.config.querykey] = item.id;
-    // },
   },
 };
 </script>
diff --git a/src/views/customerManagement/companyManagement/index.vue b/src/views/customerManagement/companyManagement/index.vue
index 368ab55..0478afb 100644
--- a/src/views/customerManagement/companyManagement/index.vue
+++ b/src/views/customerManagement/companyManagement/index.vue
@@ -416,7 +416,6 @@ export default {
       ]).then(([firstRes, secondRes]) => {
         this.oilCompanyMatch = { ...firstRes.data, ...secondRes.data };
 
-        console.log("this.oilCompanyMatch", this.oilCompanyMatch);
         this.controlWindows.detail = true;
       });
     },
@@ -483,7 +482,6 @@ export default {
         this.parameter.params.createTimeStart = val[0];
         this.parameter.params.createTimeEnd = val[1];
       }
-      console.log(val);
     },
     // table height
     heightHandle() {
diff --git a/src/views/financialCenter/enterpriseRecharge/components/add.vue b/src/views/financialCenter/enterpriseRecharge/components/add.vue
index 97e116f..f0940b4 100644
--- a/src/views/financialCenter/enterpriseRecharge/components/add.vue
+++ b/src/views/financialCenter/enterpriseRecharge/components/add.vue
@@ -1,8 +1,8 @@
 <template>
   <el-drawer
-    title="企业充值"
+    :title="controlWindows.addInfo.title"
     direction="ltr"
-    size="40%"
+    size="50%"
     :visible="controlWindows.add"
     @opened="openDrawer"
     :before-close="closeWindow"
@@ -12,63 +12,51 @@
         <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-form-item label="交易类型" prop="transactionType">
+          <el-select
+            :disabled="form.id"
+            v-model="form.transactionType"
+            placeholder="请选择交易类型"
+            @change="changeTransactionType"
+          >
             <el-option label="赊销" value="CHARGE_SALES" />
             <el-option label="消费返利" value="CONSUME_REBATE" />
           </el-select>
         </el-form-item>
-        <el-form-item label="交易金额" prop="belongLibrary">
+        <el-form-item label="交易金额" prop="transactionAmount">
           <el-input
             v-checkNum
-            v-model="form.belongLibrary"
+            v-model="form.transactionAmount"
             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-form-item
+          v-if="form.transactionType === 'CONSUME_REBATE'"
+          label="线下交易凭证"
+          prop="offlineTransactionProof"
+        >
           <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"
+            :on-preview="handlePictureCardPreview"
+            :on-remove="handleRemove"
+            :on-success="handleSuccess"
             :limit="1"
           >
-            <i class="el-icon-plus" />
+            <i class="el-icon-plus"></i>
           </el-upload>
+          <el-dialog :visible.sync="imgDialog" :modal="false">
+            <img width="100%" :src="form.offlineTransactionProof" alt="" />
+          </el-dialog>
         </el-form-item>
-        <el-form-item label="交易说明" prop="belongLibrary">
+
+        <el-form-item label="交易说明" prop="reverseRemark">
           <el-input
             type="textarea"
             :rows="2"
-            placeholder="请输入内容"
-            v-model="textarea"
+            placeholder="请输入交易说明"
+            v-model="form.reverseRemark"
           >
           </el-input>
         </el-form-item>
@@ -82,16 +70,13 @@
 </template>
 
 <script>
-import serve from "api/financialCenter/enterpriseRechargeDetails.js";
+import serve from "api/financialCenter/enterpriseRecharge.js";
 import commonServe from "api/common.js";
 
 import autocomplete from "components/autocomplete/index.vue";
 
-import {
-  rechargeTypeEnum,
-  rechargeStatusEnum,
-  repaymentExamineEnum,
-} from "utils/dataType.js";
+import utils from "utils/encode";
+const JSESSIONID = utils.uuid();
 
 export default {
   components: {
@@ -105,8 +90,22 @@ export default {
       if (this.form.companyId) callback();
       else callback("请选择公司");
     };
+    let validatorofflineTransactionProof = (rule, value, callback) => {
+      if (this.form.offlineTransactionProof) callback();
+      else callback("请上传凭证");
+    };
     return {
-      uploadUrl: process.env.VUE_APP_UPLOAD_URL,
+      uploadUrl:
+        process.env.VUE_APP_ENV === "development"
+          ? "/api/oil-oss/obejct/uploadFile"
+          : "/adminapi/oil-oss/obejct/uploadFile",
+      imgDialog: false,
+      headers: {
+        dataSources: "WEB",
+        Authorization: localStorage.getItem("token"),
+        JSESSIONID: JSESSIONID,
+        token: utils.bcrypt(JSESSIONID),
+      },
       form: {},
       refineryList: [],
       configAutocomplete: {
@@ -116,52 +115,28 @@ export default {
         valueKey: "id",
         placeholder: "企业名称",
         querykey: "companyId",
+        echoId: "",
+        echoName: "",
       },
-      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" },
+        transactionType: [
+          { required: true, message: "请选择交易类型", trigger: "change" },
         ],
-        floorPrice: [
-          { required: true, message: "请输入成本价", trigger: "blur" },
+        transactionAmount: [
+          { required: true, message: "请输入交易金额", trigger: "blur" },
         ],
-        salePrice2company: [
-          { required: true, message: "请输入企业销售价", trigger: "blur" },
+        offlineTransactionProof: [
+          {
+            required: true,
+            validator: validatorofflineTransactionProof,
+            trigger: "change",
+          },
         ],
-        salePrice2personal: [
-          { required: true, message: "请输入个人销售价", trigger: "blur" },
-        ],
-        measurement: [
-          { required: true, message: "请输入计量单位", trigger: "blur" },
-        ],
-        enableMark: [
-          { required: true, message: "请选择启用状态", trigger: "change" },
+        reverseRemark: [
+          { required: true, message: "请输入交易说明", trigger: "blur" },
         ],
       },
     };
@@ -169,23 +144,45 @@ export default {
   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);
+      //回显
+      id &&
+        (this.form = JSON.parse(JSON.stringify(this.controlWindows.addInfo)));
+      let configUpdata = id
+        ? { echoId: id, echoName: this.form.refineryName, isDisabled: true }
+        : {
+            echoId: "",
+            echoName: "",
+            isDisabled: false,
+          };
+      Object.assign(this.configAutocomplete, configUpdata);
+    },
+    // 交易类型 change
+    changeTransactionType(val) {
+      if (val === "CHARGE_SALES") {
+        this.handleRemove();
+      }
+    },
+    //img大图
+    handlePictureCardPreview(file) {
+      this.form.offlineTransactionProof = file.url;
+      this.imgDialog = true;
+    },
+    // img remove
+    handleRemove(file, fileList) {
+      this.form.offlineTransactionProof = "";
+    },
+    // 上传成功
+    handleSuccess(response, file, fileList) {
+      if (response.code === 20000) {
+        this.form.offlineTransactionProof = response.data.publicUrl;
       }
     },
     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();
-            }
+            this.$message.success(res.msg);
+            this.closeWindow();
           });
         }
       });
@@ -195,27 +192,6 @@ export default {
       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 = {};
diff --git a/src/views/financialCenter/enterpriseRecharge/index.vue b/src/views/financialCenter/enterpriseRecharge/index.vue
index 8f98f37..3728cf5 100644
--- a/src/views/financialCenter/enterpriseRecharge/index.vue
+++ b/src/views/financialCenter/enterpriseRecharge/index.vue
@@ -224,12 +224,40 @@
         <el-table-column label="操作">
           <template slot-scope="{ row }">
             <span class="el-dropdown-link" @click="detail(row)">详情</span>
+            <el-dropdown
+              @command="
+                (val) => {
+                  commandMore(val, row);
+                }
+              "
+            >
+              <span class="el-dropdown-link">
+                更多<i class="el-icon-arrow-down el-icon--right"></i>
+              </span>
+              <el-dropdown-menu slot="dropdown">
+                <template v-if="row.transactionType == 'TURN'"> </template>
+                <template v-else>
+                  <el-dropdown-item command="update" v-if="row.auditMark === 0"
+                    >编辑</el-dropdown-item
+                  >
+                </template>
+                <el-dropdown-item
+                  command="destroy"
+                  v-if="
+                    row.transactionType == 'CHARGE_SALES' &&
+                    row.chargeSalesAuditMark == -2
+                  "
+                  >销账</el-dropdown-item
+                >
+              </el-dropdown-menu>
+            </el-dropdown>
           </template>
         </el-table-column>
       </el-table>
       <!-- 分页 -->
       <pagination :parameter="parameter" @searchAgain="getByPage" />
     </div>
+    <add :controlWindows="controlWindows" @closeWindow="search" />
     <!-- 详情 -->
     <el-drawer
       title="详情"
@@ -261,6 +289,8 @@
 import serve from "api/financialCenter/enterpriseRechargeDetails.js";
 import commonServe from "api/common.js";
 
+import add from "./components/add.vue";
+
 import autocomplete from "components/autocomplete/index.vue";
 import pagination from "components/pagination/index.vue";
 import generalDetails from "components/generalDetails/index.vue";
@@ -273,12 +303,19 @@ import {
 
 export default {
   components: {
+    add,
+
     pagination,
     autocomplete,
     generalDetails,
   },
   data() {
     return {
+      controlWindows: {
+        add: false,
+        addInfo: {},
+        detail: false,
+      },
       rechargeTypeEnum: [
         {
           label: "圈回",
@@ -308,9 +345,7 @@ export default {
           value: -1,
         },
       ],
-      controlWindows: {
-        detail: false,
-      },
+
       datetime: [],
       tableHeight: 0,
       tableData: [],
@@ -489,9 +524,22 @@ export default {
     },
     //新增
     addition() {
-      this.controlWindows.addInfo.title = "产品新增";
+      this.controlWindows.addInfo = {
+        title: "企业充值",
+      };
       this.controlWindows.add = true;
     },
+    // 更多
+    commandMore(val, row) {
+      if (val === "update") {
+        this.controlWindows.addInfo = {
+          title: "编辑",
+          ...row,
+        };
+        this.controlWindows.add = true;
+      }
+    },
+    //详情
     detail(row) {
       Promise.all([
         serve.get(row.id),
@@ -499,10 +547,10 @@ export default {
       ]).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 = [];
@@ -566,7 +614,6 @@ export default {
         this.parameter.params.createTimeStart = val[0];
         this.parameter.params.createTimeEnd = val[1];
       }
-      console.log(val);
     },
     // table height
     heightHandle() {
diff --git a/src/views/financialCenter/enterpriseRechargeDetails/index.vue b/src/views/financialCenter/enterpriseRechargeDetails/index.vue
index 368ab55..0478afb 100644
--- a/src/views/financialCenter/enterpriseRechargeDetails/index.vue
+++ b/src/views/financialCenter/enterpriseRechargeDetails/index.vue
@@ -416,7 +416,6 @@ export default {
       ]).then(([firstRes, secondRes]) => {
         this.oilCompanyMatch = { ...firstRes.data, ...secondRes.data };
 
-        console.log("this.oilCompanyMatch", this.oilCompanyMatch);
         this.controlWindows.detail = true;
       });
     },
@@ -483,7 +482,6 @@ export default {
         this.parameter.params.createTimeStart = val[0];
         this.parameter.params.createTimeEnd = val[1];
       }
-      console.log(val);
     },
     // table height
     heightHandle() {
diff --git a/src/views/product/components/add.vue b/src/views/product/components/add.vue
index 02de4f5..8bb95fc 100644
--- a/src/views/product/components/add.vue
+++ b/src/views/product/components/add.vue
@@ -175,11 +175,9 @@ export default {
         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) => {
@@ -196,27 +194,7 @@ export default {
       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 = {};
diff --git a/src/views/product/index.vue b/src/views/product/index.vue
index 3105297..b6056d6 100644
--- a/src/views/product/index.vue
+++ b/src/views/product/index.vue
@@ -292,25 +292,7 @@ export default {
         this.parameter.total = res.data.totalCount;
       });
     },
-    // 远程搜索
-    // querySearchAsync(queryString, cb) {
-    //   if (queryString) {
-    //     refineryServe
-    //       .findByEntity({ refineryName: queryString })
-    //       .then((res) => {
-    //         let timeInstance = setTimeout(() => {
-    //           clearTimeout(timeInstance);
-    //           if (res.data.length) {
-    //             console.log(res.data);
-    //             cb(res.data);
-    //           } else cb([]);
-    //         }, 1000 * Math.random());
-    //       });
-    //   } else cb([]);
-    // },
-    // selectAutocomplete(item) {
-    //   this.parameter.params.refineryId = item.id;
-    // },
+
     //新增
     addition() {
       this.controlWindows.addInfo.title = "产品新增";
@@ -320,7 +302,6 @@ export default {
     //下单
     createOrder(row) {
       this.controlWindows.create = true;
-      console.log(this.controlWindows.create);
     },
     //详情
     detail(row) {

From 18161909e0908bd1a9dfb9c0009dc31c38dc98ec Mon Sep 17 00:00:00 2001
From: KongDuo <zhengmingking@163.com>
Date: Tue, 21 Feb 2023 16:10:03 +0800
Subject: [PATCH 06/18] =?UTF-8?q?=E5=85=AC=E5=8F=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/customerManagement/areaCode.js        |   98 ++
 src/api/customerManagement/oilCompanyAuth.js  |   54 +
 src/api/customerManagement/oilCompanyInfo.js  |  283 +++++
 src/api/user/sysCustomerInfo.js               |  196 +++
 .../companyAuth/OilCompanyAuthAdd.vue         |  356 ++++++
 .../companyManagement/OilCompanyInfoAdd.vue   |  201 +++
 .../companyManagement/index.vue               | 1125 ++++++++++-------
 vue.config.js                                 |    2 +-
 8 files changed, 1822 insertions(+), 493 deletions(-)
 create mode 100644 src/api/customerManagement/areaCode.js
 create mode 100644 src/api/customerManagement/oilCompanyAuth.js
 create mode 100644 src/api/customerManagement/oilCompanyInfo.js
 create mode 100644 src/api/user/sysCustomerInfo.js
 create mode 100644 src/views/customerManagement/companyAuth/OilCompanyAuthAdd.vue
 create mode 100644 src/views/customerManagement/companyManagement/OilCompanyInfoAdd.vue

diff --git a/src/api/customerManagement/areaCode.js b/src/api/customerManagement/areaCode.js
new file mode 100644
index 0000000..06832e0
--- /dev/null
+++ b/src/api/customerManagement/areaCode.js
@@ -0,0 +1,98 @@
+import request from '@/utils/request'
+var service_name = 'oil-dict'
+var group_name = 'areaCode'
+export default {
+  getByPage(page) { // 分页查询
+    return request({
+      url: `/${service_name}/${group_name}/getByPage`,
+      notEncrypt: true,
+      method: 'post',
+      data: page
+    })
+  },
+  save(areaCode) { // 保存
+    return request({
+      url: `/${service_name}/${group_name}/save`,
+      notEncrypt: true,
+      method: 'post',
+      data: areaCode
+    })
+  },
+  get(id) { // 根据id查询
+    return request({
+      url: `/${service_name}/${group_name}/get/${id}`,
+      notEncrypt: true,
+      method: 'get'
+    })
+  },
+  getTree() { // 树状查询
+    return request({
+      url: `/${service_name}/${group_name}/getTree`,
+      notEncrypt: true,
+      method: 'get'
+    })
+  },
+  treeListNoCounty() { // 树状查询没有区
+    return request({
+      url: `/${service_name}/${group_name}/treeListNoCounty`,
+      notEncrypt: true,
+      method: 'get'
+    })
+  },
+  update(areaCode) { // 更新
+    return request({
+      url: `/${service_name}/${group_name}/update`,
+      notEncrypt: true,
+      method: 'put',
+      data: areaCode
+    })
+  },
+  exportExcel(page) { // 导出
+    return request({
+      url: `/${service_name}/${group_name}/export`,
+      notEncrypt: true,
+      method: 'post',
+      data: page,
+      responseType: 'blob'
+    })
+  },
+  exportSiteWeb(page) { // 导出
+    return request({
+      url: `/oil-finance/oilOrderInfoExcel/exportSiteWeb`,
+      notEncrypt: true,
+      method: 'post',
+      data: page,
+      responseType: 'blob'
+    })
+  },
+  deleteById(id) { // 根据id删除
+    return request({
+      url: `/${service_name}/${group_name}/delete`,
+      notEncrypt: true,
+      method: 'put',
+      data: { id: id }
+    })
+  },
+  getGroupList() { // 分组查询  最终查询的结果是省市县各一个集合
+    return request({
+      url: `/${service_name}/${group_name}/getGroupList`,
+      notEncrypt: true,
+      method: 'get'
+    })
+  },
+  areaCodeProvince() { // 分组查询  最终查询的结果是省市县各一个集合
+    return request({
+      url: `/${service_name}/${group_name}/areaCodeProvince`,
+      notEncrypt: true,
+      method: 'get'
+    })
+  },
+  findAllByName(name) { // 分组查询  最终查询的结果是省市县各一个集合
+    return request({
+      url: `/oil-site/sysSheet/findAllByName`,
+      method: 'get',
+      params:name
+    })
+  }
+  
+}
diff --git a/src/api/customerManagement/oilCompanyAuth.js b/src/api/customerManagement/oilCompanyAuth.js
new file mode 100644
index 0000000..596f6ff
--- /dev/null
+++ b/src/api/customerManagement/oilCompanyAuth.js
@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+var service_name = 'oil-user'
+var group_name = 'oilCompanyAuth'
+export default {
+  getByPage(page) { // 分页查询
+    return request({
+      url: `/${service_name}/${group_name}/getByPage`,
+      method: 'post',
+      data: page
+    })
+  },
+  save(oilCompanyAuth) { // 保存
+    return request({
+      url: `/${service_name}/${group_name}/save`,
+      method: 'post',
+      data: oilCompanyAuth
+    })
+  },
+  get(id) { // 根据id查询
+    return request({
+      url: `/${service_name}/${group_name}/get/${id}`,
+      method: 'get'
+    })
+  },
+  update(oilCompanyAuth) { // 更新
+    return request({
+      url: `/${service_name}/${group_name}/update`,
+      method: 'put',
+      data: oilCompanyAuth
+    })
+  },
+  exportExcel(page) { // 导出
+    return request({
+      url: `/${service_name}/${group_name}/export`,
+      method: 'post',
+      notEncrypt: true,
+      data: page,
+      responseType: 'blob'
+    })
+  },
+  deleteById(id) { // 根据id删除
+    return request({
+      url: `/${service_name}/${group_name}/delete`,
+      method: 'put',
+      data: { id: id }
+    })
+  },
+  getByCompanyId(id) { // 根据企业编号查询
+    return request({
+      url: `/${service_name}/${group_name}/getByCompanyId/${id}`,
+      method: 'get'
+    })
+  }
+}
diff --git a/src/api/customerManagement/oilCompanyInfo.js b/src/api/customerManagement/oilCompanyInfo.js
new file mode 100644
index 0000000..ebb45ce
--- /dev/null
+++ b/src/api/customerManagement/oilCompanyInfo.js
@@ -0,0 +1,283 @@
+import request from "@/utils/request";
+var service_name = "oil-user";
+var group_name = "oilCompanyInfo";
+export default {
+    getByPage(page) {
+        // 分页查询
+        return request({
+            url: `/${service_name}/${group_name}/getByPage`,
+            method: "post",
+            data: page,
+        });
+    },
+    save(oilCompanyInfo) {
+        // 保存
+        return request({
+            url: `/${service_name}/${group_name}/save`,
+            method: "post",
+            data: oilCompanyInfo,
+        });
+    },
+    get(id) {
+        // 根据id查询
+        return request({
+            url: `/${service_name}/${group_name}/get/${id}`,
+            method: "get",
+        });
+    },
+    update(oilCompanyInfo) {
+        // 更新
+        return request({
+            url: `/${service_name}/${group_name}/update`,
+            method: "put",
+            data: oilCompanyInfo,
+        });
+    },
+    exportExcel(page) {
+        // 导出
+        return request({
+            url: `/oil-finance/oilOrderInfoExcel/exportExcel`,
+            method: "post",
+            // notEncrypt: true,
+            data: page,
+            responseType: "blob",
+        });
+    },
+    deleteById(id) {
+        // 根据id删除
+        return request({
+            url: `/${service_name}/${group_name}/delete`,
+            method: "put",
+            data: { id: id },
+        });
+    },
+
+    getAllCompany() {
+        // 获取全部可用企业
+        return request({
+            url: `/${service_name}/${group_name}/getAllCompany`,
+            method: "get",
+        });
+    },
+    getLikeByName(oilCompanyInfo) {
+        // 根据企业名称模糊搜索
+        return request({
+            url: `/${service_name}/${group_name}/getLikeByName`,
+            method: "post",
+            data: oilCompanyInfo,
+        });
+    },
+    getRelationSite(oilCompanyInfo) {
+        // 根据企业名称模糊搜索
+        return request({
+            url: `/oil-site/oilSiteInfo/getRelationSite`,
+            method: "post",
+            data: oilCompanyInfo,
+        });
+    },
+    getByEntity(oilCompanyInfo) {
+        // 模糊查询
+        return request({
+            url: `/${service_name}/${group_name}/getByEntity`,
+            method: "post",
+            data: oilCompanyInfo,
+        });
+    },
+    getSubCompany(oilCompanyInfo) {
+        // 查询子公司或者同级公司和总公司
+        return request({
+            url: `/${service_name}/${group_name}/getSubCompany`,
+            method: "post",
+            data: oilCompanyInfo,
+        });
+    },
+    getLikeByNameOrId(oilCompanyInfo) {
+        // 根据企业名称模糊搜索
+        return request({
+            url: `/${service_name}/${group_name}/getLikeByNameOrId`,
+            method: "post",
+            data: oilCompanyInfo,
+        });
+    },
+    getLikeByNameMainCompany(oilCompanyInfo) {
+        // 根据企业名称模糊搜索
+        return request({
+            url: `/${service_name}/${group_name}/getLikeByNameMainCompany`,
+            method: "post",
+            data: oilCompanyInfo,
+        });
+    },
+    getLikeByNameAndId(oilCompanyInfo) {
+        // 根据企业名称和企业编号,模糊搜索不等于当前公司的其他公司
+        return request({
+            url: `/${service_name}/${group_name}/getLikeByNameAndId`,
+            method: "post",
+            data: oilCompanyInfo,
+        });
+    },
+    updateBatchEnable(data) {
+        // 批量修改启用禁用状态
+        return request({
+            url: `/${service_name}/${group_name}/updateBatchEnable`,
+            method: "post",
+            data,
+        });
+    },
+    openShareDistribute(data) {
+        // 批量修改启用禁用状态
+        return request({
+            url: `/${service_name}/${group_name}/openShareDistribute`,
+            method: "post",
+            data,
+        });
+    },
+    audit(data) {
+        // 审核
+        return request({
+            url: `/${service_name}/${group_name}/audit`,
+            method: "post",
+            data,
+        });
+    },
+    getLikeByNameSuccess(data) {
+        // 根据企业名称模糊搜索可用企业
+        return request({
+            url: `/${service_name}/${group_name}/getLikeByNameSuccess`,
+            method: "post",
+            data,
+        });
+    },
+    getByUserId(id) {
+        // 根据用户id查询
+        return request({
+            url: `/${service_name}/${group_name}/getByUserId/${id}`,
+            method: "get",
+        });
+    },
+    getByCustomerId(id) {
+        // 查询用户关联调度企业
+        return request({
+            url: `/${service_name}/oilCustomerDispatchRelation/getByCustomerId/${id}`,
+            method: "get",
+        });
+    },
+    getRefineryByCustomerId(id) {
+        // 查询用户关联油批企业
+        return request({
+            url: `/${service_name}/oilCustomerDispatchRelation/getRefineryByCustomerId/${id}`,
+            method: "get",
+        });
+    },
+    getByRole(data, userId) {
+        // 根据角色获取对应的企业
+        return request({
+            url: `/${service_name}/${group_name}/getByRole/${userId}`,
+            method: "post",
+            data,
+        });
+    },
+    getLike(value) {
+        // 模糊搜索企业
+        return request({
+            url: `/${service_name}/${group_name}/getLike/${value}`,
+            method: "get",
+        });
+    },
+    getCompanyListCustomer(id) {
+        // 获取发起公司列表
+        return request({
+            url: `/${service_name}/${group_name}/getCompanyListCustomer`,
+            method: "get",
+        });
+    },
+    getCompanyList(id) {
+        return request({
+            url: `/${service_name}/${group_name}/getCompanyList`,
+            method: "get",
+        });
+    },
+    getSubCompanyListCustomer(id) {
+        // 获取接收公司列表
+        return request({
+            url: `/${service_name}/${group_name}/getSubCompanyListCustomer`,
+            method: "get",
+        });
+    },
+    // 获取企业列表（远程搜索）
+    getCompanyNames(name) {
+        return request({
+            url: `/${service_name}/${group_name}/getCompanyNames/${name}`,
+            method: "get",
+        });
+    },
+    // 获取企业列表（远程搜索）
+    // getLikeByNameMainCompany(data) {
+    //     return request({
+    //         url: `/${service_name}/${group_name}/getLikeByNameMainCompany`,
+    //         method: "post",
+    //         data,
+    //     });
+    // },
+    // 企业用户手机号验证
+    validatePhoneUserRolePermissions(data) {
+        return request({
+            url: `/${service_name}/oilCustomerCompanyRelation/validatePhoneUserRolePermissions`,
+            method: "post",
+            data,
+        });
+    },
+    findByUserId(data) {
+        return request({
+            url: `/oil-user/etcUserCustomer/findByUserId`,
+            method: "get",
+            params: data,
+        });
+    },
+    findAllCustomerList(data) {
+        return request({
+            url: `/lsm-etc-service/etcCustomer/findAllCustomerList`,
+            method: "get",
+            params: data,
+        });
+    },
+    // deleteById(data) {
+    //     return request({
+    //         url: `/oil-user/etcUserCustomer/deleteById`,
+    //         method: "get",
+    //         params: data,
+    //     });
+    // },
+    getByCompanyId(companyId) {
+        return request({
+            url: `/oil-finance/oilCompanyBankCard/getByCompanyId/${companyId}`,
+            method: "get",
+        });
+    },
+    saveBatchCompanyRelationBank(data) {
+        return request({
+            url: `/oil-finance/oilCompanyBankCard/saveBatchCompanyRelationBank`,
+            method: "post",
+            data,
+        });
+    },
+    countByCompanyId(id) {
+        return request({
+            url: `/oil-site/oilCompanySiteInfoRelation/countByCompanyId/${id}`,
+            method: "get",
+        });
+    },
+    export(id) {
+        return request({
+            url: `/oil-site/oilCompanySiteInfoRelation/export/${id}`,
+            method: "get",
+            responseType: "blob",
+        });
+    },
+    importSave(data) {
+        return request({
+            url: `/oil-site/oilCompanySiteInfoRelation/importSave`,
+            method: "post",
+            data,
+        });
+    },
+};
diff --git a/src/api/user/sysCustomerInfo.js b/src/api/user/sysCustomerInfo.js
new file mode 100644
index 0000000..f5331fb
--- /dev/null
+++ b/src/api/user/sysCustomerInfo.js
@@ -0,0 +1,196 @@
+import request from '@/utils/request'
+var service_name = 'oil-user'
+var group_name = 'sysCustomerInfo'
+export default {
+  getByPage(page) { // 分页查询
+    return request({
+      url: `/${service_name}/${group_name}/getByPage`,
+      method: 'post',
+      data: page
+    })
+  },
+  save(sysCustomerInfo) { // 保存
+    return request({
+      url: `/${service_name}/${group_name}/save`,
+      method: 'post',
+      data: sysCustomerInfo
+    })
+  },
+  get(id) { // 根据id查询
+    return request({
+      url: `/${service_name}/${group_name}/get/${id}`,
+      method: 'get'
+    })
+  },
+  getByBusinessLeader(businessLeader) { // 根据id删除
+    return request({
+      url: `/${service_name}/${group_name}/getByBusinessLeader`,
+      method: 'get',
+      params: {
+        businessLeader
+      }
+    })
+  },
+  findAll() { // 根据id查询
+    return request({
+      url: `/${service_name}/${group_name}/findAll`,
+      method: 'get'
+    })
+  },
+  getTodayRegister() { // 查询当日新增会员
+    return request({
+      url: `/${service_name}/${group_name}/getTodayRegister`,
+      method: 'get'
+    })
+  },
+  getYesterdayData() { // 查询当日新增会员
+    return request({
+      url: `/${service_name}/${group_name}/getYesterdayData`,
+      method: 'get'
+    })
+  },
+  getLoginCount() { // 查询当前登录人数
+    return request({
+      url: `/${service_name}/${group_name}/getLoginCount`,
+      method: 'get'
+    })
+  },
+  findByBusinessLeader(businessLeader) { // 查询当前登录人数
+    return request({
+      url: `/${service_name}/${group_name}/findByBusinessLeader`,
+      method: 'get',
+      params: {
+        businessLeader
+      }
+    })
+  },
+  getTotalCount() { // 查询用户总数
+    return request({
+      url: `/${service_name}/${group_name}/getTotalCount`,
+      method: 'get'
+    })
+  },
+  update(sysCustomerInfo) { // 更新
+    return request({
+      url: `/${service_name}/${group_name}/update`,
+      method: 'put',
+      data: sysCustomerInfo
+    })
+  },
+  exportExcel(page) { // 导出
+    return request({
+      url: `/${service_name}/${group_name}/export`,
+      method: 'post',
+      notEncrypt: true,
+      data: page,
+      responseType: 'blob'
+    })
+  },
+  deleteById(id) { // 根据id删除
+    return request({
+      url: `/${service_name}/${group_name}/delete`,
+      method: 'put',
+      data: { id: id }
+    })
+  },
+  updateBatchEnalbe(data) { // 批量修改启用禁用状态
+    return request({
+      url: `/${service_name}/${group_name}/updateBatchEnalbe`,
+      method: 'post',
+      data
+    })
+  },
+  liekQuery(value) { // 模糊搜索
+    return request({
+      url: `/${service_name}/${group_name}/liekQuery/${value}`,
+      method: 'get'
+    })
+  },
+  searchInfo(value) { // 根据手机号、编号、姓名查询
+    return request({
+      url: `/${service_name}/${group_name}/searchInfo/${value}`,
+      method: 'get'
+    })
+  },
+  getByPhone(phone) { // 模糊搜索
+    return request({
+      url: `/${service_name}/${group_name}/getByPhone/${phone}`,
+      method: 'get'
+    })
+  },
+  getByPhoneNoGlobalEnable(phone) { // 根据用户手机号查询
+    return request({
+      url: `/${service_name}/${group_name}/getByPhoneNoGlobalEnable/${phone}`,
+      method: 'get'
+    })
+  },
+  getListByPhoneNoGlobalEnable(phone) { // 根据用户手机号查询
+    return request({
+      url: `/${service_name}/${group_name}/getListByPhoneNoGlobalEnable/${phone}`,
+      method: 'get'
+    })
+  },
+  saveDriver(sysCustomerInfo) { // 保存
+    return request({
+      url: `/${service_name}/${group_name}/saveDriver`,
+      method: 'post',
+      data: sysCustomerInfo
+    })
+  },
+  getDriverByPage(page) { // 获取司机列表
+    return request({
+      url: `/${service_name}/${group_name}/getDriverByPage`,
+      method: 'post',
+      data: page
+    })
+  },
+  getByPages(page) { // 获取司机列表
+    return request({
+      url: `/${service_name}/${group_name}/getByPages`,
+      method: 'post',
+      data: page
+    })
+  },
+  getCompanyDrivers(sysCustomerInfo) { // 保存
+    return request({
+      url: `/${service_name}/${group_name}/getCompanyDrivers`,
+      method: 'post',
+      data: sysCustomerInfo
+    })
+  },
+  getCompanyDriversOwn(sysCustomerInfo) { // 保存
+    return request({
+      url: `/${service_name}/${group_name}/getCompanyDriversOwn`,
+      method: 'post',
+      data: sysCustomerInfo
+    })
+  },
+  // 根据用户编号查询
+  getUserNameMaps() {
+    return request({
+      url: `/${service_name}/${group_name}/getAllUserNameMaps`,
+      method: 'get'
+    })
+  },
+  userPermissionUpdate(data) { // 企业用户信息修改
+    return request({
+      url: `/${service_name}/oilCustomerCompanyRelation/userPermissionUpdate`,
+      method: 'post',
+      data
+    })
+  },
+  getRechargeCode(data) { // 获取操作码
+    return request({
+      url: `/oil-finance/lc/getRechargeCode`,
+      method: 'post',
+      data
+    })
+  },
+  userPermissionSave(data) { // 添加企业用户
+    return request({
+      url: `/${service_name}/oilCustomerCompanyRelation/userPermissionSave`,
+      method: 'post',
+      data
+    })
+  },
+}
diff --git a/src/views/customerManagement/companyAuth/OilCompanyAuthAdd.vue b/src/views/customerManagement/companyAuth/OilCompanyAuthAdd.vue
new file mode 100644
index 0000000..9d705eb
--- /dev/null
+++ b/src/views/customerManagement/companyAuth/OilCompanyAuthAdd.vue
@@ -0,0 +1,356 @@
+<template>
+  <div style="padding:30px 75px 50px;">
+    <div style="width:100%;position: absolute;top: 15px;left: 0;">
+      <div style="display: flex;
+    align-items: center;padding-left: 20px;">
+        <svg-icon
+        icon-class="iconsiji2"
+        style="font-size: 30px;margin-right: 10px;"
+      />
+      <span>添加认证信息</span>
+      </div>
+      <el-divider style="width:100%"></el-divider>
+    </div>
+    <el-row>
+      <el-form ref="form" :rules="rules" :model="oilCompanyAuth" label-width="100px" :size="$store.getters.size">
+        <el-row :gutter="gridNum.row.gutter">
+
+          <el-col :span="12">
+            <el-form-item label="企业名称" prop="companyName">
+              <el-input v-model="oilCompanyAuth.companyName" clearable disabled/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="注册省市区" prop="addrCode">
+              <el-cascader
+                v-model="addrCode"
+                placeholder="注册省市区"
+                :size="$store.getters.size"
+                style="width: 100%"
+                :options="areaTree"
+                :props="{value:'id', label:'areaName', children:'childList'}"
+                filterable
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="详细地址" prop="address">
+              <el-input v-model="oilCompanyAuth.address" clearable placeholder="不包含省市区" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="法人代表" prop="companyLegalPerson">
+              <el-input v-model="oilCompanyAuth.companyLegalPerson" clearable placeholder="法人姓名" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="注册资本" prop="registeredCapital">
+              <el-input v-model="oilCompanyAuth.registeredCapital" clearable placeholder="小写数字" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="经营资质" prop="businessQualia">
+              <el-input v-model="oilCompanyAuth.businessQualia" clearable placeholder="企业经营资质" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="联系方式" prop="contactPhone">
+              <el-input v-model="oilCompanyAuth.contactPhone" clearable placeholder="手机号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="企业网址" prop="website">
+              <el-input v-model="oilCompanyAuth.website" clearable placeholder="企业门户" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+          <el-col :span="12">
+          <el-form-item label="营业执照号码" prop="businessLienceId">
+              <el-input v-model="oilCompanyAuth.businessLienceId" clearable placeholder="营业执照号码" />
+            </el-form-item></el-col>
+
+          </el-col>
+          <!-- <el-col :span="12">
+            <el-form-item label="打款名称" prop="bankCardName">
+              <el-input v-model="oilCompanyAuth.bankCardName" placeholder="请输入打款名称" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="银行卡号" prop="bankCardNo">
+              <el-input v-model="oilCompanyAuth.bankCardNo" placeholder="请输入银行卡号" clearable />
+            </el-form-item>
+          </el-col>
+              <el-col :span="12">
+            <el-form-item  label="开户行名称" prop="bankName">
+              <el-select
+               @clear="oilCompanyAuth.interBankCode=''"
+               :loading="loading"
+               filterable
+               @change="handleSelect"
+               :remote-method="userRemoteMethod"
+               remote
+               style="width:100%"
+               v-model="oilCompanyAuth.bankName"
+               placeholder="请输入开户行名称或联行号"
+               clearable >
+               <el-option
+                  v-for="item in userList"
+                  :key="item.id"
+                  :label="item.bankName"
+                  :value="item.bankName"
+                />
+              </el-select>
+              <el-button type="text" icon="el-icon-document-copy" size="mini" @click="copyBankName(oilCompanyAuth.bankName,$event)" />
+            </el-form-item>
+          </el-col>
+           <el-col :span="12">
+            <el-form-item  label="联行号" prop="interBankCode">
+              <el-input :disabled="true" v-model="oilCompanyAuth.interBankCode" placeholder="根据请输入开户行名称自动匹配" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="经营范围" prop="businessScope">
+              <el-input v-model="oilCompanyAuth.businessScope" type="textarea" clearable placeholder="经营范围" />
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="24">
+            <el-form-item label="营业执照照片" prop="businessLienceImg">
+              <el-upload
+                action="/lsm/ocr/business"
+                list-type="picture-card"
+                :on-preview="businessLienceImgPreview"
+                :on-success="businessLienceImgSuccess"
+                :before-upload="imgCompress"
+                :on-remove="businessLienceImgRemove"
+                :limit="1"
+              >
+                <i class="el-icon-plus" />
+              </el-upload>
+            </el-form-item>
+            <el-dialog
+              v-el-drag-dialog
+              :visible.sync="imgeDialogVisible"
+              title="营业执照"
+              :modal="false"
+            >
+              <img width="100%" :src="oilCompanyAuth.ibusinessLienceImgImageShow" alt="">
+            </el-dialog>
+          </el-col>
+          <!-- <el-col :span="12">
+            <el-form-item label="是否审核通过" prop="auth">
+              <el-switch
+                v-model="oilCompanyAuth.auth"
+                active-color="#13ce66"
+                inactive-color="#ff4949"
+              />
+            </el-form-item>
+          </el-col> -->
+
+        </el-row>
+      </el-form>
+    </el-row>
+    <div :span="24" style="background:#fff;margin-top:20px;text-align: right;width:100%;position: absolute;bottom: 15px;left: 0;">
+          <el-divider style="width:100%"></el-divider>
+          <el-button @click="close">取消</el-button>
+            <el-button type="primary" @click="submit" style="margin-right:10px">提交</el-button>
+        </div>
+  </div>
+</template>
+<script>
+import oilCompanyAuthApi from '@/api/customerManagement/oilCompanyAuth'
+import AreaCodeApi from '@/api/customerManagement/areaCode'
+import { imgCompress } from '@/utils'
+import axios from 'axios'
+
+export default {
+  props: {
+    oilCompanyInfo: {
+      type: Object,
+      default() {
+
+      }
+    }
+  },
+  data() {
+    return {
+      gridNum: {
+        row: {
+          gutter: 2
+        },
+        cols: {
+          xs: 24,
+          sm: 24,
+          md: 12,
+          lg: 12,
+          xl: 6
+        }
+      },
+      loading:false,
+      imgCompress,
+      userList:[],
+      uploadUrl: process.env.VUE_APP_UPLOAD_PRIVATE_URL, // 加密图片url
+      imgeDialogVisible: false,
+      areaTree: [], // 省市区树形结构
+      addrCode: [], // 省市区code
+      oilCompanyAuth: {
+        companyId: undefined,
+        companyName: undefined,
+        provinceCode: undefined,
+        cityCode: undefined,
+        areaCode: undefined,
+        businessLienceImg: undefined,
+        businessLienceImgImageShow: undefined,
+        address: undefined,
+        companyLegalPerson: undefined,
+        registeredCapital: undefined,
+        businessScope: undefined,
+        businessQualia: undefined,
+        contactPhone: undefined,
+        website: undefined,
+        businessLienceId: undefined,
+        auth: false,
+        auditMark: undefined,
+        createSource: 'WEBM'
+      },
+      rules: {
+        companyName: [
+          { required: true, message: '请输入企业名称', trigger: 'blur' },
+          { min: 3, max: 50, message: '长度在 3 到 50 个字符', trigger: 'blur' }
+        ],
+        bankCardName:[
+          { required: true, message: '请输入打款名称', trigger: 'blur' },
+        ],
+        bankCardNo:[
+          { required: true, message: '请输入银行卡号', trigger: 'blur' },
+        ],
+        bankName:[
+          { required: true, message: '请输入开户行名称', trigger: 'change' },
+        ],
+        interBankCode:[
+          { required: true, message: '请输入联行号', trigger: 'blur' },
+        ],
+        address: [
+          { min: 1, max: 300, message: '长度在 1 到 300 个字符', trigger: 'blur' }
+        ],
+        companyLegalPerson: [
+          { min: 1, max: 50, message: '长度在 1 到 50 个字符', trigger: 'blur' }
+        ],
+        registeredCapital: [
+          { pattern: /^\d*$/, message: '只能输入数值' }
+        ],
+        businessQualia: [
+          { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
+        ],
+        contactPhone: [
+          { pattern: /^1[3456789]\d{9}$/, message: '目前只支持中国大陆的手机号码' }
+
+        ],
+        website: [
+          { pattern: /^(?:http(s)?:\/\/)?[\w.-]+(?:\.[\w\.-]+)+[\w\-\._~:/?#[\]@!\$&'\*\+,;=.]+$/, message: '请输入正确网址' }
+        ],
+        businessLienceId: [
+          { min: 1, max: 50, message: '长度在 1 到 50 个字符', trigger: 'blur' }
+        ],
+        businessScope: [
+          { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  created() {
+    this.oilCompanyAuth.companyId = this.oilCompanyInfo.id
+    this.oilCompanyAuth.companyName = this.oilCompanyInfo.name
+    AreaCodeApi.getTree().then(res => {
+      this.areaTree = res.data
+    })
+  },
+  methods: {
+    handleSelect(e){
+      console.log(e)
+      if(e){
+        console.log(this.userList.filter((item,index)=>item.bankName==e)[0].cnaps);
+        this.oilCompanyAuth.interBankCode = this.userList.filter((item,index)=>item.bankName==e)[0].cnaps
+      }
+    },
+    userRemoteMethod(queryString){
+        this.loading = true;
+        if(this.timer){
+          clearTimeout(this.timer)
+      }
+        this.timer = setTimeout(()=>{
+         AreaCodeApi.findAllByName({name:queryString}).then(res=>{
+           this.loading = false
+            this.userList = res.data
+      })
+      },300)
+
+    },
+    businessLienceImgPreview(file) { // 查询大图
+      this.oilCompanyAuth.ibusinessLienceImgImageShow = file.url
+      this.imgeDialogVisible = true
+    },
+    businessLienceImgSuccess(response, file) { // 营业执照上传成功
+      if (response.code === '0') {
+        this.oilCompanyAuth.businessLienceId = response.data.words_result.creditCode.words
+        this.oilCompanyAuth.companyName = response.data.words_result.unitName.words
+        this.oilCompanyAuth.companyLegalPerson = response.data.words_result.legal.words
+        this.oilCompanyAuth.businessScope = response.data.words_result.scope.words
+      }
+
+      imgCompress(file.raw).then(res => {
+        const form = new FormData()
+        res.fileName = file.fileName
+        form.append('file', res)
+        form.append('code', 'A003')
+
+        // 上传到oss
+        axios.post(this.uploadUrl, form, { headers: { 'Content-type': 'application/x-www-form-urlencoded' }}).then(res => {
+          if (res.data.code === 20000) {
+            this.oilCompanyAuth.businessLienceImg = res.data.data.path
+          }
+        })
+      })
+    },
+    businessLienceImgRemove() { // 营业执照删除
+      this.oilCompanyAuth.ibusinessLienceImgImageShow = undefined
+      this.oilCompanyAuth.businessLienceImg = undefined
+    },
+    submit() {
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          this.save(this.oilCompanyAuth)
+        }
+      })
+    },
+    save() {
+      const data = { ...this.oilCompanyAuth }
+      if (data.auth) {
+        data.auditMark = 1
+      } else {
+        data.auditMark = 2
+      }
+      if (this.addrCode.length > 1) {
+        data.provinceCode = this.addrCode[0]
+        data.cityCode = this.addrCode[1]
+        data.areaCode = this.addrCode[2]
+      }
+      // 保存
+      oilCompanyAuthApi.save(data).then(res => {
+        this.$message.success(res.msg)
+        this.$emit('closeDialog')
+        this.$emit('getByPage')
+      })
+    },
+    close() {
+      this.$emit('closeDialog')
+    }
+  }
+}
+</script>
+<style scoped>
+.el-divider--horizontal{
+  margin: 10px 0;
+  }
+</style>
diff --git a/src/views/customerManagement/companyManagement/OilCompanyInfoAdd.vue b/src/views/customerManagement/companyManagement/OilCompanyInfoAdd.vue
new file mode 100644
index 0000000..b999698
--- /dev/null
+++ b/src/views/customerManagement/companyManagement/OilCompanyInfoAdd.vue
@@ -0,0 +1,201 @@
+<template>
+  <div>
+    <el-row>
+      <el-form ref="form" :rules="rules" :model="oilCompanyInfo" label-width="100px" :size="$store.getters.size">
+        <el-row :gutter="gridNum.row.gutter">
+          <el-col :span="12">
+            <el-form-item label="企业名称" prop="name">
+              <el-input v-model="oilCompanyInfo.name" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="企业简称" prop="abbreviaName">
+              <el-input v-model="oilCompanyInfo.abbreviaName" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="公司级别" prop="parentMark">
+              <el-select v-model="oilCompanyInfo.parentMark" placeholder="请选择">
+                <el-option label="主体公司" :value="0" />
+                <el-option label="分公司" :value="1" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="oilCompanyInfo.parentMark === 1" :span="12">
+            <el-form-item label="上级公司" prop="parentId">
+              <el-select v-model="oilCompanyInfo.parentId" remote filterable :remote-method="companyOrginQuery" style="width: 100%" placeholder="请输入公司名称">
+                <el-option
+                  v-for="item in queryCompanyList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="企业性质" prop="companyNature">
+              <el-select v-model="oilCompanyInfo.companyNature" placeholder="请选择">
+                <el-option label="零售客户" :value="0" />
+                <el-option label="外请客户" :value="1" />
+                <el-option label="渠道客户" :value="2" />
+                <el-option label="存量客户" :value="3" />
+                <el-option label="批发客户" :value="4" />
+                <el-option label="LNG客户" :value="5" />
+                <el-option label="推广业务" :value="6" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="账户类型" prop="companyType">
+              <el-select v-model="oilCompanyInfo.companyType" placeholder="请选择">
+                <el-option label="柴油账户" :value="0" />
+                <el-option label="LNG账户" :value="2" />
+                <el-option label="汽油账户" :value="1" />
+                <el-option label="尿素账户" :value="3" />
+                <el-option label="油批账户" :value="4" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="企业负责人" prop="businessLeader">
+              <el-select
+                v-model="oilCompanyInfo.businessLeader"
+                clearable
+                filterable
+                remote
+                reserve-keyword
+                placeholder="企业负责人姓名或联系方式"
+                :remote-method="userRemoteMethod"
+              >
+                <el-option
+                  v-for="item in userList"
+                  :key="item.id"
+                  :label="item.phone+'('+(item.nickName?item.nickName+'-':'')+item.userCode+')'"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="公司对接类型" prop="companyDockType">
+              <el-select v-model="oilCompanyInfo.companyDockType" placeholder="请选择">
+                <el-option label="对接客户" :value="0" />
+                <el-option label="平台客户" :value="1" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-col :span="24" style="text-align: right">
+          <el-button @click="close">取消</el-button>
+          <el-button
+            :disabled="!twoNo"
+            type="primary"
+            @click="submit"
+          >提交</el-button>
+        </el-col>
+      </el-form>
+    </el-row>
+  </div>
+</template>
+<script>
+import oilCompanyInfoApi from '@/api/customerManagement/oilCompanyInfo'
+import sysCustomerInfoApi from '@/api/user/sysCustomerInfo'
+export default {
+  data() {
+    return {
+      queryCompanyList: [], // 企业列表
+      twoNo:true,
+      gridNum: {
+        row: {
+          gutter: 2
+        },
+        cols: {
+          xs: 24,
+          sm: 24,
+          md: 12,
+          lg: 12,
+          xl: 6
+        }
+      },
+      oilCompanyInfo: {
+        name: undefined,
+        abbreviaName: undefined,
+        parentMark: 0,
+        parentId: undefined,
+        companyNature: 0,
+        companyType:0,
+        createSource: 'WEBM',
+        enableMark: 1,
+        auditMark: 0
+      },
+      userList: [],
+      rules: {
+        name: [
+          { required: true, message: '请输入企业名称', trigger: 'blur' },
+          { min: 3, max: 50, message: '长度在 3 到 50 个字符', trigger: 'blur' }
+        ],
+        abbreviaName: [
+          { min: 1, max: 50, message: '长度在 1 到 50 个字符', trigger: 'blur' }
+        ],
+        parentMark: [
+          { required: true, message: '请选择是否主体公司', trigger: 'change' }
+        ],
+        companyNature: [
+          { required: true, message: '请选择企业性质', trigger: 'change' }
+        ],
+        companyType: [
+          { required: true, message: '请选择账户类型', trigger: 'change' }
+        ],
+        parentId: [
+          { required: true, message: '请选择上级公司', trigger: 'change' }
+        ]
+      }
+    }
+  },
+  created() {
+  },
+  methods: {
+    companyOrginQuery(value) { // 远程搜索
+      if (value) {
+        oilCompanyInfoApi.getLikeByName({ 'name': value }).then(res => {
+          this.queryCompanyList = res.data
+        })
+      }
+    },
+    userRemoteMethod(value) { // 远程搜索
+    if (value) {
+      sysCustomerInfoApi.liekQuery(value).then(res => {
+        this.userList = res.data
+      })
+    }
+    },
+    submit() {
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          this.save(this.oilCompanyInfo)
+          this.twoNo = false
+          setTimeout(()=>{
+            this.twoNo=true
+          },1000)
+        }
+      })
+    },
+
+    save() {
+      if (this.oilCompanyInfo.parentMark === 0) {
+        this.oilCompanyInfo.parentId = 0
+      }
+      // 保存
+      oilCompanyInfoApi.save(this.oilCompanyInfo).then(res => {
+        this.$message.success(res.msg)
+        this.$emit('closeDialog')
+        this.$emit('getByPage')
+      })
+    },
+    close() {
+      this.$emit('closeDialog')
+    }
+  }
+}
+</script>
diff --git a/src/views/customerManagement/companyManagement/index.vue b/src/views/customerManagement/companyManagement/index.vue
index 368ab55..7efd1f8 100644
--- a/src/views/customerManagement/companyManagement/index.vue
+++ b/src/views/customerManagement/companyManagement/index.vue
@@ -1,176 +1,242 @@
 <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>
+
+      <el-form :model="parameter.params" :inline="true">
+        <!-- 公司名称 -->
+        <autocomplete
+          class="mr20"
+          :params="parameter.params"
+          :config="configAutocomplete"
+        />
+        <el-form-item>
+          <el-autocomplete v-model="parameter.params.name" placeholder="总公司名称" :fetch-suggestions="querySearch"
+                           :trigger-on-focus="false" clearable filterable remote reserve-keyword @keyup.enter.native="getByPage" />
+        </el-form-item>
+        <el-form-item>
+          <el-select v-model="parameter.params.parentMark" placeholder="是否为主体公司" clearable
+                     @keyup.enter.native="getByPage">
+            <el-option label="主体公司" value="0" />
+            <el-option label="分公司" value="1" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-select v-model="parameter.params.companyNature" placeholder="企业性质" clearable
+                     @keyup.enter.native="getByPage">
+            <el-option label="零售客户" value="0" />
+            <el-option label="外请客户" value="1" />
+            <el-option label="渠道客户" value="2" />
+            <el-option label="存量客户" value="3" />
+            <el-option label="批发客户" value="4" />
+            <el-option label="LNG客户" value="5" />
+            <el-option label="推广业务" value="6" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-select v-model="parameter.params.enableMark" placeholder="启用标识" clearable @keyup.enter.native="getByPage">
+            <el-option label="禁用" value="0" />
+            <el-option label="启用" value="1" />
+          </el-select>
+        </el-form-item>
+
+        <el-form-item>
+          <el-select v-model="parameter.params.auditMark" placeholder="审核标识" clearable @keyup.enter.native="getByPage">
+            <el-option label="未提交" value="0" />
+            <el-option label="审核通过" value="1" />
+            <el-option label="提交待审核" value="2" />
+            <el-option label="审核不通过" value="-1" />
+          </el-select>
+        </el-form-item>
+
+        <el-form-item>
+          <el-select v-model="parameter.params.companyType" placeholder="账户类型" clearable @keyup.enter.native="getByPage">
+            <el-option label="柴油账户" value="0" />
+            <el-option label="LNG账户" value="2" />
+            <el-option label="汽油账户" value="1" />
+            <el-option label="尿素账户" value="3" />
+            <el-option label="油批账户" value="4" />
+          </el-select>
+        </el-form-item>
+
+
+        <el-form-item>
+          <el-select v-model="parameter.params.businessLeader" clearable filterable remote reserve-keyword
+                     placeholder="企业负责人姓名或联系方式" :remote-method="userRemoteMethod" @keyup.enter.native="getByPage">
+            <el-option v-for="item in userList" :key="item.id"
+                       :label="item.phone + '(' + (item.nickName ? item.nickName + '-' : '') + item.userCode + ')'" :value="item.id" />
+          </el-select>
+        </el-form-item>
+
+        <el-form-item>
+          <el-select v-model="parameter.params.companyDockType" placeholder="公司对接类型" clearable @keyup.enter.native="getByPage">
+            <el-option label="对接客户" :value="0" />
+            <el-option label="平台客户" :value="1" />
+          </el-select>
+        </el-form-item>
+      </el-form>
+
       <div class="buttons">
+
+        <el-button v-permission="['company:info:add']" class="group-item" type="primary" :size="$store.getters.size"
+                   @click="toAdd">
+          <svg-icon icon-class="iconxinzeng"/>
+          <span class="padding-left-xs">添加</span>
+        </el-button>
         <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 :max-height="tableHeight" stripe :data="dataPage.list" fit style="width: 100%;"
+                :size="$store.getters.size" @sort-change="sortHandler"
+                @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55"/>
 
-        <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
-              }}
+        <el-table-column label="序号" type="index" :index="indexMethod"/>
+
+        <el-table-column prop="name" label="企业名称" width="200">
+          <template slot-scope="{row}">
+            <div class="display: flex">
+              <el-tag v-if="row.parentMark === 0" effect="dark">总公司</el-tag>
+              <el-tag v-else effect="dark">分公司</el-tag>
+              <div>
+                <span>
+                  {{row.name}}<br/>
+                </span>
+                <span>
+                  NO:{{row.id}}
+                </span>
+              </div>
+            </div>
+          </template>
+        </el-table-column>
+        // TODO
+        <el-table-column label="加价策略">
+          <template slot-scope="{row}">
+            <p>{{row.oilsPriceStrategy === '1' ? '费率' : '增减'}}:{{row.oilsPriceScale}}</p>
+          </template>
+        </el-table-column>
+        <el-table-column prop="consumRebateStrategy" label="折返策略">
+          <template slot-scope="{row}">
+            <p v-if="row.consumRebateStrategy == 'TYFL' || row.consumRebateStrategy == 'SITE_lEVEL'">
+              <span>{{row.consumRebateStrategy == 'TYFL' ? '统一费率' : '油站等级'}}</span>
+              <span>{{row.consumRebateScale ? row.consumRebateScale : '0'}}</span>
+            </p>
+            <p v-if="row.consumRebateStrategy == 'TYSSFL'">
+              {{row.consumRebateStrategy == 'TYSSFL' ? '统一升数' : '未知'}}
+              <span>{{row.consumRebateScale ? row.consumRebateScale + '元/L' : '0'}}</span>
+            </p>
+            <p v-if="row.consumRebateStrategy != 'TYFL' && row.consumRebateStrategy != 'SITE_lEVEL' && row.consumRebateStrategy != 'TYSSFL'">
+              暂无
             </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>
+        <el-table-column label="企业性质">
+          <template slot-scope="{row}">
+            {{ row.companyNature === 0 ? '零售客户' : row.companyNature === 1 ? '外请客户' : row.companyNature === 2 ? '渠道客户' : row.companyNature === 3 ? '存量客户' : row.companyNature === 4 ? '批发客户' : row.companyNature === 5 ? 'LNG客户' : '推广业务'}}
           </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>
+        <el-table-column label="账户类型">
+          <template slot-scope="{row}">
+            {{ row.companyType === '0' ? '柴油账户' : row.companyType === '1' ? '汽油账户' : row.companyType === '2' ? 'LNG账户' : row.companyType === '3' ? '尿素账户' : '油批账户'}}
           </template>
         </el-table-column>
+        <el-table-column label="公司对接类型">
+          <template slot-scope="{row}">
+            {{ row.companyDockType === 0 ? '对接客户' :  row.companyDockType === 1 ? '平台客户' : '暂无'}}
+          </template>
+        </el-table-column>
+        <el-table-column label="启用状态">
+          <template slot-scope="{row}">
+            <el-switch v-model="row.enableMark" :active-value=1 :inactive-value=0  @change="enableMarkClike(row)"></el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="联动分油">
+          <template slot-scope="{row}">
+            <el-switch v-model="row.shareDistribute" active-color="#13ce66" inactive-color="row.parentMark == 0 ? '#999' : '#ff4949'" :active-value="1" :inactive-value="0" :disabled="row.parentMark == 0" @change="enableMarkOpem(row)"></el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column lable="审核标识">
+          <template slot-scope="{row}">
+            <el-tag v-if="row.auditMark === 0" type="info" effect="dark">未提交</el-tag>
+            <el-tag v-if="row.auditMark === 1" type="success" effect="dark">审核通过</el-tag>
+            <el-tag v-if="row.auditMark === 2" type="warning" >提交待审核</el-tag>
+            <el-tag v-if="row.auditMark > 2 && row.auditMark < 0" type="danger" >审核不通过</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="企业负责人">
+          <template slot-scope="{row}">
+            {{row.userName ? row.userName : '企业负责人'}} <br/>
+            {{row.phone ? row.phone : '暂无电话'}}
+          </template>
+        </el-table-column>
+        <el-table-column label="企业负责人">
+          <template slot-scope="{row}">
+            {{row.userName ? row.userName : '企业负责人'}} <br/>
+            {{row.phone ? row.phone : '暂无电话'}}
+          </template>
+        </el-table-column>
+        <el-table-column label="创建信息">
+          <template slot-scope="{row}">
+            {{row.createUserName ? row.createUserName : '创建人'}} <br/>
+            {{row.createTime ? row.createTime : '创建时间'}}
+          </template>
+        </el-table-column>
+        <el-table-column fixed="right" label="操作" width="180px" align="center">
+          <template slot-scope="scope">
+            <el-button :size="$store.getters.size" type="text" @click="handleDetail(scope.row.id)">
+              <svg-icon icon-class="iconxiangqing1"/>
+            </el-button>
+            <el-button @click="codeFn(scope.row)" :size="$store.getters.size" type="text" icon="el-icon-oilEwm">
+            </el-button>
+            <el-dropdown>
+              <el-button type="text">
+                更多
+                <i class="el-icon-arrow-down el-icon--right"/>
+              </el-button>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item @click.native="toUpdate(scope.row.id)">
+                  <el-button v-permission="['company:info:base']" :size="$store.getters.size" type="text">
+                    <svg-icon icon-class="iconicon-"/>
+                    基础资料
+                  </el-button>
+                </el-dropdown-item>
+                <el-dropdown-item v-if="scope.row.auditMark === 0" @click.native="toAddAuth(scope.row.id)">
+                  <el-button v-permission="['company:info:auth']" :size="$store.getters.size" type="text">
+                    <svg-icon icon-class="iconicon-"/>
+                    认证信息
+                  </el-button>
+                </el-dropdown-item>
+                <el-dropdown-item v-if="scope.row.auditMark !== 0" @click.native="toUpdateAuth(scope.row.id)">
+                  <el-button v-permission="['company:info:auth']" :size="$store.getters.size" type="text">
+                    <svg-icon icon-class="iconicon-"/>
+                    认证信息
+                  </el-button>
+                </el-dropdown-item>
+                <el-dropdown-item @click.native="toBankAuth(scope.row)">
+                  <el-button v-permission="['company:info:auth']" :size="$store.getters.size" type="text">
+                    <svg-icon icon-class="iconicon-"/>
+                    银行信息
+                  </el-button>
+                </el-dropdown-item>
+                <el-dropdown-item @click.native="toFinance(scope.row.id)">
+                  <el-button v-permission="['company:info:finance']" :size="$store.getters.size" type="text">
+                    <svg-icon icon-class="iconicon-"/>
+                    财务信息
+                  </el-button>
+                </el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
 
-        <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" />
+      <pagination :parameter="parameter" @searchAgain="getByPage"/>
     </div>
     <!-- 详情 -->
     <el-drawer
@@ -179,7 +245,7 @@
       size="60%"
       :withHeader="false"
       :visible="controlWindows.detail"
-    >
+   >
       <general-details
         title="详情"
         :isHeader="true"
@@ -187,7 +253,7 @@
         :sourceData="oilCompanyMatch"
         :mappingData="mappingData"
         @close="controlWindows.detail = false"
-      >
+     >
         <template #offlineTransactionProof>
           <el-image
             style="width: 100px; height: 100px"
@@ -196,375 +262,450 @@
         </template>
       </general-details>
     </el-drawer>
+
+    <!-- 添加弹窗 -->
+    <el-dialog v-el-drag-dialog title="添加" :visible.sync="addDialog" width="55%">
+      <OilCompanyInfoAdd v-if="addDialog" @getByPage="getByPage" @closeDialog="closeDialog"/>
+    </el-dialog>
+
+
+    <!-- 添加认证信息弹窗 -->
+    <el-drawer :visible.sync="addAuthDialog" size="70%">
+      <OilCompanyAuthAdd v-if="addAuthDialog" :oil-company-info="oilCompanyInfo" @getByPage="getByPage"
+                         @closeDialog="closeDialog"/>
+    </el-drawer>
   </div>
 </template>
 
 <script>
-import serve from "api/financialCenter/enterpriseRechargeDetails.js";
-import commonServe from "api/common.js";
+  import OilCompanyInfoAdd from "@/views/customerManagement/companyManagement/OilCompanyInfoAdd";
+  import serve from "api/financialCenter/enterpriseRechargeDetails.js";
+  import commonServe from "api/common.js";
+  import oilCompanyInfoApi from "@/api/customerManagement/oilCompanyInfo";
+  import autocomplete from "components/autocomplete/index.vue";
+  import pagination from "components/pagination/index.vue";
+  import generalDetails from "components/generalDetails/index.vue";
 
-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";
 
-import {
-  rechargeTypeEnum,
-  rechargeStatusEnum,
-  repaymentExamineEnum,
-} from "utils/dataType.js";
+  export default {
+    components: {
+      OilCompanyInfoAdd,
+      pagination,
+      autocomplete,
+      generalDetails,
+    },
+    data() {
+      return {
+        // 部门树选项
+        deptOptions: [],
+        deptDataList: {
+          companyIds: []
+        },
+        rowData: null,
+        showCode: false,
+        bankFinanceDialog: false,
+        syncDialog: false,
+        output: {
+          outputType: 4, // 导出方式，1导出选中，2导出本页，3条件导出，4导出全部
+          startPage: 1, // 导出开始页
+          endPage: 1, // 导出结束页
+          pageSize: 20 // 每页条数
+        },
+        queryCompanyList: [],
+        userList: [],
+        piliangDialog: false,
+        updateFinanceDialog: false, // 修改财务信息弹窗
+        BatchModifyingDialog: false, // 批量修改策略比例
+        oilCompanyAuth: {},
+        oilCompanyFinance: {},
+        addFinanceDialog: false, // 添加财务信息弹窗
+        updateAuthDialog: false, // 修改认证信息弹窗
+        addAuthDialog: false, // 添加认证信息弹窗
+        multipleSelection: [], // 选择表格数据集合
+        outPutDialog: false, // 导出弹窗
+        showTableDrawer: false,
+        page: {
+          pageSize: 20, // 每页显示条数
+          currentPage: 1, // 默认页
+          params: {}, // 查询参数
+          sorted: {
+            createTime: 'desc'
+          },
+          columns: []
+        },
+        tableHeight: document.documentElement.clientHeight - 300 - 60,
+        filters: this.$options.filters,
+        dataPage: { // 分页显示page
+          pageSize: 20, // 每页显示条数
+          currentPage: 1, // 默认页
+          params: { // 查询参数
+          },
+          sorted: {},
+          list: []
+        },
+        tableColumns: [
+        ],
+        // 查询参数
+        queryParams: {},
+        addDialog: false, // 添加弹窗
+        updateDialog: false, // 修改弹窗
+        oilCompanyInfo: {},
+        oilCompanyInfoId: {
+          id: '',
+          list: []
+        },
+        restaurants: [], // 企业名称搜索列表
+        valColumn: ['name', 'abbreviaName', 'companyNature', 'parentMark', 'enableMark', 'auditMark', 'userName', 'createUserName', 'createTime', 'auditUserName', 'auditTime',
+          'updateUserName', 'updateTime'],
+        headers: ['企业名称', '企业简称', '企业性质', '公司性质', '启用状态', '审核标识', '企业负责人', '创建人', '创建时间', '审核人', '审核时间',
+          '修改人', '修改时间'],
 
-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" },
-          ],
+        rechargeTypeEnum: rechargeTypeEnum,
+        rechargeStatusEnum: rechargeStatusEnum,
+        repaymentExamineEnum: repaymentExamineEnum,
+        controlWindows: {
+          detail: false,
         },
-        {
-          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" },
-          ],
+        datetime: [],
+        tableData: [],
+        configAutocomplete: {
+          serveTarget: commonServe.getRefineryCompanyList,
+          autocompleteKey: "name",
+          labelKey: "name",
+          valueKey: "id",
+          placeholder: "企业名称",
+          querykey: "companyId",
         },
-      ],
-    };
-  },
-  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;
+        configAutocompleteSec: {
+          serveTarget: commonServe.liekQuery,
+          autocompleteKey: "",
+          labelKey: "nickName",
+          valueKey: "id",
+          placeholder: "业务负责人",
+          querykey: "businessLeader",
+        },
+        parameter: {
+          currentPage: 1,
+          pageSize: 10,
+          total: 0,
+          params: {},
+        },
+        LoopBackTypeEnum: [
+          {
+            label: "充值圈回",
+            value: 1,
+          },
+          {
+            label: "赊销圈回",
+            value: 2,
+          },
+          {
+            label: "充值返利圈回",
+            value: 3,
+          },
+          {
+            label: "消费返利圈回",
+            value: 4,
+          },
+        ],
+        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();
     },
-    //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;
+    updated() {
+      this.$nextTick(() => {
+        this.$refs.multipleTable && this.$refs.multipleTable.doLayout();
       });
     },
-    //新增
-    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;
+    mounted() {
+      this.$nextTick(() => {
+        this.heightHandle();
       });
+      window.addEventListener(
+        "resize",
+        this.$utils.debounce(this.heightHandle, 500)
+      );
     },
-    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;
+    methods: {
+      search() {
+        this.parameter.currentPage = 1;
+        console.log("111111111111111111111");
+        console.log(this.parameter)
+        this.getByPage();
+      },
+      closeDialog() {
+        this.addDialog = false
+        this.updateDialog = false
+        this.addAuthDialog = false
+        this.updateAuthDialog = false
+        this.addFinanceDialog = false
+        this.updateFinanceDialog = false
+        this.piliangDialog = false
+        this.BatchModifyingDialog = false
+        this.showTableDrawer = false
+        this.bankFinanceDialog = false
+        this.syncDialog = false
+      },
+      enableMarkOpem(row) { // 启用禁用点击
+        const data = {
+          id: row.id,
+          shareDistribute: row.shareDistribute
         }
-        switch (item.property) {
-          case "transactionAmount":
-            sums[index] = transactionAmount + "元";
-            break;
-          case "rechargeRebateAmount":
-            sums[index] = rechargeRebateAmount + "元";
-            break;
+        oilCompanyInfoApi.openShareDistribute(data).then(res => {
+          if (res.code === 20000) {
+            this.$message.success(res.msg)
+          }
+          this.getByPage()
+        })
+      },
+      getByPage() {
+        oilCompanyInfoApi.getByPage(this.parameter).then((res) => {
+          this.dataPage.list = res.data.list;
+          this.parameter.total = res.data.totalCount;
+        });
+        console.log(this.tableData)
+      },
+      //新增
+      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};
 
-          default:
-            break;
+          console.log("this.oilCompanyMatch", this.oilCompanyMatch);
+          this.controlWindows.detail = true;
+        });
+      },
+      // 启用禁用点击
+      enableMarkClike(row) {
+        console.log("111111111111111111111");
+        const data = [row]
+        oilCompanyInfoApi.updateBatchEnable(data).then(res => {
+          if (res.code === 20000) {
+            this.$message.success(res.msg)
+          }
+          this.getByPage()
+        })
+      },
+      //重置
+      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];
         }
-      });
-      return sums;
+        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;
+      },
+      handleSizeChange(val) {
+        this.page.pageSize = val
+        this.getByPage()
+      },
+      handleCurrentChange(val) {
+        this.page.currentPage = val
+        this.getByPage()
+      },
+      indexMethod(index) {
+        return (index + 1) * 1
+      },
+      sortHandler(column) {
+        // 排序查询
+        console.log(column.column.sortable)
+        const key = column.column.sortable
+        const value = column.order
+        this.page.sorted = {}
+        this.page.sorted[key] = value
+        this.getByPage()
+      },
+      toAdd() {
+        // 跳转到添加
+        this.oilCompanyInfo = {}
+        this.addDialog = true
+      },
+      toAddAuth(id) {
+        // 跳转添加认证信息
+        oilCompanyInfoApi.get(id).then(res => {
+          this.oilCompanyInfo = res.data
+          this.addAuthDialog = true
+        })
+      },
+      handleSelectionChange(val) { // 选择表格数据
+        this.multipleSelection = val
+      },
+      obtainElement(className) {
+        return document.documentElement.querySelector(className);
+      },
     },
-    //重置
-    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;
-    }
-  }
+  .enterprise-recharge-details {
+    .frame {
+      margin: 20px;
+      padding: 20px;
+      border-radius: 6px;
+      border: 1px solid #e3e3e5;
+      background: #fff;
 
-  .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-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;
       }
     }
-    .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;
+    .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;
       }
     }
-    .el-icon-arrow-down {
-      font-size: 12px;
-    }
   }
-}
 </style>
diff --git a/vue.config.js b/vue.config.js
index 15c7aa3..990d1a4 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -29,7 +29,7 @@ module.exports = {
       [process.env.VUE_APP_BASE_API]: {
         // target: `https://3816t6291y.oicp.vip`,
         // target: 'https://6l438d1757.zicp.fun',
-        target: "http://192.168.110.230:38080",
+        target: "http://192.168.110.10:38080",
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",

From 0f4299fce33df671fcf65f34c460976222b37fe7 Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Tue, 21 Feb 2023 16:10:40 +0800
Subject: [PATCH 07/18] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/financialCenter/enterpriseRecharge.js |  20 +-
 src/components/autocomplete/index.vue         |   4 +
 .../accountManagement/index.vue               | 611 ++++++++++--------
 .../enterpriseRecharge/components/add.vue     | 142 +++-
 .../enterpriseRecharge/components/addTurn.vue | 257 ++++++++
 .../enterpriseRecharge/index.vue              |  41 +-
 6 files changed, 768 insertions(+), 307 deletions(-)
 create mode 100644 src/views/financialCenter/enterpriseRecharge/components/addTurn.vue

diff --git a/src/api/financialCenter/enterpriseRecharge.js b/src/api/financialCenter/enterpriseRecharge.js
index f31b7d2..6b0b0af 100644
--- a/src/api/financialCenter/enterpriseRecharge.js
+++ b/src/api/financialCenter/enterpriseRecharge.js
@@ -10,10 +10,14 @@ const getByPage = (params) => {
 const get = (query) => {
   return request.get(`/oil-finance/oilCompanyAccountReverse/get/${query}`);
 };
-//详情
+//公司详情
 const getByCompanyId = (query) => {
   return request.get(`/oil-finance/oilCompanyAccount/getByCompanyId/${query}`);
 };
+//公司财务详情
+const getByCompanyIdSec = (query) => {
+  return request.get(`/oil-user/oilCompanyFinance/getByCompanyId/${query}`);
+};
 // 新增
 const save = (params) => {
   return request.postJson("/oil-finance/oilCompanyAccountReverse/save", params);
@@ -25,6 +29,17 @@ const update = (params) => {
     params
   );
 };
+//  企业收款账户
+const getCascaderList = () => {
+  return request.get("/oil-finance/internalCompany/getCascaderList");
+};
+//公司 远程搜索
+const getLikeByNameSuccess = (params) => {
+  return request.postJson(
+    "/oil-user/oilCompanyInfo/getLikeByNameSuccess",
+    params
+  );
+};
 
 export default {
   getByPage,
@@ -32,4 +47,7 @@ export default {
   getByCompanyId,
   save,
   update,
+  getByCompanyIdSec,
+  getCascaderList,
+  getLikeByNameSuccess,
 };
diff --git a/src/components/autocomplete/index.vue b/src/components/autocomplete/index.vue
index ec58e59..ef332a1 100644
--- a/src/components/autocomplete/index.vue
+++ b/src/components/autocomplete/index.vue
@@ -9,6 +9,7 @@
     :remote-method="remoteMethod"
     @clear="list = []"
     :disabled="isDisabled"
+    @change="change"
   >
     <el-option
       v-for="(item, index) in list"
@@ -74,6 +75,9 @@ export default {
         this.list = [];
       }
     },
+    change(val) {
+      this.$emit("change", val);
+    },
   },
 };
 </script>
diff --git a/src/views/financialCenter/accountManagement/index.vue b/src/views/financialCenter/accountManagement/index.vue
index 15c9cb5..1c220ab 100644
--- a/src/views/financialCenter/accountManagement/index.vue
+++ b/src/views/financialCenter/accountManagement/index.vue
@@ -2,11 +2,23 @@
   <div class="bill-details">
     <div class="frame">
       <!-- 公司名称 -->
-      <autocomplete class="mr20" :params="parameter.params" :config="configAutocomplete"/>
+      <autocomplete
+        class="mr20"
+        :params="parameter.params"
+        :config="configAutocomplete"
+      />
       <!-- 总公司名称 -->
-      <autocomplete class="mr20" :params="parameter.params" :config="configAutocompleteSec"/>
+      <autocomplete
+        class="mr20"
+        :params="parameter.params"
+        :config="configAutocompleteSec"
+      />
 
-      <el-select v-model="parameter.params.accountState" placeholder="账户状态" clearable>
+      <el-select
+        v-model="parameter.params.accountState"
+        placeholder="账户状态"
+        clearable
+      >
         <el-option
           v-for="(item, index) in accountStateEnum"
           :key="index"
@@ -15,7 +27,11 @@
         />
       </el-select>
 
-      <el-select v-model="parameter.params.companyNature" placeholder="企业性质" clearable>
+      <el-select
+        v-model="parameter.params.companyNature"
+        placeholder="企业性质"
+        clearable
+      >
         <el-option
           v-for="(item, index) in companyNatureEnum"
           :key="index"
@@ -24,7 +40,10 @@
         />
       </el-select>
       <!-- 业务负责人 -->
-      <autocomplete :params="parameter.params" :config="configAutocompleteBusinessLeader"/>
+      <autocomplete
+        :params="parameter.params"
+        :config="configAutocompleteBusinessLeader"
+      />
 
       <div class="buttons">
         <el-button icon="el-icon-search" @click="search">查询</el-button>
@@ -45,51 +64,75 @@
         style="width: 100%"
       >
         >
-        <el-table-column type="selection" width="55"/>
+        <el-table-column type="selection" width="55" />
         <el-table-column prop="companyName" label="公司名称" minWidth="300">
           <template slot-scope="{ row }">
-            <span style='padding-left:8px;'>{{row.companyName}}</span>
-            <br/>
-            <span style='padding-left:8px;'>业务负责人:{{row.businessLeader}}</span>
+            <span style="padding-left: 8px">{{ row.companyName }}</span>
+            <br />
+            <span style="padding-left: 8px"
+              >业务负责人:{{ row.businessLeader }}</span
+            >
           </template>
         </el-table-column>
         <el-table-column label="企业性质" minWidth="120">
           <template slot-scope="{ row }">
-            {{companyNatureEnum.find((item) => item.value === row.companyNature).label}}
+            {{
+              companyNatureEnum.find((item) => item.value === row.companyNature)
+                .label
+            }}
           </template>
         </el-table-column>
-        <el-table-column prop="totalBalance" label="公司企业总余额" minWidth="120"/>
+        <el-table-column
+          prop="totalBalance"
+          label="公司企业总余额"
+          minWidth="120"
+        />
         <el-table-column label="司机油卡余额" minWidth="130">
           <template slot-scope="{ row }">
-            <span>外:{{row.outCountBalance}}</span>
-            <br/>
-            <span>自:{{row.inCountBalance}}</span>
+            <span>外:{{ row.outCountBalance }}</span>
+            <br />
+            <span>自:{{ row.inCountBalance }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="balance" label="账户总余额" minWidth="120"/>
-        <el-table-column prop="rechargeBalance" label="充值余额" minWidth="120"/>
-        <el-table-column prop="chargeRechargeBalance" label="赊销充值余额" minWidth="120"/>
-        <el-table-column prop="rechargeRebateBalance" label="充值返利余额" minWidth="120"/>
-        <el-table-column prop="consumeRebateBalance" label="消费返利余额" minWidth="120"/>
-        <el-table-column prop="totalChargeAmount" label="赊销待还" minWidth="120"/>
-        <el-table-column prop="createTime" label="创建时间" minWidth="200"/>
+        <el-table-column prop="balance" label="账户总余额" minWidth="120" />
+        <el-table-column
+          prop="rechargeBalance"
+          label="充值余额"
+          minWidth="120"
+        />
+        <el-table-column
+          prop="chargeRechargeBalance"
+          label="赊销充值余额"
+          minWidth="120"
+        />
+        <el-table-column
+          prop="rechargeRebateBalance"
+          label="充值返利余额"
+          minWidth="120"
+        />
+        <el-table-column
+          prop="consumeRebateBalance"
+          label="消费返利余额"
+          minWidth="120"
+        />
+        <el-table-column
+          prop="totalChargeAmount"
+          label="赊销待还"
+          minWidth="120"
+        />
+        <el-table-column prop="createTime" label="创建时间" minWidth="200" />
 
         <el-table-column fixed="right" label="操作" width="150px">
           <template slot-scope="{ row }">
             <span class="el-dropdown-link" @click="detail(row)">详情</span>
             <el-dropdown>
               <el-button type="text">
-                更多<i class="el-icon-arrow-down el-icon--right"/>
+                更多<i class="el-icon-arrow-down el-icon--right" />
               </el-button>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item
-                  @click.native="toRecharge(row.id)"
-                >
-                  <el-button
-                    :size="$store.getters.size"
-                    type="text"
-                  >
-                    <svg-icon icon-class="iconicon-"/>
+                <el-dropdown-item @click.native="toRecharge(row.id)">
+                  <el-button :size="$store.getters.size" type="text">
+                    <svg-icon icon-class="iconicon-" />
                     充值
                   </el-button>
                 </el-dropdown-item>
@@ -99,282 +142,280 @@
         </el-table-column>
       </el-table>
       <!-- 分页 -->
-      <pagination :parameter="parameter" @searchAgain="getByPage"/>
+      <pagination :parameter="parameter" @searchAgain="getByPage" />
     </div>
 
     <!-- 添加充值 -->
     <recharge :controlWindows="controlWindows" @closeWindow="closeDialog" />
-
   </div>
 </template>
 
 <script>
-  import serve from 'api/financialCenter/accountManagement.js'
-  import commonServe from 'api/common.js'
+import serve from "api/financialCenter/accountManagement.js";
+import commonServe from "api/common.js";
 
-  import recharge from "./components/recharge.vue";
-  import autocomplete from 'components/autocomplete/index.vue'
-  import pagination from 'components/pagination/index.vue'
-  import generalDetails from 'components/generalDetails/index.vue'
+import recharge from "./components/recharge.vue";
+import autocomplete from "components/autocomplete/index.vue";
+import pagination from "components/pagination/index.vue";
+import generalDetails from "components/generalDetails/index.vue";
 
-  export default {
-    components: {
-      recharge,
-      pagination,
-      autocomplete,
-      generalDetails
+export default {
+  components: {
+    recharge,
+    pagination,
+    autocomplete,
+    generalDetails,
+  },
+  data() {
+    return {
+      oilCompanyAccount: {},
+      controlWindows: {
+        detail: false,
+        recharge: false, // 充值弹窗
+      },
+      tableDataSec: [],
+      tableHeight: 0,
+      tableData: [],
+      multipleSelection: [], // 选择表格数据集合
+      configAutocomplete: {
+        serveTarget: commonServe.getRefineryCompanyList,
+        autocompleteKey: "name",
+        labelKey: "name",
+        valueKey: "id",
+        placeholder: "企业名称",
+        querykey: "companyId",
+      },
+      configAutocompleteSec: {
+        serveTarget: commonServe.getRefineryCompanyList,
+        autocompleteKey: "name",
+        labelKey: "name",
+        valueKey: "id",
+        placeholder: "总公司名称",
+        querykey: "name",
+      },
+      configAutocompleteBusinessLeader: {
+        serveTarget: commonServe.liekQuery,
+        autocompleteKey: "",
+        labelKey: "nickName",
+        valueKey: "id",
+        placeholder: "业务负责人",
+        querykey: "businessLeader",
+      },
+      parameter: {
+        currentPage: 1,
+        pageSize: 10,
+        total: 0,
+        params: {},
+      },
+      accountStateEnum: [
+        {
+          label: "禁用",
+          value: 0,
+        },
+        {
+          label: "启用",
+          value: 1,
+        },
+        {
+          label: "冻结",
+          value: -1,
+        },
+      ],
+      companyNatureEnum: [
+        {
+          label: "零售客户",
+          value: 0,
+        },
+        {
+          label: "外请客户",
+          value: 1,
+        },
+        {
+          label: "渠道客户",
+          value: 2,
+        },
+        {
+          label: "存量客户",
+          value: 3,
+        },
+        {
+          label: "批发客户",
+          value: 4,
+        },
+        {
+          label: "LNG客户",
+          value: 5,
+        },
+        {
+          label: "推广业务",
+          value: 6,
+        },
+      ],
+    };
+  },
+  created() {
+    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();
     },
-    data() {
-      return {
-        oilCompanyAccount: {},
-        controlWindows: {
-          detail: false,
-          recharge:false // 充值弹窗
-        },
-        tableDataSec: [],
-        tableHeight: 0,
-        tableData: [],
-        multipleSelection: [],// 选择表格数据集合
-        configAutocomplete: {
-          serveTarget: commonServe.getRefineryCompanyList,
-          autocompleteKey: 'name',
-          labelKey: 'name',
-          valueKey: 'id',
-          placeholder: '企业名称',
-          querykey: 'companyId'
-        },
-        configAutocompleteSec: {
-          serveTarget: commonServe.getRefineryCompanyList,
-          autocompleteKey: 'name',
-          labelKey: 'name',
-          valueKey: 'id',
-          placeholder: '总公司名称',
-          querykey: 'name'
-        },
-        configAutocompleteBusinessLeader: {
-          serveTarget: commonServe.liekQuery,
-          autocompleteKey: '',
-          labelKey: 'nickName',
-          valueKey: 'id',
-          placeholder: '业务负责人',
-          querykey: 'businessLeader'
-        },
-        parameter: {
-          currentPage: 1,
-          pageSize: 10,
-          total: 0,
-          params: {}
-        },
-        accountStateEnum: [
-          {
-            label: '禁用',
-            value: 0
-          },
-          {
-            label: '启用',
-            value: 1
-          },
-          {
-            label: '冻结',
-            value: -1
-          }
-        ],
-        companyNatureEnum: [
-          {
-            label: '零售客户',
-            value: 0
-          },
-          {
-            label: '外请客户',
-            value: 1
-          },
-          {
-            label: '渠道客户',
-            value: 2
-          },
-          {
-            label: '存量客户',
-            value: 3
-          },
-          {
-            label: '批发客户',
-            value: 4
-          },
-          {
-            label: 'LNG客户',
-            value: 5
-          }
-          ,
-          {
-            label: '推广业务',
-            value: 6
-          }
-        ]
+    //table list
+    getByPage() {
+      serve.getByPage(this.parameter).then((res) => {
+        this.tableData = res.data.list;
+        this.parameter.total = res.data.totalCount;
+      });
+    },
+
+    //修改账户状态
+    accountTypeHandler(type) {
+      //0:禁用 1:启用 -1:冻结
+      if (!this.multipleSelection || this.multipleSelection.length < 1) {
+        this.$message.error("请选择需要操作的数据");
+        return;
       }
-    },
-    created() {
-      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() {
-        serve.getByPage(this.parameter).then((res) => {
-          this.tableData = res.data.list
-          this.parameter.total = res.data.totalCount
-        })
-      },
-
-      //修改账户状态
-      accountTypeHandler(type) {
-        //0:禁用 1:启用 -1:冻结
-        if (!this.multipleSelection || this.multipleSelection.length < 1) {
-          this.$message.error('请选择需要操作的数据')
-          return
+      this.multipleSelection.forEach((item) => {
+        item.accountState = type;
+      });
+      serve.updateAccountState(this.multipleSelection).then((res) => {
+        if (res.code === 20000) {
+          this.$message.success(res.msg);
         }
-        this.multipleSelection.forEach(item => {
-          item.accountState = type
-        })
-        serve.updateAccountState(this.multipleSelection).then(res => {
-          if (res.code === 20000) {
-            this.$message.success(res.msg)
-          }
-          this.getByPage()
-        })
-      },
-      detail(row) {
-        //TODO
-      },
-      toRecharge(id) {
-        // 跳转到充值
-        serve.get(id).then(res => {
-          this.oilCompanyAccount = res.data
-          this.controlWindows.recharge = true
-        })
-      },
-      //重置
-      reset() {
-        this.parameter = {
-          currentPage: 1,
-          pageSize: 10,
-          total: 0,
-          params: {}
-        }
-      },
-      closeDialog() {
-        this.controlWindows.recharge = false
-      },
-      // 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)
-      }
-    }
-  }
+        this.getByPage();
+      });
+    },
+    detail(row) {
+      //TODO
+    },
+    toRecharge(id) {
+      // 跳转到充值
+      serve.get(id).then((res) => {
+        this.oilCompanyAccount = res.data;
+        this.controlWindows.recharge = true;
+      });
+    },
+    //重置
+    reset() {
+      this.parameter = {
+        currentPage: 1,
+        pageSize: 10,
+        total: 0,
+        params: {},
+      };
+    },
+    closeDialog() {
+      this.controlWindows.recharge = false;
+    },
+    // 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>
-  .bill-details {
-    .frame {
-      margin: 20px;
-      padding: 20px;
-      border-radius: 6px;
-      border: 1px solid #e3e3e5;
-      background: #fff;
+.bill-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;
-      }
+    .el-input,
+    .el-select {
+      width: 183px;
+      height: 40px;
     }
 
-    .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;
-      }
+    .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;
     }
 
-    .ft14 {
-      font-size: 14px;
+    .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;
+    }
+  }
+
+  .ft14 {
+    font-size: 14px;
+  }
+}
 </style>
diff --git a/src/views/financialCenter/enterpriseRecharge/components/add.vue b/src/views/financialCenter/enterpriseRecharge/components/add.vue
index f0940b4..9df9e48 100644
--- a/src/views/financialCenter/enterpriseRecharge/components/add.vue
+++ b/src/views/financialCenter/enterpriseRecharge/components/add.vue
@@ -8,9 +8,13 @@
     :before-close="closeWindow"
   >
     <div class="add">
-      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="140px">
         <el-form-item label="公司" prop="companyId">
-          <autocomplete :params="form" :config="configAutocomplete" />
+          <autocomplete
+            :params="form"
+            :config="configAutocomplete"
+            @change="companyChange"
+          />
         </el-form-item>
         <el-form-item label="交易类型" prop="transactionType">
           <el-select
@@ -19,10 +23,29 @@
             placeholder="请选择交易类型"
             @change="changeTransactionType"
           >
-            <el-option label="赊销" value="CHARGE_SALES" />
-            <el-option label="消费返利" value="CONSUME_REBATE" />
+            <el-option label="充值" value="RECHARGE" />
+            <!-- <el-option label="赊销" value="CHARGE_SALES" />
+            <el-option label="消费返利" value="CONSUME_REBATE" /> -->
           </el-select>
         </el-form-item>
+
+        <template
+          v-if="
+            companyFinance.settlementModes === 1 ||
+            companyFinance.settlementModes === 3
+          "
+        >
+          <el-form-item label="充值返利比例">
+            <el-input
+              disabled
+              v-model="companyFinance.rechargeRebate"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="预计充值返利金额">
+            <el-input disabled v-model="rechargeRebateAmount"></el-input>
+          </el-form-item>
+        </template>
+
         <el-form-item label="交易金额" prop="transactionAmount">
           <el-input
             v-checkNum
@@ -31,8 +54,53 @@
           ></el-input>
         </el-form-item>
 
+        <template v-if="form.transactionType === 'RECHARGE'">
+          <el-form-item label="企业收款账户" prop="companyBankCardArr">
+            <el-cascader
+              :options="cascaderList"
+              v-model="form.companyBankCardArr"
+              filterable
+              clearable
+            ></el-cascader>
+          </el-form-item>
+
+          <el-form-item label="线下汇款公司账户" prop="offlinePaymentCompany">
+            <el-input
+              v-model="form.offlinePaymentCompany"
+              placeholder="请输入线下汇款公司账户"
+            ></el-input>
+          </el-form-item>
+
+          <el-form-item label="线下交易发起时间" prop="offlineStartTime">
+            <el-date-picker
+              v-model="form.offlineStartTime"
+              type="datetime"
+              format="yyyy-MM-dd HH:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              default-time="00:00:00"
+              placeholder="选择日期时间"
+            >
+            </el-date-picker>
+          </el-form-item>
+
+          <el-form-item label="线下交易完成时间" prop="offlineCompleteTime">
+            <el-date-picker
+              v-model="form.offlineCompleteTime"
+              type="datetime"
+              format="yyyy-MM-dd HH:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              default-time="23:59:59"
+              placeholder="选择日期时间"
+            >
+            </el-date-picker>
+          </el-form-item>
+        </template>
+
         <el-form-item
-          v-if="form.transactionType === 'CONSUME_REBATE'"
+          v-if="
+            form.transactionType === 'CONSUME_REBATE' ||
+            form.transactionType === 'RECHARGE'
+          "
           label="线下交易凭证"
           prop="offlineTransactionProof"
         >
@@ -106,10 +174,12 @@ export default {
         JSESSIONID: JSESSIONID,
         token: utils.bcrypt(JSESSIONID),
       },
+      cascaderList: [],
+      companyFinance: {},
       form: {},
       refineryList: [],
       configAutocomplete: {
-        serveTarget: commonServe.getRefineryCompanyList,
+        serveTarget: serve.getLikeByNameSuccess,
         autocompleteKey: "name",
         labelKey: "name",
         valueKey: "id",
@@ -135,12 +205,56 @@ export default {
             trigger: "change",
           },
         ],
+        offlinePaymentCompany: [
+          {
+            required: true,
+            message: "请输入线下汇款公司账户",
+            trigger: "blur",
+          },
+        ],
+        offlineStartTime: [
+          {
+            required: true,
+            message: "请选择线下交易发起时间",
+            trigger: "change",
+          },
+        ],
+        offlineCompleteTime: [
+          {
+            required: true,
+            message: "请选择线下交易完成时间",
+            trigger: "change",
+          },
+        ],
+        offlineCompleteTime: [
+          {
+            required: true,
+            message: "请选择企业收款账户",
+            trigger: "change",
+          },
+        ],
         reverseRemark: [
           { required: true, message: "请输入交易说明", trigger: "blur" },
         ],
       },
     };
   },
+  computed: {
+    rechargeRebateAmount() {
+      if (
+        this.companyFinance.settlementModes === 1 ||
+        this.companyFinance.settlementModes === 3
+      ) {
+        return (
+          (this.form.transactionAmount || 0) *
+          this.companyFinance.rechargeRebate
+        );
+      } else return this.companyFinance.rechargeRebateAmount;
+    },
+  },
+  created() {
+    this.getCascaderList();
+  },
   methods: {
     openDrawer() {
       let { id } = this.controlWindows.addInfo;
@@ -156,6 +270,14 @@ export default {
           };
       Object.assign(this.configAutocomplete, configUpdata);
     },
+    // 公司change
+    companyChange(id) {
+      if (id) {
+        serve.getByCompanyIdSec(id).then((res) => {
+          this.companyFinance = res.data;
+        });
+      }
+    },
     // 交易类型 change
     changeTransactionType(val) {
       if (val === "CHARGE_SALES") {
@@ -177,9 +299,16 @@ export default {
         this.form.offlineTransactionProof = response.data.publicUrl;
       }
     },
+    //企业收款账户
+    getCascaderList() {
+      serve.getCascaderList().then((res) => {
+        this.cascaderList = res.data;
+      });
+    },
     submit() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
+          let params = { transactionType: "RECHARGE", ...this.form };
           this.judgeInterface(this.form).then((res) => {
             this.$message.success(res.msg);
             this.closeWindow();
@@ -210,6 +339,7 @@ export default {
   padding: 20px;
   .el-input,
   .el-select,
+  .el-cascader,
   .el-textarea,
   .el-autocomplete {
     width: 300px;
diff --git a/src/views/financialCenter/enterpriseRecharge/components/addTurn.vue b/src/views/financialCenter/enterpriseRecharge/components/addTurn.vue
new file mode 100644
index 0000000..0aa7c45
--- /dev/null
+++ b/src/views/financialCenter/enterpriseRecharge/components/addTurn.vue
@@ -0,0 +1,257 @@
+<template>
+  <el-drawer
+    :title="controlWindows.addInfo.title"
+    direction="ltr"
+    size="50%"
+    :visible="controlWindows.addTurn"
+    @opened="openDrawer"
+    :before-close="closeWindow"
+  >
+    <div class="add">
+      <el-form ref="form" :model="form" :rules="rules" label-width="140px">
+        <el-form-item label="公司" prop="companyId">
+          <autocomplete
+            :params="form"
+            :config="configAutocomplete"
+            @change="companyChange"
+          />
+        </el-form-item>
+        <el-form-item label="交易类型" prop="turnType">
+          <el-select
+            :disabled="!!form.id"
+            v-model="form.turnType"
+            placeholder="请选择交易类型"
+          >
+            <el-option
+              v-for="(item, index) in correspondTypeEnum"
+              :key="index"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+
+        <el-form-item v-if="form.turnType && form.companyId">
+          <el-descriptions title="公司账户信息" :column="1" border>
+            <el-descriptions-item>
+              <template slot="label">
+                <i class="el-icon-office-building"></i>
+                公司名称
+              </template>
+              {{ companyInfo.companyName }}</el-descriptions-item
+            >
+            <el-descriptions-item>
+              <template slot="label">
+                <i class="el-icon-bank-card"></i>
+                {{
+                  correspondTypeEnum.find(
+                    (item) => item.value === form.turnType
+                  ).label
+                }}
+              </template>
+              {{
+                companyInfo[
+                  correspondTypeEnum.find(
+                    (item) => item.value === form.turnType
+                  ).valueKey
+                ]
+              }}
+            </el-descriptions-item>
+            <!-- <el-descriptions-item label="赊销余额"></el-descriptions-item>
+            <el-descriptions-item label="充值返利余额"></el-descriptions-item>
+            <el-descriptions-item label="消费返利余额"></el-descriptions-item> -->
+          </el-descriptions>
+        </el-form-item>
+
+        <el-form-item label="圈回金额" prop="transactionAmount">
+          <el-input
+            v-checkNum
+            placeholder="圈回金额"
+            v-model="form.transactionAmount"
+          >
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="圈回原因" prop="reverseRemark">
+          <el-input
+            type="textarea"
+            :rows="2"
+            placeholder="请输入圈回原因"
+            v-model="form.reverseRemark"
+          >
+          </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/enterpriseRecharge.js";
+
+import autocomplete from "components/autocomplete/index.vue";
+
+export default {
+  components: {
+    autocomplete,
+  },
+  props: {
+    controlWindows: Object,
+  },
+  data() {
+    let validatorcompanyId = (rule, value, callback) => {
+      if (this.form.companyId) callback();
+      else callback("请选择公司");
+    };
+
+    return {
+      companyFinance: {},
+      companyInfo: {},
+      form: {},
+      configAutocomplete: {
+        serveTarget: serve.getLikeByNameSuccess,
+        autocompleteKey: "name",
+        labelKey: "name",
+        valueKey: "id",
+        placeholder: "企业名称",
+        querykey: "companyId",
+        echoId: "",
+        echoName: "",
+      },
+      rules: {
+        companyId: [
+          { required: true, validator: validatorcompanyId, trigger: "change" },
+        ],
+        turnType: [
+          { required: true, message: "请选择交易类型", trigger: "change" },
+        ],
+        transactionAmount: [
+          { required: true, message: "请输入圈回金额", trigger: "blur" },
+        ],
+        reverseRemark: [
+          { required: true, message: "请输入圈回说明", trigger: "blur" },
+        ],
+      },
+      correspondTypeEnum: [
+        {
+          value: 1,
+          label: "充值余额",
+          valueKey: "rechargeBalance",
+        },
+        {
+          value: 2,
+          label: "赊销余额",
+          valueKey: "chargeRechargeBalance",
+        },
+        {
+          value: 3,
+          label: "充值返利余额",
+          valueKey: "rechargeRebateBalance",
+        },
+        {
+          value: 4,
+          label: "消费返利余额",
+          valueKey: "consumeRebateBalance",
+        },
+      ],
+    };
+  },
+  computed: {
+    correspondingEnum() {},
+  },
+  methods: {
+    openDrawer() {
+      let { id } = this.controlWindows.addInfo;
+      //回显
+      if (id) {
+        this.form = JSON.parse(JSON.stringify(this.controlWindows.addInfo));
+        this.form.transactionAmount = Math.abs(this.form.transactionAmount);
+        this.companyChange(this.form.companyId);
+      }
+      let configUpdata = id
+        ? { echoId: id, echoName: this.form.refineryName, isDisabled: true }
+        : {
+            echoId: "",
+            echoName: "",
+            isDisabled: false,
+          };
+      Object.assign(this.configAutocomplete, configUpdata);
+    },
+    // 公司财务信息
+    companyChange(id) {
+      if (id) {
+        serve.getByCompanyIdSec(id).then((res) => {
+          this.companyFinance = res.data;
+          this.getByCompanyId(res.data.companyId);
+        });
+      }
+    },
+    //
+    getByCompanyId(id) {
+      serve.getByCompanyId(id).then((res) => {
+        this.companyInfo = res.data;
+      });
+    },
+
+    submit() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          let params = { transactionType: "TURN", ...this.form };
+          this.judgeInterface(params).then((res) => {
+            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);
+    },
+    closeWindow() {
+      this.$emit("closeWindow");
+      this.form = {};
+      this.controlWindows.addInfo = {};
+      this.$nextTick(() => {
+        this.$refs.form.clearValidate();
+        this.controlWindows.addTurn = false;
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.add {
+  padding: 20px;
+  .el-input,
+  .el-select,
+  .el-cascader,
+  .el-textarea,
+  .el-autocomplete,
+  .el-descriptions {
+    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>
diff --git a/src/views/financialCenter/enterpriseRecharge/index.vue b/src/views/financialCenter/enterpriseRecharge/index.vue
index 3728cf5..90c3187 100644
--- a/src/views/financialCenter/enterpriseRecharge/index.vue
+++ b/src/views/financialCenter/enterpriseRecharge/index.vue
@@ -83,6 +83,7 @@
     <div class="table">
       <div class="operation">
         <el-button @click="addition">企业充值</el-button>
+        <el-button @click="additionTurn">圈回</el-button>
       </div>
       <el-table
         v-if="tableHeight"
@@ -235,20 +236,18 @@
                 更多<i class="el-icon-arrow-down el-icon--right"></i>
               </span>
               <el-dropdown-menu slot="dropdown">
-                <template v-if="row.transactionType == 'TURN'"> </template>
+                <template v-if="row.transactionType == 'TURN'">
+                  <el-dropdown-item
+                    command="updateTurn"
+                    v-if="row.auditMark === 0"
+                    >圈回编辑</el-dropdown-item
+                  >
+                </template>
                 <template v-else>
                   <el-dropdown-item command="update" v-if="row.auditMark === 0"
                     >编辑</el-dropdown-item
                   >
                 </template>
-                <el-dropdown-item
-                  command="destroy"
-                  v-if="
-                    row.transactionType == 'CHARGE_SALES' &&
-                    row.chargeSalesAuditMark == -2
-                  "
-                  >销账</el-dropdown-item
-                >
               </el-dropdown-menu>
             </el-dropdown>
           </template>
@@ -258,6 +257,7 @@
       <pagination :parameter="parameter" @searchAgain="getByPage" />
     </div>
     <add :controlWindows="controlWindows" @closeWindow="search" />
+    <add-turn :controlWindows="controlWindows" @closeWindow="search" />
     <!-- 详情 -->
     <el-drawer
       title="详情"
@@ -290,6 +290,7 @@ import serve from "api/financialCenter/enterpriseRechargeDetails.js";
 import commonServe from "api/common.js";
 
 import add from "./components/add.vue";
+import addTurn from "./components/addTurn.vue";
 
 import autocomplete from "components/autocomplete/index.vue";
 import pagination from "components/pagination/index.vue";
@@ -304,7 +305,7 @@ import {
 export default {
   components: {
     add,
-
+    addTurn,
     pagination,
     autocomplete,
     generalDetails,
@@ -313,6 +314,7 @@ export default {
     return {
       controlWindows: {
         add: false,
+        addTurn: false,
         addInfo: {},
         detail: false,
       },
@@ -529,15 +531,25 @@ export default {
       };
       this.controlWindows.add = true;
     },
+    // 圈回
+    additionTurn() {
+      this.controlWindows.addInfo = {
+        title: "资金圈回",
+      };
+      this.controlWindows.addTurn = true;
+    },
     // 更多
     commandMore(val, row) {
+      this.controlWindows.addInfo = {
+        title: "编辑",
+        ...row,
+      };
       if (val === "update") {
-        this.controlWindows.addInfo = {
-          title: "编辑",
-          ...row,
-        };
         this.controlWindows.add = true;
       }
+      if (val === "updateTurn") {
+        this.controlWindows.addTurn = true;
+      }
     },
     //详情
     detail(row) {
@@ -546,7 +558,6 @@ export default {
         serve.getByCompanyId(row.companyId),
       ]).then(([firstRes, secondRes]) => {
         this.oilCompanyMatch = { ...firstRes.data, ...secondRes.data };
-
         this.controlWindows.detail = true;
       });
     },

From 0546d42422d06d2a505d4616f2619db9f9720f81 Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Tue, 21 Feb 2023 16:24:12 +0800
Subject: [PATCH 08/18] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/common.js                             |    6 +
 src/api/financialCenter/enterpriseRecharge.js |    8 +-
 .../enterpriseRechargeDetails.js              |    6 +-
 .../companyAuth/OilCompanyAuthAdd.vue         |  375 +++--
 .../companyManagement/index.vue               | 1212 ++++++++++-------
 .../accountManagement/components/recharge.vue |    2 +-
 .../financialCenter/billDetails/index.vue     |    2 +-
 .../enterpriseRecharge/components/add.vue     |    4 +-
 .../enterpriseRecharge/components/addTurn.vue |    7 +-
 .../enterpriseRecharge/index.vue              |    4 +-
 .../enterpriseRechargeDetails/index.vue       |   55 +-
 src/views/product/components/add.vue          |    2 +-
 src/views/product/components/adjust.vue       |    2 +-
 src/views/product/components/batch.vue        |    2 +-
 src/views/product/components/create.vue       |    2 +-
 src/views/product/components/record.vue       |    2 +-
 src/views/product/index.vue                   |    2 +-
 src/views/refineryAccount/components/add.vue  |    2 +-
 src/views/refineryAccount/index.vue           |    2 +-
 src/views/refineryInfo/components/add.vue     |    2 +-
 src/views/refineryInfo/index.vue              |    2 +-
 21 files changed, 982 insertions(+), 719 deletions(-)

diff --git a/src/api/common.js b/src/api/common.js
index 2a1f213..f56fe62 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -13,7 +13,13 @@ const liekQuery = (query) => {
   );
 };
 
+//公司账户详情
+const getByCompanyId = (query) => {
+  return request.get(`/oil-finance/oilCompanyAccount/getByCompanyId/${query}`);
+};
+
 export default {
   getRefineryCompanyList,
   liekQuery,
+  getByCompanyId,
 };
diff --git a/src/api/financialCenter/enterpriseRecharge.js b/src/api/financialCenter/enterpriseRecharge.js
index 6b0b0af..e09528d 100644
--- a/src/api/financialCenter/enterpriseRecharge.js
+++ b/src/api/financialCenter/enterpriseRecharge.js
@@ -10,12 +10,9 @@ const getByPage = (params) => {
 const get = (query) => {
   return request.get(`/oil-finance/oilCompanyAccountReverse/get/${query}`);
 };
-//公司详情
-const getByCompanyId = (query) => {
-  return request.get(`/oil-finance/oilCompanyAccount/getByCompanyId/${query}`);
-};
+
 //公司财务详情
-const getByCompanyIdSec = (query) => {
+const getByCompanyId = (query) => {
   return request.get(`/oil-user/oilCompanyFinance/getByCompanyId/${query}`);
 };
 // 新增
@@ -47,7 +44,6 @@ export default {
   getByCompanyId,
   save,
   update,
-  getByCompanyIdSec,
   getCascaderList,
   getLikeByNameSuccess,
 };
diff --git a/src/api/financialCenter/enterpriseRechargeDetails.js b/src/api/financialCenter/enterpriseRechargeDetails.js
index d6857a6..612b0b2 100644
--- a/src/api/financialCenter/enterpriseRechargeDetails.js
+++ b/src/api/financialCenter/enterpriseRechargeDetails.js
@@ -10,12 +10,8 @@ const getByPage = (params) => {
 const get = (query) => {
   return request.get(`/oil-finance/oilCompanyAccountReverse/get/${query}`);
 };
-//详情
-const getByCompanyId = (query) => {
-  return request.get(`/oil-finance/oilCompanyAccount/getByCompanyId/${query}`);
-};
+
 export default {
   getByPage,
   get,
-  getByCompanyId,
 };
diff --git a/src/views/customerManagement/companyAuth/OilCompanyAuthAdd.vue b/src/views/customerManagement/companyAuth/OilCompanyAuthAdd.vue
index 9d705eb..56bc6f4 100644
--- a/src/views/customerManagement/companyAuth/OilCompanyAuthAdd.vue
+++ b/src/views/customerManagement/companyAuth/OilCompanyAuthAdd.vue
@@ -1,23 +1,31 @@
 <template>
-  <div style="padding:30px 75px 50px;">
-    <div style="width:100%;position: absolute;top: 15px;left: 0;">
-      <div style="display: flex;
-    align-items: center;padding-left: 20px;">
+  <div style="padding: 30px 75px 50px">
+    <div style="width: 100%; position: absolute; top: 15px; left: 0">
+      <div style="display: flex; align-items: center; padding-left: 20px">
         <svg-icon
-        icon-class="iconsiji2"
-        style="font-size: 30px;margin-right: 10px;"
-      />
-      <span>添加认证信息</span>
+          icon-class="iconsiji2"
+          style="font-size: 30px; margin-right: 10px"
+        />
+        <span>添加认证信息</span>
       </div>
-      <el-divider style="width:100%"></el-divider>
+      <el-divider style="width: 100%"></el-divider>
     </div>
     <el-row>
-      <el-form ref="form" :rules="rules" :model="oilCompanyAuth" label-width="100px" :size="$store.getters.size">
+      <el-form
+        ref="form"
+        :rules="rules"
+        :model="oilCompanyAuth"
+        label-width="100px"
+        :size="$store.getters.size"
+      >
         <el-row :gutter="gridNum.row.gutter">
-
           <el-col :span="12">
             <el-form-item label="企业名称" prop="companyName">
-              <el-input v-model="oilCompanyAuth.companyName" clearable disabled/>
+              <el-input
+                v-model="oilCompanyAuth.companyName"
+                clearable
+                disabled
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -28,7 +36,11 @@
                 :size="$store.getters.size"
                 style="width: 100%"
                 :options="areaTree"
-                :props="{value:'id', label:'areaName', children:'childList'}"
+                :props="{
+                  value: 'id',
+                  label: 'areaName',
+                  children: 'childList',
+                }"
                 filterable
                 clearable
               />
@@ -36,41 +48,68 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="详细地址" prop="address">
-              <el-input v-model="oilCompanyAuth.address" clearable placeholder="不包含省市区" />
+              <el-input
+                v-model="oilCompanyAuth.address"
+                clearable
+                placeholder="不包含省市区"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="法人代表" prop="companyLegalPerson">
-              <el-input v-model="oilCompanyAuth.companyLegalPerson" clearable placeholder="法人姓名" />
+              <el-input
+                v-model="oilCompanyAuth.companyLegalPerson"
+                clearable
+                placeholder="法人姓名"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="注册资本" prop="registeredCapital">
-              <el-input v-model="oilCompanyAuth.registeredCapital" clearable placeholder="小写数字" />
+              <el-input
+                v-model="oilCompanyAuth.registeredCapital"
+                clearable
+                placeholder="小写数字"
+              />
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
             <el-form-item label="经营资质" prop="businessQualia">
-              <el-input v-model="oilCompanyAuth.businessQualia" clearable placeholder="企业经营资质" />
+              <el-input
+                v-model="oilCompanyAuth.businessQualia"
+                clearable
+                placeholder="企业经营资质"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="联系方式" prop="contactPhone">
-              <el-input v-model="oilCompanyAuth.contactPhone" clearable placeholder="手机号" />
+              <el-input
+                v-model="oilCompanyAuth.contactPhone"
+                clearable
+                placeholder="手机号"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="企业网址" prop="website">
-              <el-input v-model="oilCompanyAuth.website" clearable placeholder="企业门户" />
+              <el-input
+                v-model="oilCompanyAuth.website"
+                clearable
+                placeholder="企业门户"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="24">
-          <el-col :span="12">
-          <el-form-item label="营业执照号码" prop="businessLienceId">
-              <el-input v-model="oilCompanyAuth.businessLienceId" clearable placeholder="营业执照号码" />
-            </el-form-item></el-col>
-
+            <el-col :span="12">
+              <el-form-item label="营业执照号码" prop="businessLienceId">
+                <el-input
+                  v-model="oilCompanyAuth.businessLienceId"
+                  clearable
+                  placeholder="营业执照号码"
+                /> </el-form-item
+            ></el-col>
           </el-col>
           <!-- <el-col :span="12">
             <el-form-item label="打款名称" prop="bankCardName">
@@ -117,7 +156,7 @@
           </el-col> -->
           <el-col :span="24">
             <el-form-item label="营业执照照片" prop="businessLienceImg">
-              <el-upload
+              <!-- <el-upload
                 action="/lsm/ocr/business"
                 list-type="picture-card"
                 :on-preview="businessLienceImgPreview"
@@ -127,7 +166,7 @@
                 :limit="1"
               >
                 <i class="el-icon-plus" />
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
             <el-dialog
               v-el-drag-dialog
@@ -135,7 +174,11 @@
               title="营业执照"
               :modal="false"
             >
-              <img width="100%" :src="oilCompanyAuth.ibusinessLienceImgImageShow" alt="">
+              <img
+                width="100%"
+                :src="oilCompanyAuth.ibusinessLienceImgImageShow"
+                alt=""
+              />
             </el-dialog>
           </el-col>
           <!-- <el-col :span="12">
@@ -147,49 +190,59 @@
               />
             </el-form-item>
           </el-col> -->
-
         </el-row>
       </el-form>
     </el-row>
-    <div :span="24" style="background:#fff;margin-top:20px;text-align: right;width:100%;position: absolute;bottom: 15px;left: 0;">
-          <el-divider style="width:100%"></el-divider>
-          <el-button @click="close">取消</el-button>
-            <el-button type="primary" @click="submit" style="margin-right:10px">提交</el-button>
-        </div>
+    <div
+      :span="24"
+      style="
+        background: #fff;
+        margin-top: 20px;
+        text-align: right;
+        width: 100%;
+        position: absolute;
+        bottom: 15px;
+        left: 0;
+      "
+    >
+      <el-divider style="width: 100%"></el-divider>
+      <el-button @click="close">取消</el-button>
+      <el-button type="primary" @click="submit" style="margin-right: 10px"
+        >提交</el-button
+      >
+    </div>
   </div>
 </template>
 <script>
-import oilCompanyAuthApi from '@/api/customerManagement/oilCompanyAuth'
-import AreaCodeApi from '@/api/customerManagement/areaCode'
-import { imgCompress } from '@/utils'
-import axios from 'axios'
+import oilCompanyAuthApi from "@/api/customerManagement/oilCompanyAuth";
+import AreaCodeApi from "@/api/customerManagement/areaCode";
+// import { imgCompress } from "@/utils";
+import axios from "axios";
 
 export default {
   props: {
     oilCompanyInfo: {
       type: Object,
-      default() {
-
-      }
-    }
+      default() {},
+    },
   },
   data() {
     return {
       gridNum: {
         row: {
-          gutter: 2
+          gutter: 2,
         },
         cols: {
           xs: 24,
           sm: 24,
           md: 12,
           lg: 12,
-          xl: 6
-        }
+          xl: 6,
+        },
       },
-      loading:false,
-      imgCompress,
-      userList:[],
+      loading: false,
+      // imgCompress,
+      userList: [],
       uploadUrl: process.env.VUE_APP_UPLOAD_PRIVATE_URL, // 加密图片url
       imgeDialogVisible: false,
       areaTree: [], // 省市区树形结构
@@ -212,145 +265,193 @@ export default {
         businessLienceId: undefined,
         auth: false,
         auditMark: undefined,
-        createSource: 'WEBM'
+        createSource: "WEBM",
       },
       rules: {
         companyName: [
-          { required: true, message: '请输入企业名称', trigger: 'blur' },
-          { min: 3, max: 50, message: '长度在 3 到 50 个字符', trigger: 'blur' }
+          { required: true, message: "请输入企业名称", trigger: "blur" },
+          {
+            min: 3,
+            max: 50,
+            message: "长度在 3 到 50 个字符",
+            trigger: "blur",
+          },
         ],
-        bankCardName:[
-          { required: true, message: '请输入打款名称', trigger: 'blur' },
+        bankCardName: [
+          { required: true, message: "请输入打款名称", trigger: "blur" },
         ],
-        bankCardNo:[
-          { required: true, message: '请输入银行卡号', trigger: 'blur' },
+        bankCardNo: [
+          { required: true, message: "请输入银行卡号", trigger: "blur" },
         ],
-        bankName:[
-          { required: true, message: '请输入开户行名称', trigger: 'change' },
+        bankName: [
+          { required: true, message: "请输入开户行名称", trigger: "change" },
         ],
-        interBankCode:[
-          { required: true, message: '请输入联行号', trigger: 'blur' },
+        interBankCode: [
+          { required: true, message: "请输入联行号", trigger: "blur" },
         ],
         address: [
-          { min: 1, max: 300, message: '长度在 1 到 300 个字符', trigger: 'blur' }
+          {
+            min: 1,
+            max: 300,
+            message: "长度在 1 到 300 个字符",
+            trigger: "blur",
+          },
         ],
         companyLegalPerson: [
-          { min: 1, max: 50, message: '长度在 1 到 50 个字符', trigger: 'blur' }
-        ],
-        registeredCapital: [
-          { pattern: /^\d*$/, message: '只能输入数值' }
+          {
+            min: 1,
+            max: 50,
+            message: "长度在 1 到 50 个字符",
+            trigger: "blur",
+          },
         ],
+        registeredCapital: [{ pattern: /^\d*$/, message: "只能输入数值" }],
         businessQualia: [
-          { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
+          {
+            min: 1,
+            max: 255,
+            message: "长度在 1 到 255 个字符",
+            trigger: "blur",
+          },
         ],
         contactPhone: [
-          { pattern: /^1[3456789]\d{9}$/, message: '目前只支持中国大陆的手机号码' }
-
+          {
+            pattern: /^1[3456789]\d{9}$/,
+            message: "目前只支持中国大陆的手机号码",
+          },
         ],
         website: [
-          { pattern: /^(?:http(s)?:\/\/)?[\w.-]+(?:\.[\w\.-]+)+[\w\-\._~:/?#[\]@!\$&'\*\+,;=.]+$/, message: '请输入正确网址' }
+          {
+            pattern:
+              /^(?:http(s)?:\/\/)?[\w.-]+(?:\.[\w\.-]+)+[\w\-\._~:/?#[\]@!\$&'\*\+,;=.]+$/,
+            message: "请输入正确网址",
+          },
         ],
         businessLienceId: [
-          { min: 1, max: 50, message: '长度在 1 到 50 个字符', trigger: 'blur' }
+          {
+            min: 1,
+            max: 50,
+            message: "长度在 1 到 50 个字符",
+            trigger: "blur",
+          },
         ],
         businessScope: [
-          { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
-        ]
-      }
-    }
+          {
+            min: 1,
+            max: 255,
+            message: "长度在 1 到 255 个字符",
+            trigger: "blur",
+          },
+        ],
+      },
+    };
   },
   created() {
-    this.oilCompanyAuth.companyId = this.oilCompanyInfo.id
-    this.oilCompanyAuth.companyName = this.oilCompanyInfo.name
-    AreaCodeApi.getTree().then(res => {
-      this.areaTree = res.data
-    })
+    this.oilCompanyAuth.companyId = this.oilCompanyInfo.id;
+    this.oilCompanyAuth.companyName = this.oilCompanyInfo.name;
+    AreaCodeApi.getTree().then((res) => {
+      this.areaTree = res.data;
+    });
   },
   methods: {
-    handleSelect(e){
-      console.log(e)
-      if(e){
-        console.log(this.userList.filter((item,index)=>item.bankName==e)[0].cnaps);
-        this.oilCompanyAuth.interBankCode = this.userList.filter((item,index)=>item.bankName==e)[0].cnaps
+    handleSelect(e) {
+      console.log(e);
+      if (e) {
+        console.log(
+          this.userList.filter((item, index) => item.bankName == e)[0].cnaps
+        );
+        this.oilCompanyAuth.interBankCode = this.userList.filter(
+          (item, index) => item.bankName == e
+        )[0].cnaps;
       }
     },
-    userRemoteMethod(queryString){
-        this.loading = true;
-        if(this.timer){
-          clearTimeout(this.timer)
+    userRemoteMethod(queryString) {
+      this.loading = true;
+      if (this.timer) {
+        clearTimeout(this.timer);
       }
-        this.timer = setTimeout(()=>{
-         AreaCodeApi.findAllByName({name:queryString}).then(res=>{
-           this.loading = false
-            this.userList = res.data
-      })
-      },300)
-
+      this.timer = setTimeout(() => {
+        AreaCodeApi.findAllByName({ name: queryString }).then((res) => {
+          this.loading = false;
+          this.userList = res.data;
+        });
+      }, 300);
     },
-    businessLienceImgPreview(file) { // 查询大图
-      this.oilCompanyAuth.ibusinessLienceImgImageShow = file.url
-      this.imgeDialogVisible = true
+    businessLienceImgPreview(file) {
+      // 查询大图
+      this.oilCompanyAuth.ibusinessLienceImgImageShow = file.url;
+      this.imgeDialogVisible = true;
     },
-    businessLienceImgSuccess(response, file) { // 营业执照上传成功
-      if (response.code === '0') {
-        this.oilCompanyAuth.businessLienceId = response.data.words_result.creditCode.words
-        this.oilCompanyAuth.companyName = response.data.words_result.unitName.words
-        this.oilCompanyAuth.companyLegalPerson = response.data.words_result.legal.words
-        this.oilCompanyAuth.businessScope = response.data.words_result.scope.words
+    businessLienceImgSuccess(response, file) {
+      // 营业执照上传成功
+      if (response.code === "0") {
+        this.oilCompanyAuth.businessLienceId =
+          response.data.words_result.creditCode.words;
+        this.oilCompanyAuth.companyName =
+          response.data.words_result.unitName.words;
+        this.oilCompanyAuth.companyLegalPerson =
+          response.data.words_result.legal.words;
+        this.oilCompanyAuth.businessScope =
+          response.data.words_result.scope.words;
       }
 
-      imgCompress(file.raw).then(res => {
-        const form = new FormData()
-        res.fileName = file.fileName
-        form.append('file', res)
-        form.append('code', 'A003')
+      // imgCompress(file.raw).then((res) => {
+      //   const form = new FormData();
+      //   res.fileName = file.fileName;
+      //   form.append("file", res);
+      //   form.append("code", "A003");
 
-        // 上传到oss
-        axios.post(this.uploadUrl, form, { headers: { 'Content-type': 'application/x-www-form-urlencoded' }}).then(res => {
-          if (res.data.code === 20000) {
-            this.oilCompanyAuth.businessLienceImg = res.data.data.path
-          }
-        })
-      })
+      //   // 上传到oss
+      //   axios
+      //     .post(this.uploadUrl, form, {
+      //       headers: { "Content-type": "application/x-www-form-urlencoded" },
+      //     })
+      //     .then((res) => {
+      //       if (res.data.code === 20000) {
+      //         this.oilCompanyAuth.businessLienceImg = res.data.data.path;
+      //       }
+      //     });
+      // });
     },
-    businessLienceImgRemove() { // 营业执照删除
-      this.oilCompanyAuth.ibusinessLienceImgImageShow = undefined
-      this.oilCompanyAuth.businessLienceImg = undefined
+    businessLienceImgRemove() {
+      // 营业执照删除
+      this.oilCompanyAuth.ibusinessLienceImgImageShow = undefined;
+      this.oilCompanyAuth.businessLienceImg = undefined;
     },
     submit() {
-      this.$refs['form'].validate((valid) => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
-          this.save(this.oilCompanyAuth)
+          this.save(this.oilCompanyAuth);
         }
-      })
+      });
     },
     save() {
-      const data = { ...this.oilCompanyAuth }
+      const data = { ...this.oilCompanyAuth };
       if (data.auth) {
-        data.auditMark = 1
+        data.auditMark = 1;
       } else {
-        data.auditMark = 2
+        data.auditMark = 2;
       }
       if (this.addrCode.length > 1) {
-        data.provinceCode = this.addrCode[0]
-        data.cityCode = this.addrCode[1]
-        data.areaCode = this.addrCode[2]
+        data.provinceCode = this.addrCode[0];
+        data.cityCode = this.addrCode[1];
+        data.areaCode = this.addrCode[2];
       }
       // 保存
-      oilCompanyAuthApi.save(data).then(res => {
-        this.$message.success(res.msg)
-        this.$emit('closeDialog')
-        this.$emit('getByPage')
-      })
+      oilCompanyAuthApi.save(data).then((res) => {
+        this.$message.success(res.msg);
+        this.$emit("closeDialog");
+        this.$emit("getByPage");
+      });
     },
     close() {
-      this.$emit('closeDialog')
-    }
-  }
-}
+      this.$emit("closeDialog");
+    },
+  },
+};
 </script>
 <style scoped>
-.el-divider--horizontal{
+.el-divider--horizontal {
   margin: 10px 0;
-  }
+}
 </style>
diff --git a/src/views/customerManagement/companyManagement/index.vue b/src/views/customerManagement/companyManagement/index.vue
index 7efd1f8..cfb8863 100644
--- a/src/views/customerManagement/companyManagement/index.vue
+++ b/src/views/customerManagement/companyManagement/index.vue
@@ -1,7 +1,6 @@
 <template>
   <div class="enterprise-recharge-details">
     <div class="frame">
-
       <el-form :model="parameter.params" :inline="true">
         <!-- 公司名称 -->
         <autocomplete
@@ -10,19 +9,36 @@
           :config="configAutocomplete"
         />
         <el-form-item>
-          <el-autocomplete v-model="parameter.params.name" placeholder="总公司名称" :fetch-suggestions="querySearch"
-                           :trigger-on-focus="false" clearable filterable remote reserve-keyword @keyup.enter.native="getByPage" />
+          <el-autocomplete
+            v-model="parameter.params.name"
+            placeholder="总公司名称"
+            :fetch-suggestions="querySearch"
+            :trigger-on-focus="false"
+            clearable
+            filterable
+            remote
+            reserve-keyword
+            @keyup.enter.native="getByPage"
+          />
         </el-form-item>
         <el-form-item>
-          <el-select v-model="parameter.params.parentMark" placeholder="是否为主体公司" clearable
-                     @keyup.enter.native="getByPage">
+          <el-select
+            v-model="parameter.params.parentMark"
+            placeholder="是否为主体公司"
+            clearable
+            @keyup.enter.native="getByPage"
+          >
             <el-option label="主体公司" value="0" />
             <el-option label="分公司" value="1" />
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-select v-model="parameter.params.companyNature" placeholder="企业性质" clearable
-                     @keyup.enter.native="getByPage">
+          <el-select
+            v-model="parameter.params.companyNature"
+            placeholder="企业性质"
+            clearable
+            @keyup.enter.native="getByPage"
+          >
             <el-option label="零售客户" value="0" />
             <el-option label="外请客户" value="1" />
             <el-option label="渠道客户" value="2" />
@@ -33,14 +49,24 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-select v-model="parameter.params.enableMark" placeholder="启用标识" clearable @keyup.enter.native="getByPage">
+          <el-select
+            v-model="parameter.params.enableMark"
+            placeholder="启用标识"
+            clearable
+            @keyup.enter.native="getByPage"
+          >
             <el-option label="禁用" value="0" />
             <el-option label="启用" value="1" />
           </el-select>
         </el-form-item>
 
         <el-form-item>
-          <el-select v-model="parameter.params.auditMark" placeholder="审核标识" clearable @keyup.enter.native="getByPage">
+          <el-select
+            v-model="parameter.params.auditMark"
+            placeholder="审核标识"
+            clearable
+            @keyup.enter.native="getByPage"
+          >
             <el-option label="未提交" value="0" />
             <el-option label="审核通过" value="1" />
             <el-option label="提交待审核" value="2" />
@@ -49,7 +75,12 @@
         </el-form-item>
 
         <el-form-item>
-          <el-select v-model="parameter.params.companyType" placeholder="账户类型" clearable @keyup.enter.native="getByPage">
+          <el-select
+            v-model="parameter.params.companyType"
+            placeholder="账户类型"
+            clearable
+            @keyup.enter.native="getByPage"
+          >
             <el-option label="柴油账户" value="0" />
             <el-option label="LNG账户" value="2" />
             <el-option label="汽油账户" value="1" />
@@ -58,17 +89,39 @@
           </el-select>
         </el-form-item>
 
-
         <el-form-item>
-          <el-select v-model="parameter.params.businessLeader" clearable filterable remote reserve-keyword
-                     placeholder="企业负责人姓名或联系方式" :remote-method="userRemoteMethod" @keyup.enter.native="getByPage">
-            <el-option v-for="item in userList" :key="item.id"
-                       :label="item.phone + '(' + (item.nickName ? item.nickName + '-' : '') + item.userCode + ')'" :value="item.id" />
+          <el-select
+            v-model="parameter.params.businessLeader"
+            clearable
+            filterable
+            remote
+            reserve-keyword
+            placeholder="企业负责人姓名或联系方式"
+            :remote-method="userRemoteMethod"
+            @keyup.enter.native="getByPage"
+          >
+            <el-option
+              v-for="item in userList"
+              :key="item.id"
+              :label="
+                item.phone +
+                '(' +
+                (item.nickName ? item.nickName + '-' : '') +
+                item.userCode +
+                ')'
+              "
+              :value="item.id"
+            />
           </el-select>
         </el-form-item>
 
         <el-form-item>
-          <el-select v-model="parameter.params.companyDockType" placeholder="公司对接类型" clearable @keyup.enter.native="getByPage">
+          <el-select
+            v-model="parameter.params.companyDockType"
+            placeholder="公司对接类型"
+            clearable
+            @keyup.enter.native="getByPage"
+          >
             <el-option label="对接客户" :value="0" />
             <el-option label="平台客户" :value="1" />
           </el-select>
@@ -76,10 +129,14 @@
       </el-form>
 
       <div class="buttons">
-
-        <el-button v-permission="['company:info:add']" class="group-item" type="primary" :size="$store.getters.size"
-                   @click="toAdd">
-          <svg-icon icon-class="iconxinzeng"/>
+        <el-button
+          v-permission="['company:info:add']"
+          class="group-item"
+          type="primary"
+          :size="$store.getters.size"
+          @click="toAdd"
+        >
+          <svg-icon icon-class="iconxinzeng" />
           <span class="padding-left-xs">添加</span>
         </el-button>
         <el-button icon="el-icon-search" @click="search">查询</el-button>
@@ -87,156 +144,269 @@
       </div>
     </div>
     <div class="table">
-      <div class="operation">
-      </div>
+      <div class="operation"></div>
       <!-- 列表开始 -->
-      <el-table :max-height="tableHeight" stripe :data="dataPage.list" fit style="width: 100%;"
-                :size="$store.getters.size" @sort-change="sortHandler"
-                @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55"/>
+      <el-table
+        :max-height="tableHeight"
+        stripe
+        :data="dataPage.list"
+        fit
+        style="width: 100%"
+        :size="$store.getters.size"
+        @sort-change="sortHandler"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55" />
 
-        <el-table-column label="序号" type="index" :index="indexMethod"/>
+        <el-table-column label="序号" type="index" :index="indexMethod" />
 
         <el-table-column prop="name" label="企业名称" width="200">
-          <template slot-scope="{row}">
+          <template slot-scope="{ row }">
             <div class="display: flex">
               <el-tag v-if="row.parentMark === 0" effect="dark">总公司</el-tag>
               <el-tag v-else effect="dark">分公司</el-tag>
               <div>
-                <span>
-                  {{row.name}}<br/>
-                </span>
-                <span>
-                  NO:{{row.id}}
-                </span>
+                <span> {{ row.name }}<br /> </span>
+                <span> NO:{{ row.id }} </span>
               </div>
             </div>
           </template>
         </el-table-column>
         // TODO
         <el-table-column label="加价策略">
-          <template slot-scope="{row}">
-            <p>{{row.oilsPriceStrategy === '1' ? '费率' : '增减'}}:{{row.oilsPriceScale}}</p>
+          <template slot-scope="{ row }">
+            <p>
+              {{ row.oilsPriceStrategy === "1" ? "费率" : "增减" }}:{{
+                row.oilsPriceScale
+              }}
+            </p>
           </template>
         </el-table-column>
         <el-table-column prop="consumRebateStrategy" label="折返策略">
-          <template slot-scope="{row}">
-            <p v-if="row.consumRebateStrategy == 'TYFL' || row.consumRebateStrategy == 'SITE_lEVEL'">
-              <span>{{row.consumRebateStrategy == 'TYFL' ? '统一费率' : '油站等级'}}</span>
-              <span>{{row.consumRebateScale ? row.consumRebateScale : '0'}}</span>
+          <template slot-scope="{ row }">
+            <p
+              v-if="
+                row.consumRebateStrategy == 'TYFL' ||
+                row.consumRebateStrategy == 'SITE_lEVEL'
+              "
+            >
+              <span>{{
+                row.consumRebateStrategy == "TYFL" ? "统一费率" : "油站等级"
+              }}</span>
+              <span>{{
+                row.consumRebateScale ? row.consumRebateScale : "0"
+              }}</span>
             </p>
             <p v-if="row.consumRebateStrategy == 'TYSSFL'">
-              {{row.consumRebateStrategy == 'TYSSFL' ? '统一升数' : '未知'}}
-              <span>{{row.consumRebateScale ? row.consumRebateScale + '元/L' : '0'}}</span>
+              {{ row.consumRebateStrategy == "TYSSFL" ? "统一升数" : "未知" }}
+              <span>{{
+                row.consumRebateScale ? row.consumRebateScale + "元/L" : "0"
+              }}</span>
             </p>
-            <p v-if="row.consumRebateStrategy != 'TYFL' && row.consumRebateStrategy != 'SITE_lEVEL' && row.consumRebateStrategy != 'TYSSFL'">
+            <p
+              v-if="
+                row.consumRebateStrategy != 'TYFL' &&
+                row.consumRebateStrategy != 'SITE_lEVEL' &&
+                row.consumRebateStrategy != 'TYSSFL'
+              "
+            >
               暂无
             </p>
           </template>
         </el-table-column>
         <el-table-column label="企业性质">
-          <template slot-scope="{row}">
-            {{ row.companyNature === 0 ? '零售客户' : row.companyNature === 1 ? '外请客户' : row.companyNature === 2 ? '渠道客户' : row.companyNature === 3 ? '存量客户' : row.companyNature === 4 ? '批发客户' : row.companyNature === 5 ? 'LNG客户' : '推广业务'}}
+          <template slot-scope="{ row }">
+            {{
+              row.companyNature === 0
+                ? "零售客户"
+                : row.companyNature === 1
+                ? "外请客户"
+                : row.companyNature === 2
+                ? "渠道客户"
+                : row.companyNature === 3
+                ? "存量客户"
+                : row.companyNature === 4
+                ? "批发客户"
+                : row.companyNature === 5
+                ? "LNG客户"
+                : "推广业务"
+            }}
           </template>
         </el-table-column>
         <el-table-column label="账户类型">
-          <template slot-scope="{row}">
-            {{ row.companyType === '0' ? '柴油账户' : row.companyType === '1' ? '汽油账户' : row.companyType === '2' ? 'LNG账户' : row.companyType === '3' ? '尿素账户' : '油批账户'}}
+          <template slot-scope="{ row }">
+            {{
+              row.companyType === "0"
+                ? "柴油账户"
+                : row.companyType === "1"
+                ? "汽油账户"
+                : row.companyType === "2"
+                ? "LNG账户"
+                : row.companyType === "3"
+                ? "尿素账户"
+                : "油批账户"
+            }}
           </template>
         </el-table-column>
         <el-table-column label="公司对接类型">
-          <template slot-scope="{row}">
-            {{ row.companyDockType === 0 ? '对接客户' :  row.companyDockType === 1 ? '平台客户' : '暂无'}}
+          <template slot-scope="{ row }">
+            {{
+              row.companyDockType === 0
+                ? "对接客户"
+                : row.companyDockType === 1
+                ? "平台客户"
+                : "暂无"
+            }}
           </template>
         </el-table-column>
         <el-table-column label="启用状态">
-          <template slot-scope="{row}">
-            <el-switch v-model="row.enableMark" :active-value=1 :inactive-value=0  @change="enableMarkClike(row)"></el-switch>
+          <template slot-scope="{ row }">
+            <el-switch
+              v-model="row.enableMark"
+              :active-value="1"
+              :inactive-value="0"
+              @change="enableMarkClike(row)"
+            ></el-switch>
           </template>
         </el-table-column>
         <el-table-column label="联动分油">
-          <template slot-scope="{row}">
-            <el-switch v-model="row.shareDistribute" active-color="#13ce66" inactive-color="row.parentMark == 0 ? '#999' : '#ff4949'" :active-value="1" :inactive-value="0" :disabled="row.parentMark == 0" @change="enableMarkOpem(row)"></el-switch>
+          <template slot-scope="{ row }">
+            <el-switch
+              v-model="row.shareDistribute"
+              active-color="#13ce66"
+              inactive-color="row.parentMark == 0 ? '#999' : '#ff4949'"
+              :active-value="1"
+              :inactive-value="0"
+              :disabled="row.parentMark == 0"
+              @change="enableMarkOpem(row)"
+            ></el-switch>
           </template>
         </el-table-column>
         <el-table-column lable="审核标识">
-          <template slot-scope="{row}">
-            <el-tag v-if="row.auditMark === 0" type="info" effect="dark">未提交</el-tag>
-            <el-tag v-if="row.auditMark === 1" type="success" effect="dark">审核通过</el-tag>
-            <el-tag v-if="row.auditMark === 2" type="warning" >提交待审核</el-tag>
-            <el-tag v-if="row.auditMark > 2 && row.auditMark < 0" type="danger" >审核不通过</el-tag>
+          <template slot-scope="{ row }">
+            <el-tag v-if="row.auditMark === 0" type="info" effect="dark"
+              >未提交</el-tag
+            >
+            <el-tag v-if="row.auditMark === 1" type="success" effect="dark"
+              >审核通过</el-tag
+            >
+            <el-tag v-if="row.auditMark === 2" type="warning"
+              >提交待审核</el-tag
+            >
+            <el-tag v-if="row.auditMark > 2 && row.auditMark < 0" type="danger"
+              >审核不通过</el-tag
+            >
           </template>
         </el-table-column>
         <el-table-column label="企业负责人">
-          <template slot-scope="{row}">
-            {{row.userName ? row.userName : '企业负责人'}} <br/>
-            {{row.phone ? row.phone : '暂无电话'}}
+          <template slot-scope="{ row }">
+            {{ row.userName ? row.userName : "企业负责人" }} <br />
+            {{ row.phone ? row.phone : "暂无电话" }}
           </template>
         </el-table-column>
         <el-table-column label="企业负责人">
-          <template slot-scope="{row}">
-            {{row.userName ? row.userName : '企业负责人'}} <br/>
-            {{row.phone ? row.phone : '暂无电话'}}
+          <template slot-scope="{ row }">
+            {{ row.userName ? row.userName : "企业负责人" }} <br />
+            {{ row.phone ? row.phone : "暂无电话" }}
           </template>
         </el-table-column>
         <el-table-column label="创建信息">
-          <template slot-scope="{row}">
-            {{row.createUserName ? row.createUserName : '创建人'}} <br/>
-            {{row.createTime ? row.createTime : '创建时间'}}
+          <template slot-scope="{ row }">
+            {{ row.createUserName ? row.createUserName : "创建人" }} <br />
+            {{ row.createTime ? row.createTime : "创建时间" }}
           </template>
         </el-table-column>
-        <el-table-column fixed="right" label="操作" width="180px" align="center">
+        <el-table-column
+          fixed="right"
+          label="操作"
+          width="180px"
+          align="center"
+        >
           <template slot-scope="scope">
-            <el-button :size="$store.getters.size" type="text" @click="handleDetail(scope.row.id)">
-              <svg-icon icon-class="iconxiangqing1"/>
+            <el-button
+              :size="$store.getters.size"
+              type="text"
+              @click="handleDetail(scope.row.id)"
+            >
+              <svg-icon icon-class="iconxiangqing1" />
             </el-button>
-            <el-button @click="codeFn(scope.row)" :size="$store.getters.size" type="text" icon="el-icon-oilEwm">
+            <el-button
+              @click="codeFn(scope.row)"
+              :size="$store.getters.size"
+              type="text"
+              icon="el-icon-oilEwm"
+            >
             </el-button>
             <el-dropdown>
               <el-button type="text">
                 更多
-                <i class="el-icon-arrow-down el-icon--right"/>
+                <i class="el-icon-arrow-down el-icon--right" />
               </el-button>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item @click.native="toUpdate(scope.row.id)">
-                  <el-button v-permission="['company:info:base']" :size="$store.getters.size" type="text">
-                    <svg-icon icon-class="iconicon-"/>
+                  <el-button
+                    v-permission="['company:info:base']"
+                    :size="$store.getters.size"
+                    type="text"
+                  >
+                    <svg-icon icon-class="iconicon-" />
                     基础资料
                   </el-button>
                 </el-dropdown-item>
-                <el-dropdown-item v-if="scope.row.auditMark === 0" @click.native="toAddAuth(scope.row.id)">
-                  <el-button v-permission="['company:info:auth']" :size="$store.getters.size" type="text">
-                    <svg-icon icon-class="iconicon-"/>
+                <el-dropdown-item
+                  v-if="scope.row.auditMark === 0"
+                  @click.native="toAddAuth(scope.row.id)"
+                >
+                  <el-button
+                    v-permission="['company:info:auth']"
+                    :size="$store.getters.size"
+                    type="text"
+                  >
+                    <svg-icon icon-class="iconicon-" />
                     认证信息
                   </el-button>
                 </el-dropdown-item>
-                <el-dropdown-item v-if="scope.row.auditMark !== 0" @click.native="toUpdateAuth(scope.row.id)">
-                  <el-button v-permission="['company:info:auth']" :size="$store.getters.size" type="text">
-                    <svg-icon icon-class="iconicon-"/>
+                <el-dropdown-item
+                  v-if="scope.row.auditMark !== 0"
+                  @click.native="toUpdateAuth(scope.row.id)"
+                >
+                  <el-button
+                    v-permission="['company:info:auth']"
+                    :size="$store.getters.size"
+                    type="text"
+                  >
+                    <svg-icon icon-class="iconicon-" />
                     认证信息
                   </el-button>
                 </el-dropdown-item>
                 <el-dropdown-item @click.native="toBankAuth(scope.row)">
-                  <el-button v-permission="['company:info:auth']" :size="$store.getters.size" type="text">
-                    <svg-icon icon-class="iconicon-"/>
+                  <el-button
+                    v-permission="['company:info:auth']"
+                    :size="$store.getters.size"
+                    type="text"
+                  >
+                    <svg-icon icon-class="iconicon-" />
                     银行信息
                   </el-button>
                 </el-dropdown-item>
                 <el-dropdown-item @click.native="toFinance(scope.row.id)">
-                  <el-button v-permission="['company:info:finance']" :size="$store.getters.size" type="text">
-                    <svg-icon icon-class="iconicon-"/>
+                  <el-button
+                    v-permission="['company:info:finance']"
+                    :size="$store.getters.size"
+                    type="text"
+                  >
+                    <svg-icon icon-class="iconicon-" />
                     财务信息
                   </el-button>
                 </el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
-
           </template>
         </el-table-column>
       </el-table>
       <!-- 分页组件结束 -->
       <!-- 分页 -->
-      <pagination :parameter="parameter" @searchAgain="getByPage"/>
+      <pagination :parameter="parameter" @searchAgain="getByPage" />
     </div>
     <!-- 详情 -->
     <el-drawer
@@ -244,8 +414,8 @@
       direction="ltr"
       size="60%"
       :withHeader="false"
-      :visible="controlWindows.detail"
-   >
+      :visible.sync="controlWindows.detail"
+    >
       <general-details
         title="详情"
         :isHeader="true"
@@ -253,7 +423,7 @@
         :sourceData="oilCompanyMatch"
         :mappingData="mappingData"
         @close="controlWindows.detail = false"
-     >
+      >
         <template #offlineTransactionProof>
           <el-image
             style="width: 100px; height: 100px"
@@ -264,448 +434,490 @@
     </el-drawer>
 
     <!-- 添加弹窗 -->
-    <el-dialog v-el-drag-dialog title="添加" :visible.sync="addDialog" width="55%">
-      <OilCompanyInfoAdd v-if="addDialog" @getByPage="getByPage" @closeDialog="closeDialog"/>
+    <el-dialog
+      v-el-drag-dialog
+      title="添加"
+      :visible.sync="addDialog"
+      width="55%"
+    >
+      <OilCompanyInfoAdd
+        v-if="addDialog"
+        @getByPage="getByPage"
+        @closeDialog="closeDialog"
+      />
     </el-dialog>
 
-
     <!-- 添加认证信息弹窗 -->
     <el-drawer :visible.sync="addAuthDialog" size="70%">
-      <OilCompanyAuthAdd v-if="addAuthDialog" :oil-company-info="oilCompanyInfo" @getByPage="getByPage"
-                         @closeDialog="closeDialog"/>
+      <OilCompanyAuthAdd
+        v-if="addAuthDialog"
+        :oil-company-info="oilCompanyInfo"
+        @getByPage="getByPage"
+        @closeDialog="closeDialog"
+      />
     </el-drawer>
   </div>
 </template>
 
 <script>
-  import OilCompanyInfoAdd from "@/views/customerManagement/companyManagement/OilCompanyInfoAdd";
-  import serve from "api/financialCenter/enterpriseRechargeDetails.js";
-  import commonServe from "api/common.js";
-  import oilCompanyInfoApi from "@/api/customerManagement/oilCompanyInfo";
-  import autocomplete from "components/autocomplete/index.vue";
-  import pagination from "components/pagination/index.vue";
-  import generalDetails from "components/generalDetails/index.vue";
+import OilCompanyInfoAdd from "@/views/customerManagement/companyManagement/OilCompanyInfoAdd";
+import serve from "api/financialCenter/enterpriseRechargeDetails.js";
+import commonServe from "api/common.js";
 
-  import {
-    rechargeTypeEnum,
-    rechargeStatusEnum,
-    repaymentExamineEnum,
-  } from "utils/dataType.js";
+import oilCompanyInfoApi from "@/api/customerManagement/oilCompanyInfo";
 
-  export default {
-    components: {
-      OilCompanyInfoAdd,
-      pagination,
-      autocomplete,
-      generalDetails,
-    },
-    data() {
-      return {
-        // 部门树选项
-        deptOptions: [],
-        deptDataList: {
-          companyIds: []
-        },
-        rowData: null,
-        showCode: false,
-        bankFinanceDialog: false,
-        syncDialog: false,
-        output: {
-          outputType: 4, // 导出方式，1导出选中，2导出本页，3条件导出，4导出全部
-          startPage: 1, // 导出开始页
-          endPage: 1, // 导出结束页
-          pageSize: 20 // 每页条数
-        },
-        queryCompanyList: [],
-        userList: [],
-        piliangDialog: false,
-        updateFinanceDialog: false, // 修改财务信息弹窗
-        BatchModifyingDialog: false, // 批量修改策略比例
-        oilCompanyAuth: {},
-        oilCompanyFinance: {},
-        addFinanceDialog: false, // 添加财务信息弹窗
-        updateAuthDialog: false, // 修改认证信息弹窗
-        addAuthDialog: false, // 添加认证信息弹窗
-        multipleSelection: [], // 选择表格数据集合
-        outPutDialog: false, // 导出弹窗
-        showTableDrawer: false,
-        page: {
-          pageSize: 20, // 每页显示条数
-          currentPage: 1, // 默认页
-          params: {}, // 查询参数
-          sorted: {
-            createTime: 'desc'
-          },
-          columns: []
-        },
-        tableHeight: document.documentElement.clientHeight - 300 - 60,
-        filters: this.$options.filters,
-        dataPage: { // 分页显示page
-          pageSize: 20, // 每页显示条数
-          currentPage: 1, // 默认页
-          params: { // 查询参数
-          },
-          sorted: {},
-          list: []
-        },
-        tableColumns: [
-        ],
-        // 查询参数
-        queryParams: {},
-        addDialog: false, // 添加弹窗
-        updateDialog: false, // 修改弹窗
-        oilCompanyInfo: {},
-        oilCompanyInfoId: {
-          id: '',
-          list: []
-        },
-        restaurants: [], // 企业名称搜索列表
-        valColumn: ['name', 'abbreviaName', 'companyNature', 'parentMark', 'enableMark', 'auditMark', 'userName', 'createUserName', 'createTime', 'auditUserName', 'auditTime',
-          'updateUserName', 'updateTime'],
-        headers: ['企业名称', '企业简称', '企业性质', '公司性质', '启用状态', '审核标识', '企业负责人', '创建人', '创建时间', '审核人', '审核时间',
-          '修改人', '修改时间'],
+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";
 
-        rechargeTypeEnum: rechargeTypeEnum,
-        rechargeStatusEnum: rechargeStatusEnum,
-        repaymentExamineEnum: repaymentExamineEnum,
-        controlWindows: {
-          detail: false,
+export default {
+  components: {
+    OilCompanyInfoAdd,
+    pagination,
+    autocomplete,
+    generalDetails,
+  },
+  data() {
+    return {
+      // 部门树选项
+      deptOptions: [],
+      deptDataList: {
+        companyIds: [],
+      },
+      rowData: null,
+      showCode: false,
+      bankFinanceDialog: false,
+      syncDialog: false,
+      output: {
+        outputType: 4, // 导出方式，1导出选中，2导出本页，3条件导出，4导出全部
+        startPage: 1, // 导出开始页
+        endPage: 1, // 导出结束页
+        pageSize: 20, // 每页条数
+      },
+      queryCompanyList: [],
+      userList: [],
+      piliangDialog: false,
+      updateFinanceDialog: false, // 修改财务信息弹窗
+      BatchModifyingDialog: false, // 批量修改策略比例
+      oilCompanyAuth: {},
+      oilCompanyFinance: {},
+      addFinanceDialog: false, // 添加财务信息弹窗
+      updateAuthDialog: false, // 修改认证信息弹窗
+      addAuthDialog: false, // 添加认证信息弹窗
+      multipleSelection: [], // 选择表格数据集合
+      outPutDialog: false, // 导出弹窗
+      showTableDrawer: false,
+      page: {
+        pageSize: 20, // 每页显示条数
+        currentPage: 1, // 默认页
+        params: {}, // 查询参数
+        sorted: {
+          createTime: "desc",
         },
-        datetime: [],
-        tableData: [],
-        configAutocomplete: {
-          serveTarget: commonServe.getRefineryCompanyList,
-          autocompleteKey: "name",
-          labelKey: "name",
-          valueKey: "id",
-          placeholder: "企业名称",
-          querykey: "companyId",
+        columns: [],
+      },
+      tableHeight: document.documentElement.clientHeight - 300 - 60,
+      filters: this.$options.filters,
+      dataPage: {
+        // 分页显示page
+        pageSize: 20, // 每页显示条数
+        currentPage: 1, // 默认页
+        params: {
+          // 查询参数
         },
-        configAutocompleteSec: {
-          serveTarget: commonServe.liekQuery,
-          autocompleteKey: "",
-          labelKey: "nickName",
-          valueKey: "id",
-          placeholder: "业务负责人",
-          querykey: "businessLeader",
+        sorted: {},
+        list: [],
+      },
+      tableColumns: [],
+      // 查询参数
+      queryParams: {},
+      addDialog: false, // 添加弹窗
+      updateDialog: false, // 修改弹窗
+      oilCompanyInfo: {},
+      oilCompanyInfoId: {
+        id: "",
+        list: [],
+      },
+      restaurants: [], // 企业名称搜索列表
+      valColumn: [
+        "name",
+        "abbreviaName",
+        "companyNature",
+        "parentMark",
+        "enableMark",
+        "auditMark",
+        "userName",
+        "createUserName",
+        "createTime",
+        "auditUserName",
+        "auditTime",
+        "updateUserName",
+        "updateTime",
+      ],
+      headers: [
+        "企业名称",
+        "企业简称",
+        "企业性质",
+        "公司性质",
+        "启用状态",
+        "审核标识",
+        "企业负责人",
+        "创建人",
+        "创建时间",
+        "审核人",
+        "审核时间",
+        "修改人",
+        "修改时间",
+      ],
+
+      rechargeTypeEnum: rechargeTypeEnum,
+      rechargeStatusEnum: rechargeStatusEnum,
+      repaymentExamineEnum: repaymentExamineEnum,
+      controlWindows: {
+        detail: false,
+      },
+      datetime: [],
+      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: {},
+      },
+      LoopBackTypeEnum: [
+        {
+          label: "充值圈回",
+          value: 1,
         },
-        parameter: {
-          currentPage: 1,
-          pageSize: 10,
-          total: 0,
-          params: {},
+        {
+          label: "赊销圈回",
+          value: 2,
         },
-        LoopBackTypeEnum: [
-          {
-            label: "充值圈回",
-            value: 1,
-          },
-          {
-            label: "赊销圈回",
-            value: 2,
-          },
-          {
-            label: "充值返利圈回",
-            value: 3,
-          },
-          {
-            label: "消费返利圈回",
-            value: 4,
-          },
-        ],
-        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();
+        {
+          label: "充值返利圈回",
+          value: 3,
+        },
+        {
+          label: "消费返利圈回",
+          value: 4,
+        },
+      ],
+      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;
+      console.log("111111111111111111111");
+      console.log(this.parameter);
       this.getByPage();
     },
-    updated() {
-      this.$nextTick(() => {
-        this.$refs.multipleTable && this.$refs.multipleTable.doLayout();
-      });
+    closeDialog() {
+      this.addDialog = false;
+      this.updateDialog = false;
+      this.addAuthDialog = false;
+      this.updateAuthDialog = false;
+      this.addFinanceDialog = false;
+      this.updateFinanceDialog = false;
+      this.piliangDialog = false;
+      this.BatchModifyingDialog = false;
+      this.showTableDrawer = false;
+      this.bankFinanceDialog = false;
+      this.syncDialog = false;
     },
-    mounted() {
-      this.$nextTick(() => {
-        this.heightHandle();
-      });
-      window.addEventListener(
-        "resize",
-        this.$utils.debounce(this.heightHandle, 500)
-      );
-    },
-    methods: {
-      search() {
-        this.parameter.currentPage = 1;
-        console.log("111111111111111111111");
-        console.log(this.parameter)
-        this.getByPage();
-      },
-      closeDialog() {
-        this.addDialog = false
-        this.updateDialog = false
-        this.addAuthDialog = false
-        this.updateAuthDialog = false
-        this.addFinanceDialog = false
-        this.updateFinanceDialog = false
-        this.piliangDialog = false
-        this.BatchModifyingDialog = false
-        this.showTableDrawer = false
-        this.bankFinanceDialog = false
-        this.syncDialog = false
-      },
-      enableMarkOpem(row) { // 启用禁用点击
-        const data = {
-          id: row.id,
-          shareDistribute: row.shareDistribute
-        }
-        oilCompanyInfoApi.openShareDistribute(data).then(res => {
-          if (res.code === 20000) {
-            this.$message.success(res.msg)
-          }
-          this.getByPage()
-        })
-      },
-      getByPage() {
-        oilCompanyInfoApi.getByPage(this.parameter).then((res) => {
-          this.dataPage.list = res.data.list;
-          this.parameter.total = res.data.totalCount;
-        });
-        console.log(this.tableData)
-      },
-      //新增
-      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;
-        });
-      },
+    enableMarkOpem(row) {
       // 启用禁用点击
-      enableMarkClike(row) {
-        console.log("111111111111111111111");
-        const data = [row]
-        oilCompanyInfoApi.updateBatchEnable(data).then(res => {
-          if (res.code === 20000) {
-            this.$message.success(res.msg)
-          }
-          this.getByPage()
-        })
-      },
-      //重置
-      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];
+      const data = {
+        id: row.id,
+        shareDistribute: row.shareDistribute,
+      };
+      oilCompanyInfoApi.openShareDistribute(data).then((res) => {
+        if (res.code === 20000) {
+          this.$message.success(res.msg);
         }
-        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;
-      },
-      handleSizeChange(val) {
-        this.page.pageSize = val
-        this.getByPage()
-      },
-      handleCurrentChange(val) {
-        this.page.currentPage = val
-        this.getByPage()
-      },
-      indexMethod(index) {
-        return (index + 1) * 1
-      },
-      sortHandler(column) {
-        // 排序查询
-        console.log(column.column.sortable)
-        const key = column.column.sortable
-        const value = column.order
-        this.page.sorted = {}
-        this.page.sorted[key] = value
-        this.getByPage()
-      },
-      toAdd() {
-        // 跳转到添加
-        this.oilCompanyInfo = {}
-        this.addDialog = true
-      },
-      toAddAuth(id) {
-        // 跳转添加认证信息
-        oilCompanyInfoApi.get(id).then(res => {
-          this.oilCompanyInfo = res.data
-          this.addAuthDialog = true
-        })
-      },
-      handleSelectionChange(val) { // 选择表格数据
-        this.multipleSelection = val
-      },
-      obtainElement(className) {
-        return document.documentElement.querySelector(className);
-      },
+        this.getByPage();
+      });
     },
-  };
+    getByPage() {
+      oilCompanyInfoApi.getByPage(this.parameter).then((res) => {
+        this.dataPage.list = res.data.list;
+        this.parameter.total = res.data.totalCount;
+      });
+      console.log(this.tableData);
+    },
+    //新增
+    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;
+    //   });
+    // },
+    // 启用禁用点击
+    enableMarkClike(row) {
+      console.log("111111111111111111111");
+      const data = [row];
+      oilCompanyInfoApi.updateBatchEnable(data).then((res) => {
+        if (res.code === 20000) {
+          this.$message.success(res.msg);
+        }
+        this.getByPage();
+      });
+    },
+    //重置
+    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;
+    },
+    handleSizeChange(val) {
+      this.page.pageSize = val;
+      this.getByPage();
+    },
+    handleCurrentChange(val) {
+      this.page.currentPage = val;
+      this.getByPage();
+    },
+    indexMethod(index) {
+      return (index + 1) * 1;
+    },
+    sortHandler(column) {
+      // 排序查询
+      console.log(column.column.sortable);
+      const key = column.column.sortable;
+      const value = column.order;
+      this.page.sorted = {};
+      this.page.sorted[key] = value;
+      this.getByPage();
+    },
+    toAdd() {
+      // 跳转到添加
+      this.oilCompanyInfo = {};
+      this.addDialog = true;
+    },
+    toAddAuth(id) {
+      // 跳转添加认证信息
+      oilCompanyInfoApi.get(id).then((res) => {
+        this.oilCompanyInfo = res.data;
+        this.addAuthDialog = true;
+      });
+    },
+    handleSelectionChange(val) {
+      // 选择表格数据
+      this.multipleSelection = val;
+    },
+    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;
+.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;
-      }
+    .el-input,
+    .el-select {
+      width: 183px;
+      height: 40px;
     }
 
-    .table {
-      overflow: hidden;
-      margin: 0 20px;
-      padding-bottom: 20px;
-      background: #fff;
-      border-radius: 6px;
-      border: 1px solid #e3e3e5;
+    .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;
+    }
 
-     > .operation {
-        box-sizing: content-box;
-        padding: 15px;
-      }
+    .mr20 {
+      margin-right: 20px;
+    }
 
-      .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;
-      }
+    .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>
diff --git a/src/views/financialCenter/accountManagement/components/recharge.vue b/src/views/financialCenter/accountManagement/components/recharge.vue
index 5ce448c..da2d698 100644
--- a/src/views/financialCenter/accountManagement/components/recharge.vue
+++ b/src/views/financialCenter/accountManagement/components/recharge.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     title="充值"
-    :visible="controlWindows.recharge"
+    :visible.sync="controlWindows.recharge"
     width="30%"
     :before-close="closeWindow"
     @opened="openDrawer"
diff --git a/src/views/financialCenter/billDetails/index.vue b/src/views/financialCenter/billDetails/index.vue
index 66bd0ea..de9e271 100644
--- a/src/views/financialCenter/billDetails/index.vue
+++ b/src/views/financialCenter/billDetails/index.vue
@@ -129,7 +129,7 @@
       direction="ltr"
       size="60%"
       :withHeader="false"
-      :visible="controlWindows.detail"
+      :visible.sync="controlWindows.detail"
     >
       <general-details
         title="详情"
diff --git a/src/views/financialCenter/enterpriseRecharge/components/add.vue b/src/views/financialCenter/enterpriseRecharge/components/add.vue
index 9df9e48..8f69055 100644
--- a/src/views/financialCenter/enterpriseRecharge/components/add.vue
+++ b/src/views/financialCenter/enterpriseRecharge/components/add.vue
@@ -3,7 +3,7 @@
     :title="controlWindows.addInfo.title"
     direction="ltr"
     size="50%"
-    :visible="controlWindows.add"
+    :visible.sync="controlWindows.add"
     @opened="openDrawer"
     :before-close="closeWindow"
   >
@@ -273,7 +273,7 @@ export default {
     // 公司change
     companyChange(id) {
       if (id) {
-        serve.getByCompanyIdSec(id).then((res) => {
+        serve.getByCompanyId(id).then((res) => {
           this.companyFinance = res.data;
         });
       }
diff --git a/src/views/financialCenter/enterpriseRecharge/components/addTurn.vue b/src/views/financialCenter/enterpriseRecharge/components/addTurn.vue
index 0aa7c45..b6a3c77 100644
--- a/src/views/financialCenter/enterpriseRecharge/components/addTurn.vue
+++ b/src/views/financialCenter/enterpriseRecharge/components/addTurn.vue
@@ -3,7 +3,7 @@
     :title="controlWindows.addInfo.title"
     direction="ltr"
     size="50%"
-    :visible="controlWindows.addTurn"
+    :visible.sync="controlWindows.addTurn"
     @opened="openDrawer"
     :before-close="closeWindow"
   >
@@ -92,6 +92,7 @@
 
 <script>
 import serve from "api/financialCenter/enterpriseRecharge.js";
+import commonServe from "api/common.js";
 
 import autocomplete from "components/autocomplete/index.vue";
 
@@ -184,7 +185,7 @@ export default {
     // 公司财务信息
     companyChange(id) {
       if (id) {
-        serve.getByCompanyIdSec(id).then((res) => {
+        serve.getByCompanyId(id).then((res) => {
           this.companyFinance = res.data;
           this.getByCompanyId(res.data.companyId);
         });
@@ -192,7 +193,7 @@ export default {
     },
     //
     getByCompanyId(id) {
-      serve.getByCompanyId(id).then((res) => {
+      commonServe.getByCompanyId(id).then((res) => {
         this.companyInfo = res.data;
       });
     },
diff --git a/src/views/financialCenter/enterpriseRecharge/index.vue b/src/views/financialCenter/enterpriseRecharge/index.vue
index 90c3187..13541f2 100644
--- a/src/views/financialCenter/enterpriseRecharge/index.vue
+++ b/src/views/financialCenter/enterpriseRecharge/index.vue
@@ -264,7 +264,7 @@
       direction="ltr"
       size="60%"
       :withHeader="false"
-      :visible="controlWindows.detail"
+      :visible.sync="controlWindows.detail"
     >
       <general-details
         title="详情"
@@ -555,7 +555,7 @@ export default {
     detail(row) {
       Promise.all([
         serve.get(row.id),
-        serve.getByCompanyId(row.companyId),
+        commonServe.getByCompanyId(row.companyId),
       ]).then(([firstRes, secondRes]) => {
         this.oilCompanyMatch = { ...firstRes.data, ...secondRes.data };
         this.controlWindows.detail = true;
diff --git a/src/views/financialCenter/enterpriseRechargeDetails/index.vue b/src/views/financialCenter/enterpriseRechargeDetails/index.vue
index 0478afb..2cb9e4a 100644
--- a/src/views/financialCenter/enterpriseRechargeDetails/index.vue
+++ b/src/views/financialCenter/enterpriseRechargeDetails/index.vue
@@ -178,7 +178,7 @@
       direction="ltr"
       size="60%"
       :withHeader="false"
-      :visible="controlWindows.detail"
+      :visible.sync="controlWindows.detail"
     >
       <general-details
         title="详情"
@@ -252,24 +252,7 @@ export default {
         total: 0,
         params: {},
       },
-      // rechargeTypeEnum: [
-      //   {
-      //     label: "充值",
-      //     value: "RECHARGE",
-      //   },
-      //   {
-      //     label: "销账",
-      //     value: "REVOKE",
-      //   },
-      //   {
-      //     label: "赊销",
-      //     value: "CHARGE_SALES",
-      //   },
-      //   {
-      //     label: "消费返利",
-      //     value: "CONSUME_REBATE",
-      //   },
-      // ],
+
       LoopBackTypeEnum: [
         {
           label: "充值圈回",
@@ -289,38 +272,6 @@ export default {
         },
       ],
 
-      // 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: [
         {
@@ -412,7 +363,7 @@ export default {
     detail(row) {
       Promise.all([
         serve.get(row.id),
-        serve.getByCompanyId(row.companyId),
+        commonServe.getByCompanyId(row.companyId),
       ]).then(([firstRes, secondRes]) => {
         this.oilCompanyMatch = { ...firstRes.data, ...secondRes.data };
 
diff --git a/src/views/product/components/add.vue b/src/views/product/components/add.vue
index 8bb95fc..dfbd6db 100644
--- a/src/views/product/components/add.vue
+++ b/src/views/product/components/add.vue
@@ -3,7 +3,7 @@
     :title="controlWindows.addInfo.title"
     direction="ltr"
     size="40%"
-    :visible="controlWindows.add"
+    :visible.sync="controlWindows.add"
     @opened="openDrawer"
     :before-close="closeWindow"
   >
diff --git a/src/views/product/components/adjust.vue b/src/views/product/components/adjust.vue
index 125fb9a..ffc97f4 100644
--- a/src/views/product/components/adjust.vue
+++ b/src/views/product/components/adjust.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     title="调价"
-    :visible="controlWindows.adjust"
+    :visible.sync="controlWindows.adjust"
     width="30%"
     :before-close="closeWindow"
     @opened="openDrawer"
diff --git a/src/views/product/components/batch.vue b/src/views/product/components/batch.vue
index 39a9104..381c54b 100644
--- a/src/views/product/components/batch.vue
+++ b/src/views/product/components/batch.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     title="批量修改"
-    :visible="controlWindows.batch"
+    :visible.sync="controlWindows.batch"
     width="30%"
     :before-close="closeWindow"
     @opened="openDrawer"
diff --git a/src/views/product/components/create.vue b/src/views/product/components/create.vue
index 0727492..bd375af 100644
--- a/src/views/product/components/create.vue
+++ b/src/views/product/components/create.vue
@@ -3,7 +3,7 @@
     title="创建订单"
     direction="ltr"
     size="40%"
-    :visible="controlWindows.create"
+    :visible.sync="controlWindows.create"
     @opened="openDrawer"
     :before-close="closeWindow"
   >
diff --git a/src/views/product/components/record.vue b/src/views/product/components/record.vue
index d3dedaa..34f3d33 100644
--- a/src/views/product/components/record.vue
+++ b/src/views/product/components/record.vue
@@ -3,7 +3,7 @@
     title="调价记录"
     direction="ltr"
     size="60%"
-    :visible="controlWindows.record"
+    :visible.sync="controlWindows.record"
     :before-close="closeWindow"
     @opened="openDrawer"
   >
diff --git a/src/views/product/index.vue b/src/views/product/index.vue
index b6056d6..273d3e4 100644
--- a/src/views/product/index.vue
+++ b/src/views/product/index.vue
@@ -170,7 +170,7 @@
       direction="ltr"
       size="60%"
       :withHeader="false"
-      :visible="controlWindows.detail"
+      :visible.sync="controlWindows.detail"
     >
       <general-details
         title="详情"
diff --git a/src/views/refineryAccount/components/add.vue b/src/views/refineryAccount/components/add.vue
index b493cb3..af8a2f9 100644
--- a/src/views/refineryAccount/components/add.vue
+++ b/src/views/refineryAccount/components/add.vue
@@ -3,7 +3,7 @@
     :title="controlWindows.addInfo.title"
     direction="ltr"
     size="40%"
-    :visible="controlWindows.add"
+    :visible.sync="controlWindows.add"
     @opened="openDrawer"
     :before-close="closeWindow"
   >
diff --git a/src/views/refineryAccount/index.vue b/src/views/refineryAccount/index.vue
index 61bda8a..9f22710 100644
--- a/src/views/refineryAccount/index.vue
+++ b/src/views/refineryAccount/index.vue
@@ -121,7 +121,7 @@
       direction="ltr"
       size="60%"
       :withHeader="false"
-      :visible="controlWindows.detail"
+      :visible.sync="controlWindows.detail"
     >
       <general-details
         title="详情"
diff --git a/src/views/refineryInfo/components/add.vue b/src/views/refineryInfo/components/add.vue
index dda78cd..8cedf52 100644
--- a/src/views/refineryInfo/components/add.vue
+++ b/src/views/refineryInfo/components/add.vue
@@ -3,7 +3,7 @@
     :title="controlWindows.addInfo.title"
     direction="ltr"
     size="40%"
-    :visible="controlWindows.add"
+    :visible.sync="controlWindows.add"
     @opened="openDrawer"
     :before-close="closeWindow"
   >
diff --git a/src/views/refineryInfo/index.vue b/src/views/refineryInfo/index.vue
index ecb5f23..68deadb 100644
--- a/src/views/refineryInfo/index.vue
+++ b/src/views/refineryInfo/index.vue
@@ -150,7 +150,7 @@
       direction="ltr"
       size="60%"
       :withHeader="false"
-      :visible="controlWindows.detail"
+      :visible.sync="controlWindows.detail"
     >
       <general-details
         title="详情"

From 72a2bd9f07b660d1b225095d040d1cb915792e56 Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Tue, 21 Feb 2023 16:27:53 +0800
Subject: [PATCH 09/18] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/customerManagement/companyManagement/index.vue     | 5 ++---
 src/views/financialCenter/accountManagement/index.vue        | 5 ++---
 src/views/financialCenter/billDetails/index.vue              | 5 ++---
 src/views/financialCenter/enterpriseRecharge/index.vue       | 5 ++---
 .../financialCenter/enterpriseRechargeDetails/index.vue      | 5 ++---
 src/views/product/index.vue                                  | 5 ++---
 src/views/refineryAccount/index.vue                          | 5 ++---
 src/views/refineryInfo/index.vue                             | 5 ++---
 8 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/src/views/customerManagement/companyManagement/index.vue b/src/views/customerManagement/companyManagement/index.vue
index cfb8863..a8d69e9 100644
--- a/src/views/customerManagement/companyManagement/index.vue
+++ b/src/views/customerManagement/companyManagement/index.vue
@@ -763,12 +763,11 @@ export default {
     },
     //重置
     reset() {
-      this.parameter = {
+      Object.assign(this.parameter, {
         currentPage: 1,
         pageSize: 10,
-        total: 0,
         params: {},
-      };
+      });
       this.initDateTime();
     },
     // init时间
diff --git a/src/views/financialCenter/accountManagement/index.vue b/src/views/financialCenter/accountManagement/index.vue
index 1c220ab..59a2ac8 100644
--- a/src/views/financialCenter/accountManagement/index.vue
+++ b/src/views/financialCenter/accountManagement/index.vue
@@ -312,12 +312,11 @@ export default {
     },
     //重置
     reset() {
-      this.parameter = {
+      Object.assign(this.parameter, {
         currentPage: 1,
         pageSize: 10,
-        total: 0,
         params: {},
-      };
+      });
     },
     closeDialog() {
       this.controlWindows.recharge = false;
diff --git a/src/views/financialCenter/billDetails/index.vue b/src/views/financialCenter/billDetails/index.vue
index de9e271..b7f6db2 100644
--- a/src/views/financialCenter/billDetails/index.vue
+++ b/src/views/financialCenter/billDetails/index.vue
@@ -378,12 +378,11 @@ export default {
     },
     //重置
     reset() {
-      this.parameter = {
+      Object.assign(this.parameter, {
         currentPage: 1,
         pageSize: 10,
-        total: 0,
         params: {},
-      };
+      });
     },
 
     // table height
diff --git a/src/views/financialCenter/enterpriseRecharge/index.vue b/src/views/financialCenter/enterpriseRecharge/index.vue
index 13541f2..32425cf 100644
--- a/src/views/financialCenter/enterpriseRecharge/index.vue
+++ b/src/views/financialCenter/enterpriseRecharge/index.vue
@@ -598,12 +598,11 @@ export default {
     },
     //重置
     reset() {
-      this.parameter = {
+      Object.assign(this.parameter, {
         currentPage: 1,
         pageSize: 10,
-        total: 0,
         params: {},
-      };
+      });
       this.initDateTime();
     },
     // init时间
diff --git a/src/views/financialCenter/enterpriseRechargeDetails/index.vue b/src/views/financialCenter/enterpriseRechargeDetails/index.vue
index 2cb9e4a..d5b1f8a 100644
--- a/src/views/financialCenter/enterpriseRechargeDetails/index.vue
+++ b/src/views/financialCenter/enterpriseRechargeDetails/index.vue
@@ -406,12 +406,11 @@ export default {
     },
     //重置
     reset() {
-      this.parameter = {
+      Object.assign(this.parameter, {
         currentPage: 1,
         pageSize: 10,
-        total: 0,
         params: {},
-      };
+      });
       this.initDateTime();
     },
     // init时间
diff --git a/src/views/product/index.vue b/src/views/product/index.vue
index 273d3e4..0a5f990 100644
--- a/src/views/product/index.vue
+++ b/src/views/product/index.vue
@@ -354,12 +354,11 @@ export default {
     },
     //重置
     reset() {
-      this.parameter = {
+      Object.assign(this.parameter, {
         currentPage: 1,
         pageSize: 10,
-        total: 0,
         params: {},
-      };
+      });
     },
     // table height
     heightHandle() {
diff --git a/src/views/refineryAccount/index.vue b/src/views/refineryAccount/index.vue
index 9f22710..f129092 100644
--- a/src/views/refineryAccount/index.vue
+++ b/src/views/refineryAccount/index.vue
@@ -266,12 +266,11 @@ export default {
     },
     //重置
     reset() {
-      this.parameter = {
+      Object.assign(this.parameter, {
         currentPage: 1,
         pageSize: 10,
-        total: 0,
         params: {},
-      };
+      });
     },
     // table height
     heightHandle() {
diff --git a/src/views/refineryInfo/index.vue b/src/views/refineryInfo/index.vue
index 68deadb..6a86023 100644
--- a/src/views/refineryInfo/index.vue
+++ b/src/views/refineryInfo/index.vue
@@ -309,12 +309,11 @@ export default {
     },
     //重置
     reset() {
-      this.parameter = {
+      Object.assign(this.parameter, {
         currentPage: 1,
         pageSize: 10,
-        total: 0,
         params: {},
-      };
+      });
     },
     // table height
     heightHandle() {

From d7c64b72ba34e38358075a91e918f935892f00ee Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Tue, 21 Feb 2023 16:37:24 +0800
Subject: [PATCH 10/18] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../enterpriseRecharge/components/add.vue       | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/views/financialCenter/enterpriseRecharge/components/add.vue b/src/views/financialCenter/enterpriseRecharge/components/add.vue
index 8f69055..ca14abc 100644
--- a/src/views/financialCenter/enterpriseRecharge/components/add.vue
+++ b/src/views/financialCenter/enterpriseRecharge/components/add.vue
@@ -18,7 +18,7 @@
         </el-form-item>
         <el-form-item label="交易类型" prop="transactionType">
           <el-select
-            :disabled="form.id"
+            :disabled="!!form.id"
             v-model="form.transactionType"
             placeholder="请选择交易类型"
             @change="changeTransactionType"
@@ -111,6 +111,7 @@
             :on-remove="handleRemove"
             :on-success="handleSuccess"
             :limit="1"
+            :file-list="fileList"
           >
             <i class="el-icon-plus"></i>
           </el-upload>
@@ -139,7 +140,6 @@
 
 <script>
 import serve from "api/financialCenter/enterpriseRecharge.js";
-import commonServe from "api/common.js";
 
 import autocomplete from "components/autocomplete/index.vue";
 
@@ -174,10 +174,10 @@ export default {
         JSESSIONID: JSESSIONID,
         token: utils.bcrypt(JSESSIONID),
       },
+      fileList: [],
       cascaderList: [],
       companyFinance: {},
       form: {},
-      refineryList: [],
       configAutocomplete: {
         serveTarget: serve.getLikeByNameSuccess,
         autocompleteKey: "name",
@@ -259,8 +259,15 @@ export default {
     openDrawer() {
       let { id } = this.controlWindows.addInfo;
       //回显
-      id &&
-        (this.form = JSON.parse(JSON.stringify(this.controlWindows.addInfo)));
+      if (id) {
+        this.form = JSON.parse(JSON.stringify(this.controlWindows.addInfo));
+
+        if (this.form.offlineTransactionProof) {
+          this.fileList.push({
+            url: this.form.offlineTransactionProof,
+          });
+        }
+      }
       let configUpdata = id
         ? { echoId: id, echoName: this.form.refineryName, isDisabled: true }
         : {

From 526c1e9e4ce760901f674e8b6a2667908aa0d39c Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Tue, 21 Feb 2023 16:59:58 +0800
Subject: [PATCH 11/18] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../enterpriseRecharge/components/add.vue     | 23 +++++--------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/src/views/financialCenter/enterpriseRecharge/components/add.vue b/src/views/financialCenter/enterpriseRecharge/components/add.vue
index ca14abc..8567073 100644
--- a/src/views/financialCenter/enterpriseRecharge/components/add.vue
+++ b/src/views/financialCenter/enterpriseRecharge/components/add.vue
@@ -55,7 +55,7 @@
         </el-form-item>
 
         <template v-if="form.transactionType === 'RECHARGE'">
-          <el-form-item label="企业收款账户" prop="companyBankCardArr">
+          <el-form-item label="企业收款账户">
             <el-cascader
               :options="cascaderList"
               v-model="form.companyBankCardArr"
@@ -102,7 +102,6 @@
             form.transactionType === 'RECHARGE'
           "
           label="线下交易凭证"
-          prop="offlineTransactionProof"
         >
           <el-upload
             :action="uploadUrl"
@@ -120,7 +119,7 @@
           </el-dialog>
         </el-form-item>
 
-        <el-form-item label="交易说明" prop="reverseRemark">
+        <el-form-item label="交易说明">
           <el-input
             type="textarea"
             :rows="2"
@@ -158,10 +157,10 @@ export default {
       if (this.form.companyId) callback();
       else callback("请选择公司");
     };
-    let validatorofflineTransactionProof = (rule, value, callback) => {
-      if (this.form.offlineTransactionProof) callback();
-      else callback("请上传凭证");
-    };
+    // let validatorofflineTransactionProof = (rule, value, callback) => {
+    //   if (this.form.offlineTransactionProof) callback();
+    //   else callback("请上传凭证");
+    // };
     return {
       uploadUrl:
         process.env.VUE_APP_ENV === "development"
@@ -198,13 +197,6 @@ export default {
         transactionAmount: [
           { required: true, message: "请输入交易金额", trigger: "blur" },
         ],
-        offlineTransactionProof: [
-          {
-            required: true,
-            validator: validatorofflineTransactionProof,
-            trigger: "change",
-          },
-        ],
         offlinePaymentCompany: [
           {
             required: true,
@@ -233,9 +225,6 @@ export default {
             trigger: "change",
           },
         ],
-        reverseRemark: [
-          { required: true, message: "请输入交易说明", trigger: "blur" },
-        ],
       },
     };
   },

From e27c49a6b9b4465ed4c90771665561c6cb12aa40 Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Tue, 21 Feb 2023 17:20:11 +0800
Subject: [PATCH 12/18] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/financialCenter/enterpriseRecharge.js      | 14 +++++++-------
 src/views/financialCenter/billDetails/index.vue    |  1 +
 .../enterpriseRecharge/components/add.vue          |  5 +++--
 .../enterpriseRecharge/components/addTurn.vue      |  2 +-
 .../financialCenter/enterpriseRecharge/index.vue   |  2 +-
 .../enterpriseRechargeDetails/index.vue            |  2 +-
 vue.config.js                                      |  2 +-
 7 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/api/financialCenter/enterpriseRecharge.js b/src/api/financialCenter/enterpriseRecharge.js
index e09528d..c9965d7 100644
--- a/src/api/financialCenter/enterpriseRecharge.js
+++ b/src/api/financialCenter/enterpriseRecharge.js
@@ -31,12 +31,12 @@ const getCascaderList = () => {
   return request.get("/oil-finance/internalCompany/getCascaderList");
 };
 //公司 远程搜索
-const getLikeByNameSuccess = (params) => {
-  return request.postJson(
-    "/oil-user/oilCompanyInfo/getLikeByNameSuccess",
-    params
-  );
-};
+// const getLikeByNameSuccess = (params) => {
+//   return request.postJson(
+//     "/oil-user/oilCompanyInfo/getLikeByNameSuccess",
+//     params
+//   );
+// };
 
 export default {
   getByPage,
@@ -45,5 +45,5 @@ export default {
   save,
   update,
   getCascaderList,
-  getLikeByNameSuccess,
+  // getLikeByNameSuccess,
 };
diff --git a/src/views/financialCenter/billDetails/index.vue b/src/views/financialCenter/billDetails/index.vue
index b7f6db2..ca9cef6 100644
--- a/src/views/financialCenter/billDetails/index.vue
+++ b/src/views/financialCenter/billDetails/index.vue
@@ -352,6 +352,7 @@ export default {
     },
     //table list
     getByPage() {
+      this.parameter.params["companyType"] = "4";
       serve.getByPage(this.parameter).then((res) => {
         this.tableData = res.data.list;
         this.parameter.total = res.data.totalCount;
diff --git a/src/views/financialCenter/enterpriseRecharge/components/add.vue b/src/views/financialCenter/enterpriseRecharge/components/add.vue
index 8567073..a002122 100644
--- a/src/views/financialCenter/enterpriseRecharge/components/add.vue
+++ b/src/views/financialCenter/enterpriseRecharge/components/add.vue
@@ -139,6 +139,7 @@
 
 <script>
 import serve from "api/financialCenter/enterpriseRecharge.js";
+import commonServe from "api/common.js";
 
 import autocomplete from "components/autocomplete/index.vue";
 
@@ -178,7 +179,7 @@ export default {
       companyFinance: {},
       form: {},
       configAutocomplete: {
-        serveTarget: serve.getLikeByNameSuccess,
+        serveTarget: commonServe.getRefineryCompanyList,
         autocompleteKey: "name",
         labelKey: "name",
         valueKey: "id",
@@ -305,7 +306,7 @@ export default {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           let params = { transactionType: "RECHARGE", ...this.form };
-          this.judgeInterface(this.form).then((res) => {
+          this.judgeInterface(params).then((res) => {
             this.$message.success(res.msg);
             this.closeWindow();
           });
diff --git a/src/views/financialCenter/enterpriseRecharge/components/addTurn.vue b/src/views/financialCenter/enterpriseRecharge/components/addTurn.vue
index b6a3c77..579bb81 100644
--- a/src/views/financialCenter/enterpriseRecharge/components/addTurn.vue
+++ b/src/views/financialCenter/enterpriseRecharge/components/addTurn.vue
@@ -114,7 +114,7 @@ export default {
       companyInfo: {},
       form: {},
       configAutocomplete: {
-        serveTarget: serve.getLikeByNameSuccess,
+        serveTarget: commonServe.getRefineryCompanyList,
         autocompleteKey: "name",
         labelKey: "name",
         valueKey: "id",
diff --git a/src/views/financialCenter/enterpriseRecharge/index.vue b/src/views/financialCenter/enterpriseRecharge/index.vue
index 32425cf..0e979c4 100644
--- a/src/views/financialCenter/enterpriseRecharge/index.vue
+++ b/src/views/financialCenter/enterpriseRecharge/index.vue
@@ -518,7 +518,7 @@ export default {
     },
     //table list
     getByPage() {
-      // this.parameter.params.companyAccountType = "4";
+      this.parameter.params["companyAccountType"] = "4";
       serve.getByPage(this.parameter).then((res) => {
         this.tableData = res.data.list;
         this.parameter.total = res.data.totalCount;
diff --git a/src/views/financialCenter/enterpriseRechargeDetails/index.vue b/src/views/financialCenter/enterpriseRechargeDetails/index.vue
index d5b1f8a..992893f 100644
--- a/src/views/financialCenter/enterpriseRechargeDetails/index.vue
+++ b/src/views/financialCenter/enterpriseRechargeDetails/index.vue
@@ -349,7 +349,7 @@ export default {
     },
     //table list
     getByPage() {
-      // this.parameter.params.companyAccountType = "4";
+      this.parameter.params["companyAccountType"] = "4";
       serve.getByPage(this.parameter).then((res) => {
         this.tableData = res.data.list;
         this.parameter.total = res.data.totalCount;
diff --git a/vue.config.js b/vue.config.js
index 990d1a4..15c7aa3 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -29,7 +29,7 @@ module.exports = {
       [process.env.VUE_APP_BASE_API]: {
         // target: `https://3816t6291y.oicp.vip`,
         // target: 'https://6l438d1757.zicp.fun',
-        target: "http://192.168.110.10:38080",
+        target: "http://192.168.110.230:38080",
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",

From d2a10fe313f7e088269cb164160a27d3c154bd2c Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Tue, 21 Feb 2023 18:09:32 +0800
Subject: [PATCH 13/18] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/financialCenter/enterpriseRecharge.js |  9 +++
 .../enterpriseRecharge/components/examine.vue | 54 ++++++++++++++
 .../enterpriseRecharge/index.vue              | 71 +++++++++++++++++--
 3 files changed, 128 insertions(+), 6 deletions(-)
 create mode 100644 src/views/financialCenter/enterpriseRecharge/components/examine.vue

diff --git a/src/api/financialCenter/enterpriseRecharge.js b/src/api/financialCenter/enterpriseRecharge.js
index c9965d7..1f219ec 100644
--- a/src/api/financialCenter/enterpriseRecharge.js
+++ b/src/api/financialCenter/enterpriseRecharge.js
@@ -30,6 +30,14 @@ const update = (params) => {
 const getCascaderList = () => {
   return request.get("/oil-finance/internalCompany/getCascaderList");
 };
+// 审核
+const audit = (params) => {
+  return request.postJson(
+    "/oil-finance/oilCompanyAccountReverse/refinery/audit",
+    params
+  );
+};
+
 //公司 远程搜索
 // const getLikeByNameSuccess = (params) => {
 //   return request.postJson(
@@ -45,5 +53,6 @@ export default {
   save,
   update,
   getCascaderList,
+  audit,
   // getLikeByNameSuccess,
 };
diff --git a/src/views/financialCenter/enterpriseRecharge/components/examine.vue b/src/views/financialCenter/enterpriseRecharge/components/examine.vue
new file mode 100644
index 0000000..1a94afb
--- /dev/null
+++ b/src/views/financialCenter/enterpriseRecharge/components/examine.vue
@@ -0,0 +1,54 @@
+<template>
+  <el-dialog
+    :title="controlWindows.addInfo.title"
+    :visible.sync="controlWindows.examine"
+    width="40%"
+  >
+    <el-input
+      type="textarea"
+      :rows="2"
+      :placeholder="controlWindows.addInfo.placeholder"
+      v-model="auditRemark"
+    >
+    </el-input>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="closeWindow">取 消</el-button>
+      <el-button type="primary" @click="submit">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import serve from "api/financialCenter/enterpriseRecharge.js";
+export default {
+  props: {
+    controlWindows: Object,
+  },
+  data() {
+    return {
+      auditRemark: "",
+    };
+  },
+  methods: {
+    closeWindow() {
+      this.auditRemark = "";
+      this.controlWindows.addInfo = {};
+      this.$emit("closeWindow");
+      this.controlWindows.examine = false;
+    },
+    submit() {
+      serve
+        .audit({
+          auditRemark: this.auditRemark,
+          ...this.controlWindows.addInfo,
+        })
+        .then((res) => {
+          this.$message.success(res.msg);
+          this.closeWindow();
+        });
+    },
+  },
+};
+</script>
+
+<style></style>
diff --git a/src/views/financialCenter/enterpriseRecharge/index.vue b/src/views/financialCenter/enterpriseRecharge/index.vue
index 0e979c4..b4dd54b 100644
--- a/src/views/financialCenter/enterpriseRecharge/index.vue
+++ b/src/views/financialCenter/enterpriseRecharge/index.vue
@@ -195,12 +195,20 @@
         </el-table-column>
         <el-table-column label="交易审核标识" show-overflow-tooltip>
           <template slot-scope="{ row }">
-            {{
-              auditMarkEnum.find((item) => item.value === row.auditMark).label
-            }}
+            <el-button
+              @click="examine(row)"
+              :type="
+                auditMarkEnum.find((item) => item.value === row.auditMark).type
+              "
+              size="mini"
+              >{{
+                auditMarkEnum.find((item) => item.value === row.auditMark).label
+              }}</el-button
+            >
           </template>
         </el-table-column>
-        <el-table-column label="赊账还款审核">
+
+        <!-- <el-table-column label="赊账还款审核">
           <template slot-scope="{ row }">
             <p v-if="row.transactionType && row.chargeSalesAuditMark">
               {{
@@ -214,7 +222,7 @@
               }}
             </p>
           </template>
-        </el-table-column>
+        </el-table-column> -->
 
         <el-table-column
           prop="createTime"
@@ -256,7 +264,9 @@
       <!-- 分页 -->
       <pagination :parameter="parameter" @searchAgain="getByPage" />
     </div>
+    <!-- 企业充值 -->
     <add :controlWindows="controlWindows" @closeWindow="search" />
+    <!-- 圈回 -->
     <add-turn :controlWindows="controlWindows" @closeWindow="search" />
     <!-- 详情 -->
     <el-drawer
@@ -280,8 +290,14 @@
             :src="oilCompanyMatch.offlineTransactionProof"
           />
         </template>
+        <template v-if="controlWindows.addInfo.examineMark" #footer>
+          <el-button type="success" @click="examineAdopt">审核通过</el-button>
+          <el-button type="danger" @click="examineFail">审核不通过</el-button>
+        </template>
       </general-details>
     </el-drawer>
+    <!-- 审核 -->
+    <examine :controlWindows="controlWindows" @closeWindow="search" />
   </div>
 </template>
 
@@ -291,6 +307,7 @@ import commonServe from "api/common.js";
 
 import add from "./components/add.vue";
 import addTurn from "./components/addTurn.vue";
+import examine from "./components/examine.vue";
 
 import autocomplete from "components/autocomplete/index.vue";
 import pagination from "components/pagination/index.vue";
@@ -306,6 +323,8 @@ export default {
   components: {
     add,
     addTurn,
+    examine,
+
     pagination,
     autocomplete,
     generalDetails,
@@ -317,6 +336,7 @@ export default {
         addTurn: false,
         addInfo: {},
         detail: false,
+        examine: false,
       },
       rechargeTypeEnum: [
         {
@@ -337,14 +357,17 @@ export default {
         {
           label: "待审核",
           value: 0,
+          type: "warning",
         },
         {
-          label: "已审核",
+          label: "审核通过",
           value: 1,
+          type: "success",
         },
         {
           label: "审核失败",
           value: -1,
+          type: "danger",
         },
       ],
 
@@ -538,6 +561,41 @@ export default {
       };
       this.controlWindows.addTurn = true;
     },
+    // 审核
+    examine(row) {
+      Promise.all([
+        serve.get(row.id),
+        commonServe.getByCompanyId(row.companyId),
+      ]).then(([firstRes, secondRes]) => {
+        this.oilCompanyMatch = { ...firstRes.data, ...secondRes.data };
+        // this.controlWindows.addInfo.examineMark = row.auditMark === 0;
+        this.controlWindows.addInfo = {
+          examineMark: row.auditMark === 0,
+          id: row.id,
+        };
+        this.controlWindows.detail = true;
+      });
+    },
+    // 审核通过
+    examineAdopt() {
+      Object.assign(this.controlWindows.addInfo, {
+        title: "交易审核通过说明",
+        placeholder: "请输入交易审核通过说明",
+        auditMark: 1,
+        updateSource: "",
+      });
+      this.controlWindows.examine = true;
+    },
+    // 审核不通过
+    examineFail() {
+      Object.assign(this.controlWindows.addInfo, {
+        title: "交易审核不通过说明",
+        placeholder: "请输入交易审核不通过说明",
+        auditMark: -1,
+        updateSource: "",
+      });
+      this.controlWindows.examine = true;
+    },
     // 更多
     commandMore(val, row) {
       this.controlWindows.addInfo = {
@@ -558,6 +616,7 @@ export default {
         commonServe.getByCompanyId(row.companyId),
       ]).then(([firstRes, secondRes]) => {
         this.oilCompanyMatch = { ...firstRes.data, ...secondRes.data };
+        this.controlWindows.addInfo.examineMark = false;
         this.controlWindows.detail = true;
       });
     },

From 31deda59a998b0ee5c660f03d5ab1f4860e32dee Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Tue, 21 Feb 2023 18:10:53 +0800
Subject: [PATCH 14/18] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/financialCenter/enterpriseRecharge/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/financialCenter/enterpriseRecharge/index.vue b/src/views/financialCenter/enterpriseRecharge/index.vue
index b4dd54b..b18af49 100644
--- a/src/views/financialCenter/enterpriseRecharge/index.vue
+++ b/src/views/financialCenter/enterpriseRecharge/index.vue
@@ -582,7 +582,7 @@ export default {
         title: "交易审核通过说明",
         placeholder: "请输入交易审核通过说明",
         auditMark: 1,
-        updateSource: "",
+        updateSource: "REFINERY_OMS_WEB",
       });
       this.controlWindows.examine = true;
     },
@@ -592,7 +592,7 @@ export default {
         title: "交易审核不通过说明",
         placeholder: "请输入交易审核不通过说明",
         auditMark: -1,
-        updateSource: "",
+        updateSource: "REFINERY_OMS_WEB",
       });
       this.controlWindows.examine = true;
     },

From b41b738cbb71e49d69272a43de2229b25e3c50aa Mon Sep 17 00:00:00 2001
From: KongDuo <zhengmingking@163.com>
Date: Wed, 22 Feb 2023 08:41:57 +0800
Subject: [PATCH 15/18] =?UTF-8?q?=E5=85=AC=E5=8F=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OilCompanyInfoUpdate.vue                  | 219 ++++++++++++++++++
 .../companyManagement/index.vue               |  31 ++-
 2 files changed, 241 insertions(+), 9 deletions(-)
 create mode 100644 src/views/customerManagement/companyManagement/OilCompanyInfoUpdate.vue

diff --git a/src/views/customerManagement/companyManagement/OilCompanyInfoUpdate.vue b/src/views/customerManagement/companyManagement/OilCompanyInfoUpdate.vue
new file mode 100644
index 0000000..93e9938
--- /dev/null
+++ b/src/views/customerManagement/companyManagement/OilCompanyInfoUpdate.vue
@@ -0,0 +1,219 @@
+<template>
+  <div>
+    <el-row>
+      <el-form ref="form" :rules="rules" :model="updateOilCompanyInfo" label-width="100px" :size="$store.getters.size">
+        <el-row :gutter="gridNum.row.gutter">
+          <el-col :span="12">
+            <el-form-item label="企业名称" prop="name">
+              <el-input v-model="updateOilCompanyInfo.name" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="企业简称" prop="abbreviaName">
+              <el-input v-model="updateOilCompanyInfo.abbreviaName" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="公司级别" prop="parentMark">
+              <el-select v-model="updateOilCompanyInfo.parentMark" placeholder="请选择">
+                <el-option label="主体公司" :value="0" />
+                <el-option label="分公司" :value="1" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="updateOilCompanyInfo.parentMark === 1" :span="12">
+            <el-form-item label="上级公司" prop="parentId">
+              <el-select v-model="updateOilCompanyInfo.parentId" remote filterable :remote-method="companyOrginQuery" style="width: 100%" placeholder="请输入公司名称">
+                <el-option
+                  v-for="item in queryCompanyList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="企业性质" prop="companyNature">
+              <el-select v-model="updateOilCompanyInfo.companyNature" placeholder="请选择">
+                <el-option label="零售客户" :value="0" />
+                <el-option label="外请客户" :value="1" />
+                <el-option label="渠道客户" :value="2" />
+                <el-option label="存量客户" :value="3" />
+                <el-option label="批发客户" :value="4" />
+                <el-option label="LNG客户" :value="5" />
+                <el-option label="推广业务" :value="6" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="账户类型" prop="companyType">
+              <el-select v-model="updateOilCompanyInfo.companyType" :disabled="updateOilCompanyInfo.auditMark === 1 ? true : false" placeholder="请选择">
+                <el-option label="柴油账户" value="0" />
+                <el-option label="LNG账户" value="2" />
+                <el-option label="汽油账户" value="1" />
+                <el-option label="尿素账户" value="3" />
+                <el-option label="油批账户" value="4" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="企业负责人" prop="businessLeader">
+              <el-select
+                v-model="updateOilCompanyInfo.businessLeader"
+                clearable
+                filterable
+                remote
+                reserve-keyword
+                placeholder="企业负责人姓名或联系方式"
+                :remote-method="userRemoteMethod"
+              >
+                <el-option
+                  v-for="item in userList"
+                  :key="item.id"
+                  :label="item.phone+'('+(item.nickName?item.nickName+'-':'')+item.userCode+')'"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="公司对接类型" prop="companyDockType">
+              <el-select v-model="updateOilCompanyInfo.companyDockType" placeholder="请选择">
+                <el-option label="对接客户" :value="0" />
+                <el-option label="平台客户" :value="1" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-col :span="24" style="text-align: right">
+          <el-button @click="close">取消</el-button>
+          <el-button
+            type="primary"
+            @click="submit"
+          >提交</el-button>
+        </el-col>
+      </el-form>
+    </el-row>
+  </div>
+</template>
+<script>
+import oilCompanyInfoApi from '@/api/customerManagement/oilCompanyInfo'
+import sysCustomerInfoApi from '@/api/user/sysCustomerInfo'
+export default {
+  props: {
+    oilCompanyInfo: {
+      type: Object,
+      default() {
+
+      }
+    }
+  },
+  data() {
+    return {
+      queryCompanyList: [], // 企业列表
+
+      updateOilCompanyInfo: {
+        id: undefined,
+        name: undefined,
+        abbreviaName: undefined,
+        parentMark: undefined,
+        parentId: undefined,
+        companyNature: undefined,
+        updateSource: 'WEBM',
+        businessLeader: ''
+      },
+      userList: [],
+      rules: {
+        name: [
+          { required: true, message: '请输入企业名称', trigger: 'blur' },
+          { min: 3, max: 50, message: '长度在 3 到 50 个字符', trigger: 'blur' }
+        ],
+        abbreviaName: [
+          { min: 1, max: 50, message: '长度在 1 到 50 个字符', trigger: 'blur' }
+        ],
+        parentMark: [
+          { required: true, message: '请选择是否主体公司', trigger: 'change' }
+        ],
+        companyNature: [
+          { required: true, message: '请选择企业性质', trigger: 'change' }
+        ],
+        companyType: [
+          { required: true, message: '请选择账户类型', trigger: 'change' }
+        ],
+        parentId: [
+          { required: true, message: '请选择上级公司', trigger: 'change' }
+        ]
+      },
+      gridNum: {
+        row: {
+          gutter: 2
+        },
+        cols: {
+          xs: 24,
+          sm: 24,
+          md: 12,
+          lg: 12,
+          xl: 6
+        }
+      }
+    }
+  },
+  created() {
+    this.updateOilCompanyInfo = { ...this.oilCompanyInfo }
+    console.log('修改值')
+    console.log(this.updateOilCompanyInfo)
+
+    sysCustomerInfoApi.getByBusinessLeader(this.updateOilCompanyInfo.businessLeader).then(res => {
+      if (res && res.data != null) {
+        this.userList = [res.data]
+      } else {
+        this.userList = []
+      }
+    })
+
+    if (this.oilCompanyInfo.parentMark === 1) {
+      oilCompanyInfoApi.getLikeByName({ 'id': this.updateOilCompanyInfo.parentId }).then(res => {
+        this.queryCompanyList = res.data
+      })
+    }
+  },
+  methods: {
+    companyOrginQuery(value) { // 远程搜索
+      if (value) {
+        oilCompanyInfoApi.getLikeByNameAndId({ name: value, id: this.updateOilCompanyInfo.id }).then(res => {
+          this.queryCompanyList = res.data
+        })
+      }
+    },
+    userRemoteMethod(value) { // 远程搜索
+    if (value) {
+      sysCustomerInfoApi.liekQuery(value).then(res => {
+        this.userList = res.data
+      })
+    }
+    },
+    submit() {
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          this.update(this.updateOilCompanyInfo)
+        }
+      })
+    },
+    update() {
+      if (this.updateOilCompanyInfo.parentMark === 0) {
+        this.updateOilCompanyInfo.parentId = 0
+      }
+      // 更新
+      oilCompanyInfoApi.update(this.updateOilCompanyInfo).then(res => {
+        this.$message.success(res.msg)
+        this.$emit('closeDialog')
+        this.$emit('getByPage')
+      })
+    },
+    close() {
+      this.$emit('closeDialog')
+    }
+  }
+}
+</script>
diff --git a/src/views/customerManagement/companyManagement/index.vue b/src/views/customerManagement/companyManagement/index.vue
index a8d69e9..c81a0d8 100644
--- a/src/views/customerManagement/companyManagement/index.vue
+++ b/src/views/customerManagement/companyManagement/index.vue
@@ -345,10 +345,8 @@
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item @click.native="toUpdate(scope.row.id)">
                   <el-button
-                    v-permission="['company:info:base']"
                     :size="$store.getters.size"
-                    type="text"
-                  >
+                    type="text">
                     <svg-icon icon-class="iconicon-" />
                     基础资料
                   </el-button>
@@ -433,13 +431,19 @@
       </general-details>
     </el-drawer>
 
+
+
+    <!-- 修改弹窗 -->
+    <el-dialog v-el-drag-dialog title="修改" :visible.sync="updateDialog" width="55%">
+      <OilCompanyInfoUpdate v-if="updateDialog" :oil-company-info="oilCompanyInfo" @getByPage="getByPage" @closeDialog="closeDialog" />
+    </el-dialog>
+
     <!-- 添加弹窗 -->
     <el-dialog
       v-el-drag-dialog
       title="添加"
       :visible.sync="addDialog"
-      width="55%"
-    >
+      width="55%">
       <OilCompanyInfoAdd
         v-if="addDialog"
         @getByPage="getByPage"
@@ -463,7 +467,7 @@
 import OilCompanyInfoAdd from "@/views/customerManagement/companyManagement/OilCompanyInfoAdd";
 import serve from "api/financialCenter/enterpriseRechargeDetails.js";
 import commonServe from "api/common.js";
-
+import OilCompanyInfoUpdate from "@/views/customerManagement/companyManagement/OilCompanyInfoUpdate";
 import oilCompanyInfoApi from "@/api/customerManagement/oilCompanyInfo";
 
 import autocomplete from "components/autocomplete/index.vue";
@@ -478,6 +482,7 @@ import {
 
 export default {
   components: {
+    OilCompanyInfoUpdate,
     OilCompanyInfoAdd,
     pagination,
     autocomplete,
@@ -697,8 +702,6 @@ export default {
   methods: {
     search() {
       this.parameter.currentPage = 1;
-      console.log("111111111111111111111");
-      console.log(this.parameter);
       this.getByPage();
     },
     closeDialog() {
@@ -752,7 +755,6 @@ export default {
     // },
     // 启用禁用点击
     enableMarkClike(row) {
-      console.log("111111111111111111111");
       const data = [row];
       oilCompanyInfoApi.updateBatchEnable(data).then((res) => {
         if (res.code === 20000) {
@@ -825,6 +827,17 @@ export default {
       this.oilCompanyInfo = {};
       this.addDialog = true;
     },
+    toUpdate(id) {
+      console.log(id)
+      console.log(this.updateDialog)
+      // 跳转到更新
+      oilCompanyInfoApi.get(id).then(res => {
+        console.log(res)
+        this.oilCompanyInfo = res.data
+        this.updateDialog = true
+        console.log(this.updateDialog)
+      });
+    },
     toAddAuth(id) {
       // 跳转添加认证信息
       oilCompanyInfoApi.get(id).then((res) => {

From 231c1cfbaf1f7f4dbf8c2aebe0af63da3293ae82 Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Wed, 22 Feb 2023 09:03:21 +0800
Subject: [PATCH 16/18] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/dataType.js                         | 15 +++++
 .../enterpriseRecharge/index.vue              | 63 +++++++++++++++++--
 2 files changed, 72 insertions(+), 6 deletions(-)

diff --git a/src/utils/dataType.js b/src/utils/dataType.js
index 22a5192..ccaeece 100644
--- a/src/utils/dataType.js
+++ b/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,
+  },
+];
diff --git a/src/views/financialCenter/enterpriseRecharge/index.vue b/src/views/financialCenter/enterpriseRecharge/index.vue
index b18af49..45ac2e5 100644
--- a/src/views/financialCenter/enterpriseRecharge/index.vue
+++ b/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>

From 03c724211c11fb6b8af10e25f2e3df57c4e41ed1 Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Wed, 22 Feb 2023 09:06:30 +0800
Subject: [PATCH 17/18] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../enterpriseRechargeDetails/index.vue       | 67 +++++++++++++++++++
 1 file changed, 67 insertions(+)

diff --git a/src/views/financialCenter/enterpriseRechargeDetails/index.vue b/src/views/financialCenter/enterpriseRechargeDetails/index.vue
index 992893f..e3954cc 100644
--- a/src/views/financialCenter/enterpriseRechargeDetails/index.vue
+++ b/src/views/financialCenter/enterpriseRechargeDetails/index.vue
@@ -188,6 +188,51 @@
         :mappingData="mappingData"
         @close="controlWindows.detail = false"
       >
+        <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 #offlineTransactionProof>
           <el-image
             style="width: 100px; height: 100px"
@@ -211,6 +256,7 @@ import {
   rechargeTypeEnum,
   rechargeStatusEnum,
   repaymentExamineEnum,
+  accountStatusEnum,
 } from "utils/dataType.js";
 
 export default {
@@ -224,6 +270,7 @@ export default {
       rechargeTypeEnum: rechargeTypeEnum,
       rechargeStatusEnum: rechargeStatusEnum,
       repaymentExamineEnum: repaymentExamineEnum,
+      accountStatusEnum: accountStatusEnum,
       controlWindows: {
         detail: false,
       },
@@ -271,6 +318,23 @@ export default {
           value: 4,
         },
       ],
+      auditMarkEnum: [
+        {
+          label: "待审核",
+          value: 0,
+          type: "warning",
+        },
+        {
+          label: "审核通过",
+          value: 1,
+          type: "success",
+        },
+        {
+          label: "审核失败",
+          value: -1,
+          type: "danger",
+        },
+      ],
 
       oilCompanyMatch: {},
       mappingData: [
@@ -514,5 +578,8 @@ export default {
       font-size: 12px;
     }
   }
+  .ft14 {
+    font-size: 14px;
+  }
 }
 </style>

From 8b007a098fd5c261d9dc94e54d569926e57ede19 Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Wed, 22 Feb 2023 09:10:47 +0800
Subject: [PATCH 18/18] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../financialCenter/billDetails/index.vue     | 29 +++++++++----------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/views/financialCenter/billDetails/index.vue b/src/views/financialCenter/billDetails/index.vue
index ca9cef6..fd3ae07 100644
--- a/src/views/financialCenter/billDetails/index.vue
+++ b/src/views/financialCenter/billDetails/index.vue
@@ -139,6 +139,15 @@
         :mappingData="mappingData"
         @close="controlWindows.detail = false"
       >
+        <template #billType>
+          <p class="ft14">
+            {{
+              rechargeTypeEnum.find(
+                (item) => item.value === oilCompanyMatch.billType
+              ).label
+            }}
+          </p>
+        </template>
         <template #balance>
           <p class="ft14">
             上次:<span>{{ oilCompanyMatch.lastBalance }}</span>
@@ -226,6 +235,8 @@ 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 } from "utils/dataType.js";
 export default {
   components: {
     pagination,
@@ -259,30 +270,16 @@ export default {
           label: "分油",
           value: "SEPARATION_OIL",
         },
-        {
-          label: "充值",
-          value: "RECHARGE",
-        },
         {
           label: "圈回",
           value: "TURN",
         },
-        {
-          label: "销账",
-          value: "REVOKE",
-        },
-        {
-          label: "赊销",
-          value: "CHARGE_SALES",
-        },
+
+        ...rechargeTypeEnum,
         {
           label: "充值返利",
           value: "RECHARGE_REBETE",
         },
-        {
-          label: "消费返利",
-          value: "CONSUME_REBATE",
-        },
       ],
 
       oilCompanyMatch: {},