diff --git a/src/api/common.js b/src/api/common.js
new file mode 100644
index 0000000..81ce3d9
--- /dev/null
+++ b/src/api/common.js
@@ -0,0 +1,29 @@
+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}`
+  );
+};
+
+//公司账户详情
+const getByCompanyId = (query) => {
+  return request.get(`/oil-finance/oilCompanyAccount/getByCompanyId/${query}`);
+};
+//公司财务详情
+const getByCompanyIdFinance = (query) => {
+  return request.get(`/oil-user/oilCompanyFinance/getByCompanyId/${query}`);
+};
+export default {
+  getRefineryCompanyList,
+  liekQuery,
+  getByCompanyId,
+  getByCompanyIdFinance,
+};
diff --git a/src/api/financialCenter/enterpriseRecharge.js b/src/api/financialCenter/enterpriseRecharge.js
new file mode 100644
index 0000000..42756ae
--- /dev/null
+++ b/src/api/financialCenter/enterpriseRecharge.js
@@ -0,0 +1,58 @@
+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-user/oilCompanyFinance/getByCompanyId/${query}`);
+};
+// 新增
+const save = (params) => {
+  return request.postJson("/oil-finance/oilCompanyAccountReverse/save", params);
+};
+// 修改
+const update = (params) => {
+  return request.postPut(
+    "/oil-finance/oilCompanyAccountReverse/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(
+//     "/oil-user/oilCompanyInfo/getLikeByNameSuccess",
+//     params
+//   );
+// };
+
+export default {
+  getByPage,
+  get,
+  getByCompanyId,
+  save,
+  update,
+  getCascaderList,
+  audit,
+  // getLikeByNameSuccess,
+};
diff --git a/src/api/login.js b/src/api/login.js
index 7786ac1..6c74f3c 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -3,17 +3,31 @@ import request from "utils/axios.js";
 const login = (params) => {
   return request.postJson("/oil-identity/oilRefinery/loginCOMSByPwd", params);
 };
+const loginOut = () => {
+  return request.get("/oil-identity/authorization/logout");
+};
 //关联企业
 const getRefineryByCustomerId = (phone) => {
   return request.get(
     `/oil-user/oilCustomerRefineryRelation/getRefineryByCustomerId/${phone}`
   );
 };
+
 //路由
 const getCustomerRouters = () => {
   return request.get(
     "/oil-identity/oilRefinery/getCustomerRouters/REFINERY_COMS_WEB"
   );
 };
+// info
+const info = () => {
+  return request.get("/oil-identity/unionAuth/info");
+};
 
-export default { login, getRefineryByCustomerId, getCustomerRouters };
+export default {
+  login,
+  loginOut,
+  getRefineryByCustomerId,
+  getCustomerRouters,
+  info,
+};
diff --git a/src/components/autocomplete/index.vue b/src/components/autocomplete/index.vue
new file mode 100644
index 0000000..126bba9
--- /dev/null
+++ b/src/components/autocomplete/index.vue
@@ -0,0 +1,94 @@
+<template>
+  <el-select
+    v-model="params[config.querykey]"
+    filterable
+    remote
+    clearable
+    reserve-keyword
+    :placeholder="config.placeholder"
+    :remote-method="remoteMethod"
+    @clear="list = []"
+    :disabled="isDisabled"
+    @change="change"
+  >
+    <el-option
+      v-for="(item, index) in list"
+      :key="item.id + index"
+      :label="item[config.labelKey]"
+      :value="item[config.valueKey]"
+    >
+    </el-option>
+  </el-select>
+</template>
+
+<script>
+export default {
+  props: {
+    params: Object,
+    config: Object,
+    // config: {
+    //   serveTarget: {}, // 远程搜索接口
+    //   autocompleteKey: "", //远程搜索接口参数名
+    //   labelKey: "", //接口返回数据label名
+    //   valueKey: "", //接口返回数据唯一值
+    //   querykey: "", //查询接口参数名
+    // },
+  },
+  data() {
+    return {
+      text: "",
+      list: [],
+      isDisabled: false,
+    };
+  },
+  watch: {
+    "config.echoId": {
+      handler(nval, oval) {
+        if (nval) {
+          this.remoteMethod(this.config.echoName);
+        }
+        this.isDisabled = !!this.config.isDisabled;
+      },
+      deep: true,
+      immediate: true,
+    },
+  },
+  methods: {
+    // 远程搜索
+    remoteMethod(query) {
+      if (query !== "") {
+        this.loading = true;
+        let params = {};
+        let type = this.$utils.typeJudgment(this.config.autocompleteKey);
+        if (!type.includes("Object") && !type.includes("String")) return;
+
+        if (type.includes("Object")) {
+          params[this.config.autocompleteKey.key] = query;
+          params["enableMark"] = this.config.autocompleteKey.enableMark;
+        }
+        if (type.includes("String")) {
+          this.config.autocompleteKey
+            ? (params[this.config.autocompleteKey] = query)
+            : (params["queryTypeGet"] = query);
+        }
+        this.config.serveTarget(params).then((res) => {
+          let timeInstance = setTimeout(() => {
+            this.loading = false;
+            clearTimeout(timeInstance);
+            if (res.data.length) {
+              this.list = res.data;
+            } else this.list = [];
+          }, 1000 * Math.random());
+        });
+      } else {
+        this.list = [];
+      }
+    },
+    change(val) {
+      this.$emit("change", val);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/components/generalDetails/index.vue b/src/components/generalDetails/index.vue
index 6509990..b26a077 100644
--- a/src/components/generalDetails/index.vue
+++ b/src/components/generalDetails/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="generalDetails_body">
+  <div class="generalDetails_body pft14">
     <div class="generalDetails_header" v-if="isHeader">
       <slot name="generalDetails_header">
         {{ title }}
@@ -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>
@@ -73,8 +79,8 @@ export default {
   name: "generalDetails",
   props: {
     sourceData: {
-      type: Object,
-      default: () => null,
+      type: Array,
+      default: () => [],
     },
     mappingData: {
       type: Array,
@@ -95,6 +101,7 @@ export default {
     };
   },
   created() {
+    // return console.log("this.sourceData", this.sourceData);
     this.sourceData !== null && this.mappingData.length !== 0 && this.init();
   },
   methods: {
@@ -108,18 +115,45 @@ export default {
       this.$emit("close");
     },
     init() {
-      this.dataPage = this.mappingData.map((item) => {
+      this.dataPage = this.mappingData.map(
+        (mappingDataItem, mappingDataIndex) => {
+          let shineData = this.sourceData[mappingDataIndex] || {};
+          return {
+            title: mappingDataItem.carTitle,
+            iconClass: mappingDataItem.iconClass || "iconjichuziliao",
+            isFold: mappingDataItem.isFold || true,
+            listData: mappingDataItem.carItems.map((carItem) => {
+              let value =
+                (typeof carItem.value == "function" &&
+                  carItem.value(shineData)) ||
+                shineData[carItem.value] == 0
+                  ? 0
+                  : shineData[carItem.value] || carItem.fieldDefault || "";
+              return {
+                label: carItem.label,
+                value: value,
+                field: carItem.value,
+                remark: carItem.remark,
+                isCopy: carItem.isCopy || false,
+              };
+            }),
+          };
+        }
+      );
+      console.log("this.dataPage", this.dataPage);
+      return;
+      this.dataPage = this.mappingData.map((item, index) => {
         return {
           title: item.carTitle,
           iconClass: item.iconClass || "iconjichuziliao",
           isFold: item.isFold || true,
-          listData: item.carItems.map((carItem, index) => {
+          listData: item.carItems.map((carItem) => {
             return {
               label: carItem.label,
               value:
                 (typeof carItem.value == "function" &&
-                  carItem.value(this.sourceData)) ||
-                this.sourceData[carItem.value] ||
+                  carItem.value(this.sourceData[index])) ||
+                this.sourceData[index][carItem.value] ||
                 carItem.fieldDefault ||
                 "暂无数据",
               field: carItem.value,
@@ -134,7 +168,7 @@ export default {
 };
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 .title_bottom {
   margin-top: 20px;
 }
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 0ca5cf6..910e8a5 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -1,29 +1,22 @@
 <template>
   <div class="navbar">
-    <hamburger :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
+    <hamburger
+      :is-active="sidebar.opened"
+      class="hamburger-container"
+      @toggleClick="toggleSideBar"
+    />
 
     <breadcrumb class="breadcrumb-container" />
 
     <div class="right-menu">
       <el-dropdown class="avatar-container" trigger="click">
         <div class="avatar-wrapper">
-          <img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">
+          <img :src="avatar + '?imageView2/1/w/80/h/80'" class="user-avatar" />
           <i class="el-icon-caret-bottom" />
         </div>
         <el-dropdown-menu slot="dropdown" class="user-dropdown">
-          <router-link to="/">
-            <el-dropdown-item>
-              Home
-            </el-dropdown-item>
-          </router-link>
-          <a target="_blank" href="https://github.com/PanJiaChen/vue-admin-template/">
-            <el-dropdown-item>Github</el-dropdown-item>
-          </a>
-          <a target="_blank" href="https://panjiachen.github.io/vue-element-admin-site/#/">
-            <el-dropdown-item>Docs</el-dropdown-item>
-          </a>
-          <el-dropdown-item divided @click.native="logout">
-            <span style="display:block;">Log Out</span>
+          <el-dropdown-item @click.native="logout">
+            <span style="display: block">Log Out</span>
           </el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
@@ -32,31 +25,34 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
-import Breadcrumb from '@/components/Breadcrumb'
-import Hamburger from '@/components/Hamburger'
+import { mapGetters } from "vuex";
+import Breadcrumb from "@/components/Breadcrumb";
+import Hamburger from "@/components/Hamburger";
+
+import serve from "api/login.js";
 
 export default {
   components: {
     Breadcrumb,
-    Hamburger
+    Hamburger,
   },
   computed: {
-    ...mapGetters([
-      'sidebar',
-      'avatar'
-    ])
+    ...mapGetters(["sidebar", "avatar"]),
   },
   methods: {
     toggleSideBar() {
-      this.$store.dispatch('app/toggleSideBar')
+      this.$store.dispatch("app/toggleSideBar");
     },
-    async logout() {
-      await this.$store.dispatch('user/logout')
-      this.$router.push(`/login?redirect=${this.$route.fullPath}`)
-    }
-  }
-}
+    logout() {
+      serve.loginOut().then((res) => {
+        if (res.code === 20000) {
+          localStorage.removeItem("token");
+          this.$router.push("/login");
+        }
+      });
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -65,18 +61,18 @@ export default {
   overflow: hidden;
   position: relative;
   background: #fff;
-  box-shadow: 0 1px 4px rgba(0,21,41,.08);
+  box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
 
   .hamburger-container {
     line-height: 46px;
     height: 100%;
     float: left;
     cursor: pointer;
-    transition: background .3s;
-    -webkit-tap-highlight-color:transparent;
+    transition: background 0.3s;
+    -webkit-tap-highlight-color: transparent;
 
     &:hover {
-      background: rgba(0, 0, 0, .025)
+      background: rgba(0, 0, 0, 0.025);
     }
   }
 
@@ -103,10 +99,10 @@ export default {
 
       &.hover-effect {
         cursor: pointer;
-        transition: background .3s;
+        transition: background 0.3s;
 
         &:hover {
-          background: rgba(0, 0, 0, .025)
+          background: rgba(0, 0, 0, 0.025);
         }
       }
     }
diff --git a/src/permission.js b/src/permission.js
index 758b924..0097778 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,13 +26,9 @@ router.beforeEach(async (to, from, next) => {
         next();
       } else {
         try {
-          // let infoRes = await serve.getUserInfo();
-          // infoRes.data.authList = [1];
-          let infoRes = {
-            data: {
-              authList: [1],
-            },
-          };
+          let infoRes = await serve.info();
+          infoRes.data.authList = [1];
+
           store.dispatch("user/info", infoRes.data);
 
           let routerRes = await serve.getCustomerRouters();
diff --git a/src/utils/dataType.js b/src/utils/dataType.js
index 8a56550..f4230ef 100644
--- a/src/utils/dataType.js
+++ b/src/utils/dataType.js
@@ -1,12 +1,82 @@
+// 炼厂类型
 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,
+  },
+];
+// 账户状态
+export const accountStatusEnum = [
+  {
+    label: "禁用",
+    value: 0,
+  },
+  {
+    label: "启用",
+    value: 1,
+  },
+  {
+    label: "冻结",
+    value: -1,
+  },
+];
diff --git a/src/utils/index.js b/src/utils/index.js
index 4b6ed6c..09d2e74 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -51,7 +51,3 @@ export function isLicensePlate(no) {
   );
   return instance.test(no);
 }
-
-export function cellStyle() {
-  return "text-align:center";
-}
diff --git a/src/views/financialCenter/enterpriseRecharge/components/add.vue b/src/views/financialCenter/enterpriseRecharge/components/add.vue
new file mode 100644
index 0000000..2da67aa
--- /dev/null
+++ b/src/views/financialCenter/enterpriseRecharge/components/add.vue
@@ -0,0 +1,357 @@
+<template>
+  <el-drawer
+    :title="controlWindows.addInfo.title"
+    direction="ltr"
+    size="50%"
+    :visible.sync="controlWindows.add"
+    @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="transactionType">
+          <el-select
+            :disabled="!!form.id"
+            v-model="form.transactionType"
+            placeholder="请选择交易类型"
+            @change="changeTransactionType"
+          >
+            <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
+            v-model="form.transactionAmount"
+            placeholder="请输入交易金额"
+          ></el-input>
+        </el-form-item>
+
+        <template v-if="form.transactionType === 'RECHARGE'">
+          <el-form-item label="企业收款账户">
+            <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' ||
+            form.transactionType === 'RECHARGE'
+          "
+          label="线下交易凭证"
+        >
+          <el-upload
+            :action="uploadUrl"
+            :data="{
+              ossKey: 'xingyou',
+              pathKey: 'other',
+              encrypt: 'PUBLIC',
+              code: 'A003',
+            }"
+            list-type="picture-card"
+            :on-preview="handlePictureCardPreview"
+            :on-remove="handleRemove"
+            :on-success="handleSuccess"
+            :before-upload="beforeHandle"
+            :limit="1"
+            :file-list="fileList"
+          >
+            <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="交易说明">
+          <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 { mapGetters } from "vuex";
+
+import serve from "api/financialCenter/enterpriseRecharge.js";
+import utils from "utils/encode";
+const JSESSIONID = utils.uuid();
+
+export default {
+  props: {
+    controlWindows: Object,
+  },
+  data() {
+    return {
+      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),
+      },
+      fileList: [],
+      cascaderList: [],
+      companyFinance: {},
+      form: {},
+
+      rules: {
+        transactionType: [
+          { required: true, message: "请选择交易类型", trigger: "change" },
+        ],
+        transactionAmount: [
+          { required: true, message: "请输入交易金额", trigger: "blur" },
+        ],
+        offlinePaymentCompany: [
+          {
+            required: true,
+            message: "请输入线下汇款公司账户",
+            trigger: "blur",
+          },
+        ],
+        offlineStartTime: [
+          {
+            required: true,
+            message: "请选择线下交易发起时间",
+            trigger: "change",
+          },
+        ],
+        offlineCompleteTime: [
+          {
+            required: true,
+            message: "请选择线下交易完成时间",
+            trigger: "change",
+          },
+        ],
+        offlineCompleteTime: [
+          {
+            required: true,
+            message: "请选择企业收款账户",
+            trigger: "change",
+          },
+        ],
+      },
+    };
+  },
+  computed: {
+    ...mapGetters(["company_id"]),
+    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() {
+      this.companyChange(this.company_id);
+      let { id } = 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,
+          });
+        }
+      }
+    },
+    // 公司change
+    companyChange(id) {
+      if (id) {
+        serve.getByCompanyId(id).then((res) => {
+          this.companyFinance = res.data;
+        });
+      }
+    },
+    // 交易类型 change
+    changeTransactionType(val) {
+      if (val === "CHARGE_SALES") {
+        this.handleRemove();
+      }
+    },
+    beforeHandle(file) {
+      if (file.type.indexOf("image/") === -1) {
+        this.$message.error("上传的文件不是图片格式!");
+        return false;
+      } else if (file.size / 1024 / 1024 > 5) {
+        this.$message.error("上传图片大小不能超过 5MB!");
+        return false;
+      }
+      return true;
+    },
+
+    //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.$message.error(response.msg);
+        this.fileList = [];
+        return;
+      }
+      console.log("response", response);
+      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",
+            companyId: this.company_id,
+            ...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.fileList = [];
+      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-cascader,
+  .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/components/addTurn.vue b/src/views/financialCenter/enterpriseRecharge/components/addTurn.vue
new file mode 100644
index 0000000..6a363bf
--- /dev/null
+++ b/src/views/financialCenter/enterpriseRecharge/components/addTurn.vue
@@ -0,0 +1,233 @@
+<template>
+  <el-drawer
+    :title="controlWindows.addInfo.title"
+    direction="ltr"
+    size="50%"
+    :visible.sync="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="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">
+          <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>
+        </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 { mapGetters } from "vuex";
+
+import serve from "api/financialCenter/enterpriseRecharge.js";
+import commonServe from "api/common.js";
+
+export default {
+  props: {
+    controlWindows: Object,
+  },
+  data() {
+    let validatortransactionAmount = (rule, value, callback) => {
+      let typeTarget = this.correspondTypeEnum.find(
+        (item) => item.value === this.form.turnType
+      );
+      let superiorLimit = this.companyInfo[typeTarget.valueKey];
+      if (value == "") callback("请输入圈回金额");
+      if (value > superiorLimit) {
+        callback(`圈回金额不可超过${typeTarget.label}`);
+      }
+      callback();
+    };
+    return {
+      companyFinance: {},
+      companyInfo: {},
+      form: {},
+      rules: {
+        turnType: [
+          { required: true, message: "请选择交易类型", trigger: "change" },
+        ],
+        transactionAmount: [
+          {
+            required: true,
+            validator: validatortransactionAmount,
+            trigger: "change",
+          },
+        ],
+        reverseRemark: [
+          { required: true, message: "请输入圈回说明", trigger: "blur" },
+        ],
+      },
+      correspondTypeEnum: [
+        {
+          value: 1,
+          label: "充值余额",
+          valueKey: "rechargeBalance",
+        },
+        // {
+        //   value: 3,
+        //   label: "充值返利余额",
+        //   valueKey: "rechargeRebateBalance",
+        // },
+        // {
+        //   value: 4,
+        //   label: "消费返利余额",
+        //   valueKey: "consumeRebateBalance",
+        // },
+      ],
+    };
+  },
+  computed: {
+    ...mapGetters(["company_id"]),
+  },
+  methods: {
+    openDrawer() {
+      this.companyChange(this.company_id);
+      let { id } = this.controlWindows.addInfo;
+      //回显
+      if (id) {
+        this.form = JSON.parse(JSON.stringify(this.controlWindows.addInfo));
+        this.form.transactionAmount = Math.abs(this.form.transactionAmount);
+      }
+    },
+    // 公司财务信息
+    companyChange(id) {
+      if (id) {
+        serve.getByCompanyId(id).then((res) => {
+          this.companyFinance = res.data;
+          this.getByCompanyId(res.data.companyId);
+        });
+      }
+    },
+    //
+    getByCompanyId(id) {
+      commonServe.getByCompanyId(id).then((res) => {
+        this.companyInfo = res.data;
+      });
+    },
+
+    submit() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          let params = {
+            transactionType: "TURN",
+            companyId: this.company_id,
+            ...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
new file mode 100644
index 0000000..0169707
--- /dev/null
+++ b/src/views/financialCenter/enterpriseRecharge/index.vue
@@ -0,0 +1,723 @@
+<template>
+  <div class="enterprise-recharge">
+    <div class="frame">
+      <!-- 业务负责人 -->
+      <autocomplete
+        class="mr20"
+        :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-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>
+        <el-button @click="additionTurn">圈回</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>
+              {{
+                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 }">
+            <el-button
+              @click="detail(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
+          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>
+            <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'">
+                  <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-menu>
+            </el-dropdown>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!-- 分页 -->
+      <pagination :parameter="parameter" @searchAgain="getByPage" />
+    </div>
+    <!-- 企业充值 -->
+    <add :controlWindows="controlWindows" @closeWindow="search" />
+    <!-- 圈回 -->
+    <add-turn :controlWindows="controlWindows" @closeWindow="search" />
+    <!-- 详情 -->
+    <el-drawer
+      title="详情"
+      direction="ltr"
+      size="60%"
+      :withHeader="false"
+      :visible.sync="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[0].offlineTransactionProof"
+          />
+        </template>
+        <template #transactionType>
+          <p>
+            {{
+              oilCompanyMatch.transactionType === "TURN"
+                ? LoopBackTypeEnum.find(
+                    (item) => item.value === oilCompanyMatch[0].turnType
+                  ).label
+                : rechargeTypeEnum.find(
+                    (item) => item.value === oilCompanyMatch[0].transactionType
+                  ).label
+            }}
+          </p>
+        </template>
+        <template #transactionState>
+          <p>
+            {{
+              rechargeStatusEnum.find(
+                (item) => item.value === oilCompanyMatch[0].transactionState
+              ).label
+            }}
+          </p>
+        </template>
+        <template #auditMark>
+          <p>
+            {{
+              auditMarkEnum.find(
+                (item) => item.value === oilCompanyMatch[0].auditMark
+              ).label
+            }}
+          </p>
+        </template>
+        <template #accountState>
+          <p>
+            {{
+              accountStatusEnum.find(
+                (item) => item.value === oilCompanyMatch[1].accountState
+              ).label
+            }}
+          </p>
+        </template>
+        <template #accountType>
+          <p>
+            {{ oilCompanyMatch[1].accountType === "0" ? "基础账户" : "" }}
+          </p>
+        </template>
+      </general-details>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from "vuex";
+import serve from "api/financialCenter/enterpriseRecharge.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";
+import generalDetails from "components/generalDetails/index.vue";
+
+import {
+  rechargeTypeEnum,
+  rechargeStatusEnum,
+  accountStatusEnum,
+} from "utils/dataType.js";
+
+export default {
+  components: {
+    add,
+    addTurn,
+
+    pagination,
+    autocomplete,
+    generalDetails,
+  },
+  data() {
+    return {
+      controlWindows: {
+        add: false,
+        addTurn: false,
+        addInfo: {},
+        detail: false,
+      },
+      accountStatusEnum: accountStatusEnum,
+      rechargeTypeEnum: [
+        {
+          label: "圈回",
+          value: "TURN",
+        },
+        ...rechargeTypeEnum,
+      ],
+      rechargeStatusEnum: rechargeStatusEnum,
+      auditMarkEnum: [
+        {
+          label: "待审核",
+          value: 0,
+          type: "warning",
+        },
+        {
+          label: "审核通过",
+          value: 1,
+          type: "success",
+        },
+        {
+          label: "审核失败",
+          value: -1,
+          type: "danger",
+        },
+      ],
+
+      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: {},
+      },
+      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: "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: "rechargeRebateBalance" },
+            { label: "消费返利余额", value: "consumeRebateBalance" },
+            { label: "累计充值金额", value: "totalRechargeAmount" },
+            { label: "累计充值返利金额", value: "totalRechargeRebateAmount" },
+            { label: "累计消费返利金额", value: "totalConsumeRebateAmount" },
+          ],
+        },
+      ],
+    };
+  },
+
+  computed: {
+    ...mapGetters(["company_id"]),
+  },
+  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() {
+      Object.assign(this.parameter.params, {
+        companyAccountType: "4",
+        companyId: this.company_id,
+      });
+      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;
+    },
+    // 圈回
+    additionTurn() {
+      this.controlWindows.addInfo = {
+        title: "资金圈回",
+      };
+      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,
+      //     id: row.id,
+      //   };
+      //   this.controlWindows.detail = true;
+      // });
+    },
+    // // 审核通过
+    // examineAdopt() {
+    //   Object.assign(this.controlWindows.addInfo, {
+    //     title: "交易审核通过说明",
+    //     placeholder: "请输入交易审核通过说明",
+    //     auditMark: 1,
+    //     updateSource: "REFINERY_OMS_WEB",
+    //   });
+    //   this.controlWindows.examine = true;
+    // },
+    // // 审核不通过
+    // examineFail() {
+    //   Object.assign(this.controlWindows.addInfo, {
+    //     title: "交易审核不通过说明",
+    //     placeholder: "请输入交易审核不通过说明",
+    //     auditMark: -1,
+    //     updateSource: "REFINERY_OMS_WEB",
+    //   });
+    //   this.controlWindows.examine = true;
+    // },
+    // 更多
+    commandMore(val, row) {
+      this.controlWindows.addInfo = {
+        title: "编辑",
+        ...row,
+      };
+      if (val === "update") {
+        this.controlWindows.add = true;
+      }
+      if (val === "updateTurn") {
+        this.controlWindows.addTurn = true;
+      }
+    },
+    //详情
+    detail(row) {
+      Promise.all([
+        serve.get(row.id),
+        commonServe.getByCompanyId(row.companyId),
+      ]).then(([firstRes, secondRes]) => {
+        this.oilCompanyMatch = [firstRes.data, secondRes.data];
+        this.controlWindows.addInfo.examineMark = false;
+        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() {
+      Object.assign(this.parameter, {
+        currentPage: 1,
+        pageSize: 10,
+        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];
+      }
+    },
+    // 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 {
+  .pft14 {
+    font-size: 14px;
+  }
+  .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/login/index.vue b/src/views/login/index.vue
index 69a5020..7c02d4c 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -9,7 +9,7 @@
       label-position="left"
     >
       <div class="title-container">
-        <h3 class="title">Login Form</h3>
+        <h3 class="title">油批客户管理平台</h3>
       </div>
 
       <el-form-item prop="username">
@@ -19,7 +19,7 @@
         <el-input
           ref="username"
           v-model="loginForm.username"
-          placeholder="Username"
+          placeholder="用户名"
           name="username"
           type="text"
           tabindex="1"
@@ -36,7 +36,7 @@
           ref="password"
           v-model="loginForm.password"
           :type="passwordType"
-          placeholder="Password"
+          placeholder="密码"
           name="password"
           tabindex="2"
           auto-complete="on"
@@ -56,11 +56,6 @@
         @click.native.prevent="handleLogin('')"
         >Login</el-button
       >
-
-      <div class="tips">
-        <span style="margin-right: 20px">username: admin</span>
-        <span> password: any</span>
-      </div>
     </el-form>
 
     <el-dialog
@@ -111,7 +106,7 @@ export default {
     };
     return {
       loading: false,
-      passwordType: "",
+      passwordType: "password",
       companyList: [],
       companySelectDialog: false,
 
@@ -156,9 +151,10 @@ export default {
                   .then((res) => {
                     this.companyList = res.data;
                     this.companySelectDialog = true;
-                    return;
                   });
+                return;
               }
+
               localStorage.setItem("token", res.data.accessToken);
               this.$router.replace("/");
             })
diff --git a/src/views/product/components/create.vue b/src/views/product/components/create.vue
index c76a2a1..7ffd8c9 100644
--- a/src/views/product/components/create.vue
+++ b/src/views/product/components/create.vue
@@ -113,9 +113,7 @@ export default {
       },
     };
   },
-  created() {
-    // this.findByEntity();
-  },
+  created() {},
   methods: {
     openDrawer() {},
     submit() {
diff --git a/src/views/product/index.vue b/src/views/product/index.vue
index ef05381..cf5a27c 100644
--- a/src/views/product/index.vue
+++ b/src/views/product/index.vue
@@ -7,7 +7,7 @@
         placeholder="产品名称"
         clearable
       ></el-input>
-      <el-select
+      <!-- <el-select
         v-model="parameter.params.refineryId"
         placeholder="炼厂名称"
         clearable
@@ -19,7 +19,21 @@
           :value="item.id"
         >
         </el-option>
+      </el-select> -->
+      <el-select
+        v-model="parameter.params.productType"
+        placeholder="产品类型"
+        clearable
+      >
+        <el-option
+          v-for="(item, index) in productTypeList"
+          :key="index"
+          :label="item.label"
+          :value="item.value"
+        >
+        </el-option>
       </el-select>
+      <autocomplete :params="parameter.params" :config="configAutocomplete" />
       <el-input
         v-model="parameter.params.belongLibrary"
         placeholder="所处炼厂库"
@@ -57,6 +71,7 @@
           show-overflow-tooltip
         >
         </el-table-column>
+        <el-table-column prop="productType" label="产品类型"> </el-table-column>
         <el-table-column
           prop="productType"
           label="产品类型"
@@ -119,6 +134,11 @@
         :mappingData="mappingData"
         @close="controlWindows.detail = false"
       >
+        <template #enableMark>
+          <p>
+            {{ oilCompanyMatch[0].enableMark === "ENABLE" ? "启用" : "禁用" }}
+          </p>
+        </template>
       </general-details>
     </el-drawer>
   </div>
@@ -130,9 +150,17 @@ import serve from "api/product.js";
 import create from "./components/create.vue";
 
 import pagination from "components/pagination/index.vue";
+import autocomplete from "components/autocomplete/index.vue";
 import generalDetails from "components/generalDetails/index.vue";
 
 export default {
+  components: {
+    create,
+
+    pagination,
+    autocomplete,
+    generalDetails,
+  },
   data() {
     return {
       controlWindows: {
@@ -140,6 +168,31 @@ export default {
         detail: false,
         create: false,
       },
+      productTypeList: [
+        {
+          label: "0#柴",
+          value: "0#",
+        },
+        {
+          label: "-10#柴",
+          value: "-10#",
+        },
+        {
+          label: "92#汽",
+          value: "92#",
+        },
+        {
+          label: "95#汽",
+          value: "95#",
+        },
+      ],
+      configAutocomplete: {
+        serveTarget: serve.findByEntity,
+        autocomplateKey: "refineryName",
+        valueKey: "refineryName",
+        placeholder: "炼厂名称",
+        querykey: "refineryId",
+      },
       refineryList: [],
       tableHeight: 0,
       tableData: [],
@@ -149,7 +202,7 @@ export default {
         total: 0,
         params: {},
       },
-      oilCompanyMatch: {},
+      oilCompanyMatch: [],
       mappingData: [
         {
           carTitle: "",
@@ -163,18 +216,13 @@ export default {
             { label: "启用/禁用", value: "enableMark" },
             { label: "所属炼厂库名", value: "belongLibrary" },
             { label: "创建时间", value: "createTime" },
-            { label: "修改时间", value: "createSource" },
+            { label: "修改时间", value: "updateTime" },
           ],
         },
       ],
     };
   },
-  components: {
-    create,
 
-    pagination,
-    generalDetails,
-  },
   mounted() {
     this.$nextTick(() => {
       this.heightHandle();
@@ -185,7 +233,6 @@ export default {
     );
   },
   created() {
-    this.findByEntity();
     this.getByPage();
   },
   methods: {
@@ -200,30 +247,22 @@ export default {
         this.parameter.total = res.data.totalPage;
       });
     },
-    //炼厂list
-    findByEntity() {
-      serve.findByEntity().then((res) => {
-        this.refineryList = res.data;
-      });
-    },
     //下单
     createOrder(row) {
       this.controlWindows.create = true;
-      console.log(this.controlWindows.create);
     },
     //详情
     detail(row) {
-      this.oilCompanyMatch = row;
+      this.oilCompanyMatch = [row];
       this.controlWindows.detail = true;
     },
     //重置
     reset() {
-      this.parameter = {
+      Object.assign(this.parameter, {
         currentPage: 1,
         pageSize: 10,
-        total: 0,
         params: {},
-      };
+      });
     },
     // table height
     heightHandle() {