From e0e8bdcaed94a46e4b7a7f2d2fe1924911977733 Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Fri, 28 Apr 2023 13:11:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .prettierrc                                   |   8 +
 src/api/refineryAccount.js                    |  22 -
 src/api/refineryAccount/accountManagement.js  |  19 +
 src/api/refineryAccount/rechargeManagement.js |  28 +
 src/components/autocomplete/index.vue         |  11 +-
 .../companyManagement/index.vue               |  15 +-
 .../accountManagement/index.vue               |  10 +-
 .../financialCenter/billDetails/index.vue     |   9 +-
 .../enterpriseRecharge/components/add.vue     |   7 +-
 .../enterpriseRecharge/components/addTurn.vue |  12 +-
 .../enterpriseRecharge/components/examine.vue |  47 +-
 .../enterpriseRecharge/index.vue              | 564 +++++++-----------
 .../enterpriseRechargeDetails/index.vue       |  16 +-
 .../accountManagement/components/add.vue      | 127 ++++
 .../components/rechargeTurn.vue               | 160 +++++
 .../accountManagement/index.vue               | 268 +++++++++
 src/views/refineryAccount/components/add.vue  | 146 -----
 src/views/refineryAccount/index.vue           | 339 -----------
 .../rechargeManagement/components/examine.vue |  78 +++
 .../components/rechargeTurn.vue               | 160 +++++
 .../rechargeManagement/index.vue              | 315 ++++++++++
 src/views/refineryInfo/index.vue              |   4 +-
 vue.config.js                                 |   6 +-
 23 files changed, 1426 insertions(+), 945 deletions(-)
 create mode 100644 .prettierrc
 delete mode 100644 src/api/refineryAccount.js
 create mode 100644 src/api/refineryAccount/accountManagement.js
 create mode 100644 src/api/refineryAccount/rechargeManagement.js
 create mode 100644 src/views/refineryAccount/accountManagement/components/add.vue
 create mode 100644 src/views/refineryAccount/accountManagement/components/rechargeTurn.vue
 create mode 100644 src/views/refineryAccount/accountManagement/index.vue
 delete mode 100644 src/views/refineryAccount/components/add.vue
 delete mode 100644 src/views/refineryAccount/index.vue
 create mode 100644 src/views/refineryAccount/rechargeManagement/components/examine.vue
 create mode 100644 src/views/refineryAccount/rechargeManagement/components/rechargeTurn.vue
 create mode 100644 src/views/refineryAccount/rechargeManagement/index.vue

diff --git a/.prettierrc b/.prettierrc
new file mode 100644
index 0000000..d597599
--- /dev/null
+++ b/.prettierrc
@@ -0,0 +1,8 @@
+{
+  "tabWidth": 2,
+  "semi": false,
+  "singleQuote": true,
+  "trailingComma": "none",
+  "printWidth": 150,
+  "arrowParens": "avoid"
+}
diff --git a/src/api/refineryAccount.js b/src/api/refineryAccount.js
deleted file mode 100644
index 38b4f05..0000000
--- a/src/api/refineryAccount.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import request from "utils/axios.js";
-// table
-const getByPage = (params) => {
-  return request.postJson(
-    "/oil-refinery/xoilRefineryAccount/getByPage",
-    params
-  );
-};
-// 新增
-const save = (params) => {
-  return request.postJson("/oil-refinery/xoilRefineryAccount/save", params);
-};
-// 修改
-const update = (params) => {
-  return request.postJson("/oil-refinery/xoilRefineryAccount/update", params);
-};
-
-export default {
-  getByPage,
-  save,
-  update,
-};
diff --git a/src/api/refineryAccount/accountManagement.js b/src/api/refineryAccount/accountManagement.js
new file mode 100644
index 0000000..fdf3cba
--- /dev/null
+++ b/src/api/refineryAccount/accountManagement.js
@@ -0,0 +1,19 @@
+import request from 'utils/axios.js'
+// table
+const getByPage = params => {
+  return request.postJson('/oil-refinery/xoilRefineryAccount/getByPage', params)
+}
+// 新增
+const save = params => {
+  return request.postJson('/oil-refinery/xoilRefineryAccount/save', params)
+}
+// 修改
+const update = params => {
+  return request.postJson('/oil-refinery/xoilRefineryAccount/update', params)
+}
+
+export default {
+  getByPage,
+  save,
+  update
+}
diff --git a/src/api/refineryAccount/rechargeManagement.js b/src/api/refineryAccount/rechargeManagement.js
new file mode 100644
index 0000000..92f5c79
--- /dev/null
+++ b/src/api/refineryAccount/rechargeManagement.js
@@ -0,0 +1,28 @@
+import request from 'utils/axios.js'
+// table
+const getByPage = params => {
+  return request.postJson('/oil-refinery/xoilRefineryAccountReverse/getByPage', params)
+}
+// 根据炼厂查询炼厂账户
+const getByList = params => {
+  return request.postJson('/oil-refinery/xoilRefineryAccount/getByList', params)
+}
+// 充值圈回
+const save = params => {
+  return request.postJson('/oil-refinery/xoilRefineryAccountReverse/save', params)
+}
+// 审核
+const examineRefineryAccountrecharge = params => {
+  return request.postJson('/oil-refinery/xoilRefineryAccountReverse/examineRefineryAccountrecharge', params)
+}
+// 详情
+const getOneByEntity = params => {
+  return request.postJson('/oil-refinery/xoilRefineryAccountReverse/getOneByEntity', params)
+}
+export default {
+  getByPage,
+  getByList,
+  save,
+  examineRefineryAccountrecharge,
+  getOneByEntity
+}
diff --git a/src/components/autocomplete/index.vue b/src/components/autocomplete/index.vue
index dcb7e64..8d80889 100644
--- a/src/components/autocomplete/index.vue
+++ b/src/components/autocomplete/index.vue
@@ -7,8 +7,8 @@
     reserve-keyword
     :placeholder="config.placeholder"
     :remote-method="remoteMethod"
-    @clear="list = []"
     :disabled="isDisabled"
+    @clear="list = []"
     @change="change"
   >
     <template v-if="labelIsMore">
@@ -27,7 +27,7 @@
       >
       </el-option>
     </template>
-    <template>
+    <template v-else>
       <el-option
         v-for="(item, index) in list"
         :key="index"
@@ -48,7 +48,7 @@ export default {
     //   serveTarget: {}, // 远程搜索接口
     //   autocompleteKey: "", //远程搜索接口参数名
     //   labelKey: "", //接口返回数据label名
-    //   valueKey: "", //接口返回数据唯一值
+    //   valueKey: "", //接口返回数据id
     //   querykey: "", //查询接口参数名
     // },
   },
@@ -56,7 +56,6 @@ export default {
     return {
       text: "",
       labelIsMore: false,
-      // labelKeyArr:[],
       list: [],
       isDisabled: false,
     };
@@ -65,7 +64,6 @@ export default {
     "config.echoId": {
       handler(nval, oval) {
         this.list = [];
-        // this.isDisabled = !!this.config.isDisabled;
         let type = this.$utils.typeJudgment(this.config.echoName);
         if (nval && ["String"].includes(type)) {
           let resultName = this.config.echoName.replace(/\s*/g, "");
@@ -90,11 +88,8 @@ export default {
   created() {
     let { labelKey } = this.config;
     let type = this.$utils.typeJudgment(labelKey);
-    // console.log(type);
     if (type === "Array") {
-      // let
       this.labelIsMore = true;
-      // console.log(this.labelIsMore);
     }
   },
   methods: {
diff --git a/src/views/customerManagement/companyManagement/index.vue b/src/views/customerManagement/companyManagement/index.vue
index ee9d64a..e4e302e 100644
--- a/src/views/customerManagement/companyManagement/index.vue
+++ b/src/views/customerManagement/companyManagement/index.vue
@@ -121,7 +121,6 @@
             </div>
           </template>
         </el-table-column>
-        // TODO
         <el-table-column label="加价策略">
           <template slot-scope="{ row }">
             <p>
@@ -333,15 +332,15 @@
         </template>
         <template #companyNature>
           <p>
-            <!-- {{
+            {{
               companyNatureTypeEnum.find(
-                (item) => item.value === oilCompanyMatch[0].companyNature
+                (item) => item.value == oilCompanyMatch[0].companyNature
               ).label
-            }} -->
+            }}
           </p>
         </template>
         <template #companyDockType>
-          <p v-if="oilCompanyMatch[0].companyDockType === null"></p>
+          <p v-if="oilCompanyMatch[0].companyDockType == null"></p>
           <p v-else>
             {{
               oilCompanyMatch[0].companyDockType == 0 ? "对接客户" : "平台客户"
@@ -354,7 +353,7 @@
           </p>
         </template>
         <template #auditMark>
-          <p>
+          <p v-if="oilCompanyMatch[0]">
             {{
               auditMarkEnum.find(
                 (item) => item.value == oilCompanyMatch[0].auditMark
@@ -381,14 +380,14 @@
         </template>
         <template #defaultShare>
           <p v-if="oilCompanyMatch[2]">
-            {{ oilCompanyMatch[2].defaultShare === 1 ? "共享" : "不共享" }}
+            {{ oilCompanyMatch[2].defaultShare == 1 ? "共享" : "不共享" }}
           </p>
         </template>
         <template #accountState>
           <p v-if="oilCompanyMatch[3]">
             {{
               companyTypeEnum.find(
-                (item) => item.value === oilCompanyMatch[3].accountState
+                (item) => item.value == oilCompanyMatch[3].accountState
               ).label
             }}
           </p>
diff --git a/src/views/financialCenter/accountManagement/index.vue b/src/views/financialCenter/accountManagement/index.vue
index 378fd9c..67e7cb6 100644
--- a/src/views/financialCenter/accountManagement/index.vue
+++ b/src/views/financialCenter/accountManagement/index.vue
@@ -72,13 +72,13 @@
                 effect="dark"
                 :type="
                   accountStateEnum.find(
-                    (item) => item.value === row.accountState
+                    (item) => item.value == row.accountState
                   ).type
                 "
               >
                 {{
                   accountStateEnum.find(
-                    (item) => item.value === row.accountState
+                    (item) => item.value == row.accountState
                   ).label
                 }}
               </el-tag>
@@ -90,7 +90,7 @@
         <el-table-column label="企业性质" minWidth="120">
           <template slot-scope="{ row }">
             {{
-              companyNatureEnum.find((item) => item.value === row.companyNature)
+              companyNatureEnum.find((item) => item.value == row.companyNature)
                 .label
             }}
           </template>
@@ -176,7 +176,7 @@
           <p v-if="oilCompanyMatch[0]">
             {{
               companyNatureEnum.find(
-                (item) => item.value === oilCompanyMatch[0].companyNature
+                (item) => item.value == oilCompanyMatch[0].companyNature
               ).label
             }}
           </p>
@@ -195,7 +195,7 @@
           <p v-if="oilCompanyMatch[1]">
             {{
               accountStatusEnum.find(
-                (item) => item.value === oilCompanyMatch[1].accountState
+                (item) => item.value == oilCompanyMatch[1].accountState
               ).label
             }}
           </p>
diff --git a/src/views/financialCenter/billDetails/index.vue b/src/views/financialCenter/billDetails/index.vue
index f9a5dea..33e6f66 100644
--- a/src/views/financialCenter/billDetails/index.vue
+++ b/src/views/financialCenter/billDetails/index.vue
@@ -47,7 +47,7 @@
           <template slot-scope="{ row }">
             <p v-if="!/\W+/.test(row.billType)">
               {{
-                rechargeTypeEnum.find((item) => item.value === row.billType)
+                rechargeTypeEnum.find((item) => item.value == row.billType)
                   .label
               }}
             </p>
@@ -143,7 +143,7 @@
           <p>
             {{
               rechargeTypeEnum.find(
-                (item) => item.value === oilCompanyMatch[0].billType
+                (item) => item.value == oilCompanyMatch[0].billType
               ).label
             }}
           </p>
@@ -204,9 +204,8 @@
               <template slot-scope="{ row }">
                 <p v-if="!/\W+/.test(row.billType)">
                   {{
-                    rechargeTypeEnum.find(
-                      (item) => item.value === row.billTypes
-                    ).label
+                    rechargeTypeEnum.find((item) => item.value == row.billTypes)
+                      .label
                   }}
                 </p>
                 <p v-else>
diff --git a/src/views/financialCenter/enterpriseRecharge/components/add.vue b/src/views/financialCenter/enterpriseRecharge/components/add.vue
index 03ea5f4..8c23456 100644
--- a/src/views/financialCenter/enterpriseRecharge/components/add.vue
+++ b/src/views/financialCenter/enterpriseRecharge/components/add.vue
@@ -274,12 +274,7 @@ export default {
         echoName: this.form.refineryName || "",
         isDisabled: !!id,
       };
-      // ? { echoId: id || '', echoName: this.form.refineryName || '', isDisabled: !!id }
-      // : {
-      //     echoId: "",
-      //     echoName: "",
-      //     isDisabled: false,
-      //   };
+
       Object.assign(this.configAutocomplete, configUpdata);
     },
     // 公司change
diff --git a/src/views/financialCenter/enterpriseRecharge/components/addTurn.vue b/src/views/financialCenter/enterpriseRecharge/components/addTurn.vue
index ae0cf41..1e10d77 100644
--- a/src/views/financialCenter/enterpriseRecharge/components/addTurn.vue
+++ b/src/views/financialCenter/enterpriseRecharge/components/addTurn.vue
@@ -44,16 +44,14 @@
               <template slot="label">
                 <i class="el-icon-bank-card"></i>
                 {{
-                  correspondTypeEnum.find(
-                    (item) => item.value === form.turnType
-                  ).label
+                  correspondTypeEnum.find((item) => item.value == form.turnType)
+                    .label
                 }}
               </template>
               {{
                 companyInfo[
-                  correspondTypeEnum.find(
-                    (item) => item.value === form.turnType
-                  ).valueKey
+                  correspondTypeEnum.find((item) => item.value == form.turnType)
+                    .valueKey
                 ]
               }}
             </el-descriptions-item>
@@ -110,7 +108,7 @@ export default {
     // };
     let validatortransactionAmount = (rule, value, callback) => {
       let typeTarget = this.correspondTypeEnum.find(
-        (item) => item.value === this.form.turnType
+        (item) => item.value == this.form.turnType
       );
       let superiorLimit = this.companyInfo[typeTarget.valueKey];
       if (value == "") callback("请输入圈回金额");
diff --git a/src/views/financialCenter/enterpriseRecharge/components/examine.vue b/src/views/financialCenter/enterpriseRecharge/components/examine.vue
index e46483d..67cd6e9 100644
--- a/src/views/financialCenter/enterpriseRecharge/components/examine.vue
+++ b/src/views/financialCenter/enterpriseRecharge/components/examine.vue
@@ -1,16 +1,6 @@
 <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>
+  <el-dialog :title="controlWindows.addInfo.title" :visible.sync="controlWindows.examine" width="35%" @close="closeWindow">
+    <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>
@@ -19,36 +9,35 @@
 </template>
 
 <script>
-import serve from "api/financialCenter/enterpriseRecharge.js";
+import serve from 'api/financialCenter/enterpriseRecharge.js'
 export default {
   props: {
-    controlWindows: Object,
+    controlWindows: Object
   },
   data() {
     return {
-      auditRemark: "",
-    };
+      auditRemark: ''
+    }
   },
   methods: {
-    closeWindow() {
-      // this.auditRemark = "";
-      // this.controlWindows.addInfo = {};
-      // this.$emit("closeWindow");
-      this.controlWindows.examine = false;
-    },
     submit() {
       serve
         .audit({
           auditRemark: this.auditRemark,
-          ...this.controlWindows.addInfo,
+          ...this.controlWindows.addInfo
+        })
+        .then(res => {
+          this.$message.success(res.msg)
+          this.closeWindow()
         })
-        .then((res) => {
-          this.$message.success(res.msg);
-          this.closeWindow();
-        });
     },
-  },
-};
+    closeWindow() {
+      this.auditRemark = ''
+      this.$emit('closeWindow')
+      this.controlWindows.examine = false
+    }
+  }
+}
 </script>
 
 <style></style>
diff --git a/src/views/financialCenter/enterpriseRecharge/index.vue b/src/views/financialCenter/enterpriseRecharge/index.vue
index a4c68dc..e7916a7 100644
--- a/src/views/financialCenter/enterpriseRecharge/index.vue
+++ b/src/views/financialCenter/enterpriseRecharge/index.vue
@@ -2,54 +2,17 @@
   <div class="enterprise-recharge">
     <div class="frame">
       <!-- 公司名称 -->
-      <autocomplete
-        class="mr20"
-        :params="parameter.params"
-        :config="configAutocomplete"
-      />
+      <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>
+      <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 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 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"
@@ -85,13 +48,7 @@
         <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
-            >
+            <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>
@@ -100,28 +57,13 @@
           <template slot-scope="{ row }">
             <span>
               {{
-                row.transactionType === "TURN"
-                  ? LoopBackTypeEnum.find((item) => item.value === row.turnType)
-                      .label
-                  : rechargeTypeEnum.find(
-                      (item) => item.value === row.transactionType
-                    ).label
+                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 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>
@@ -129,38 +71,18 @@
         <el-table-column label="交易状态">
           <template slot-scope="{ row }">
             <p>
-              {{
-                rechargeStatusEnum.find(
-                  (item) => item.value === row.transactionState
-                ).label
-              }}
+              {{ 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 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"
-            >
+            <el-tooltip className="item" effect="dark" placement="top" :disabled="!row.internalCompanyName">
               <div slot="content">
                 <p>收款公司账户：{{ row.internalCompanyName }}</p>
                 <p>收款开户行：{{ row.bankDeposit }}</p>
@@ -168,64 +90,40 @@
               </div>
               <div>
                 <el-tag size="mini">付</el-tag>
-                <span>{{
-                  row.offlinePaymentCompany ? row.offlinePaymentCompany : "暂无"
-                }}</span>
+                <span>{{ row.offlinePaymentCompany ? row.offlinePaymentCompany : '暂无' }}</span>
                 <br />
                 <el-tag size="mini" type="success">收</el-tag>
-                <span>{{
-                  row.internalCompanyName ? row.internalCompanyName : "暂无"
-                }}</span>
+                <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="examine(row)"
-              :type="
-                auditMarkEnum.find((item) => item.value === row.auditMark).type
-              "
-              size="mini"
-              >{{
-                auditMarkEnum.find((item) => item.value === row.auditMark).label
-              }}</el-button
-            >
+            <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
-          prop="createTime"
-          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>
             <el-dropdown
               @command="
-                (val) => {
-                  commandMore(val, row);
+                val => {
+                  commandMore(val, row)
                 }
               "
             >
-              <span class="el-dropdown-link">
-                更多<i class="el-icon-arrow-down el-icon--right"></i>
-              </span>
+              <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
-                  >
+                  <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
-                  >
+                  <el-dropdown-item command="update" v-if="row.auditMark === 0">编辑</el-dropdown-item>
                 </template>
               </el-dropdown-menu>
             </el-dropdown>
@@ -239,14 +137,10 @@
     <add :controlWindows="controlWindows" @closeWindow="search" />
     <!-- 圈回 -->
     <add-turn :controlWindows="controlWindows" @closeWindow="search" />
+    <!-- 审核 -->
+    <examine :controlWindows="controlWindows" @closeWindow="search" />
     <!-- 详情 -->
-    <el-drawer
-      title="详情"
-      direction="ltr"
-      size="60%"
-      :withHeader="false"
-      :visible.sync="controlWindows.detail"
-    >
+    <el-drawer title="详情" direction="ltr" size="60%" :withHeader="false" :visible.sync="controlWindows.detail">
       <general-details
         title="详情"
         :isHeader="true"
@@ -256,54 +150,35 @@
         @close="controlWindows.detail = false"
       >
         <template #offlineTransactionProof>
-          <el-image
-            style="width: 100px; height: 100px"
-            :src="oilCompanyMatch[0].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
+              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
-            }}
+            {{ rechargeStatusEnum.find(item => item.value == oilCompanyMatch[0].transactionState).label }}
           </p>
         </template>
         <template #auditMark>
           <p>
-            {{
-              auditMarkEnum.find(
-                (item) => item.value === oilCompanyMatch[0].auditMark
-              ).label
-            }}
+            {{ auditMarkEnum.find(item => item.value == oilCompanyMatch[0].auditMark).label }}
           </p>
         </template>
         <template #accountState>
           <p>
-            {{
-              accountStatusEnum.find(
-                (item) => item.value === oilCompanyMatch[1].accountState
-              ).label
-            }}
+            {{ accountStatusEnum.find(item => item.value == oilCompanyMatch[1].accountState).label }}
           </p>
         </template>
         <template #accountType>
           <p>
-            {{ oilCompanyMatch[1].accountType === "0" ? "基础账户" : "" }}
+            {{ oilCompanyMatch[1].accountType === '0' ? '基础账户' : '' }}
           </p>
         </template>
         <template v-if="controlWindows.addInfo.examineMark" #footer>
@@ -312,28 +187,22 @@
         </template>
       </general-details>
     </el-drawer>
-    <!-- 审核 -->
-    <examine :controlWindows="controlWindows" @closeWindow="search" />
   </div>
 </template>
 
 <script>
-import serve from "api/financialCenter/enterpriseRecharge.js";
-import commonServe from "api/common.js";
+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 examine from "./components/examine.vue";
+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";
-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,
-  accountStatusEnum,
-} from "utils/dataType.js";
+import { rechargeTypeEnum, rechargeStatusEnum, accountStatusEnum } from 'utils/dataType.js'
 
 export default {
   components: {
@@ -343,7 +212,7 @@ export default {
 
     pagination,
     autocomplete,
-    generalDetails,
+    generalDetails
   },
   data() {
     return {
@@ -352,27 +221,27 @@ export default {
         addTurn: false,
         addInfo: {},
         detail: false,
-        examine: false,
+        examine: false
       },
       accountStatusEnum: accountStatusEnum,
       rechargeTypeEnum: rechargeTypeEnum,
       rechargeStatusEnum: rechargeStatusEnum,
       auditMarkEnum: [
         {
-          label: "待审核",
+          label: '待审核',
           value: 0,
-          type: "warning",
+          type: 'warning'
         },
         {
-          label: "审核通过",
+          label: '审核通过',
           value: 1,
-          type: "success",
+          type: 'success'
         },
         {
-          label: "审核失败",
+          label: '审核失败',
           value: -1,
-          type: "danger",
-        },
+          type: 'danger'
+        }
       ],
 
       datetime: [],
@@ -380,272 +249,255 @@ export default {
       tableData: [],
       configAutocomplete: {
         serveTarget: commonServe.getRefineryCompanyList,
-        autocompleteKey: "name",
-        labelKey: "name",
-        valueKey: "id",
-        placeholder: "企业名称",
-        querykey: "companyId",
+        autocompleteKey: 'name',
+        labelKey: 'name',
+        valueKey: 'id',
+        placeholder: '企业名称',
+        querykey: 'companyId'
       },
       configAutocompleteSec: {
         serveTarget: commonServe.liekQuery,
-        autocompleteKey: "",
-        labelKey: ["id", "nickName", "phone"],
-        valueKey: "id",
-        placeholder: "业务负责人",
-        querykey: "businessLeader",
+        autocompleteKey: '',
+        labelKey: ['id', 'nickName', 'phone'],
+        valueKey: 'id',
+        placeholder: '业务负责人',
+        querykey: 'businessLeader'
       },
       parameter: {
         currentPage: 1,
         pageSize: 10,
         total: 0,
-        params: {},
+        params: {}
       },
       LoopBackTypeEnum: [
         {
-          label: "充值圈回",
-          value: 1,
+          label: '充值圈回',
+          value: 1
         },
         {
-          label: "赊销圈回",
-          value: 2,
+          label: '赊销圈回',
+          value: 2
         },
         {
-          label: "充值返利圈回",
-          value: 3,
+          label: '充值返利圈回',
+          value: 3
         },
         {
-          label: "消费返利圈回",
-          value: 4,
-        },
+          label: '消费返利圈回',
+          value: 4
+        }
       ],
       oilCompanyMatch: [],
       mappingData: [
         {
-          carTitle: "",
+          carTitle: '',
           // 标记
           carItems: [
-            { label: "ID", value: "id" },
-            { label: "交易类型", value: "transactionType" },
-            { label: "交易状态", value: "transactionState" },
-            { label: "交易金额", value: "transactionAmount" },
-            { label: "充值返利比例", value: "rechargeRebate" },
-            { label: "充值返利金额", value: "rechargeRebateAmount" },
-            { label: "线下汇款公司账户", value: "offlinePaymentCompany" },
-            { label: "线下交易发起时间", value: "offlineStartTime" },
-            { label: "线下交易完成时间", value: "offlineCompleteTime" },
-            { label: "线下交易凭证", value: "offlineTransactionProof" },
-            { label: "交易审核标识", value: "auditMark" },
-            { label: "审核人", value: "auditUserName" },
-            { label: "交易说明", value: "reverseRemark" },
-            { label: "审核时间", value: "auditTime" },
-            { label: "审核系统来源", value: "auditSource" },
-            { label: "创建用户", value: "createUserName" },
-            { label: "创建时间", value: "createTime" },
-            { label: "创建数据来源", value: "createSource" },
-            { label: "企业收款账户", value: "internalCompanyName" },
-            { label: "开户行", value: "bankDeposit" },
-            { label: "银行卡号", value: "bankCardNo" },
-          ],
+            { 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: "账户信息",
+          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" },
-          ],
-        },
-      ],
-    };
+            { 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' }
+          ]
+        }
+      ]
+    }
   },
   created() {
-    this.initDateTime();
-    this.getByPage();
+    this.initDateTime()
+    this.getByPage()
   },
   updated() {
     this.$nextTick(() => {
-      this.$refs.multipleTable && this.$refs.multipleTable.doLayout();
-    });
+      this.$refs.multipleTable && this.$refs.multipleTable.doLayout()
+    })
   },
   mounted() {
     this.$nextTick(() => {
-      this.heightHandle();
-    });
-    window.addEventListener(
-      "resize",
-      this.$utils.debounce(this.heightHandle, 500)
-    );
+      this.heightHandle()
+    })
+    window.addEventListener('resize', this.$utils.debounce(this.heightHandle, 500))
   },
   methods: {
     search() {
-      this.parameter.currentPage = 1;
-      this.getByPage();
+      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;
-      });
+      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;
+        title: '企业充值'
+      }
+      this.controlWindows.add = true
     },
     // 圈回
     additionTurn() {
       this.controlWindows.addInfo = {
-        title: "资金圈回",
-      };
-      this.controlWindows.addTurn = true;
+        title: '资金圈回'
+      }
+      this.controlWindows.addTurn = true
     },
     // 审核
     examine(row) {
-      Promise.all([
-        serve.get(row.id),
-        commonServe.getByCompanyIdAccount(row.companyId),
-      ]).then(([firstRes, secondRes]) => {
-        this.oilCompanyMatch = [firstRes.data, secondRes.data];
+      Promise.all([serve.get(row.id), commonServe.getByCompanyIdAccount(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;
-      });
+          id: row.id
+        }
+        this.controlWindows.detail = true
+      })
     },
     // 审核通过
     examineAdopt() {
       Object.assign(this.controlWindows.addInfo, {
-        title: "交易审核通过说明",
-        placeholder: "请输入交易审核通过说明",
+        title: '交易审核通过说明',
+        placeholder: '请输入交易审核通过说明',
         auditMark: 1,
-        updateSource: "REFINERY_OMS_WEB",
-      });
-      this.controlWindows.examine = true;
+        updateSource: 'REFINERY_OMS_WEB'
+      })
+      this.controlWindows.examine = true
     },
     // 审核不通过
     examineFail() {
       Object.assign(this.controlWindows.addInfo, {
-        title: "交易审核不通过说明",
-        placeholder: "请输入交易审核不通过说明",
+        title: '交易审核不通过说明',
+        placeholder: '请输入交易审核不通过说明',
         auditMark: -1,
-        updateSource: "REFINERY_OMS_WEB",
-      });
-      this.controlWindows.examine = true;
+        updateSource: 'REFINERY_OMS_WEB'
+      })
+      this.controlWindows.examine = true
     },
     // 更多
     commandMore(val, row) {
       this.controlWindows.addInfo = {
-        title: "编辑",
-        ...row,
-      };
-      if (val === "update") {
-        this.controlWindows.add = true;
+        title: '编辑',
+        ...row
       }
-      if (val === "updateTurn") {
-        this.controlWindows.addTurn = true;
+      if (val === 'update') {
+        this.controlWindows.add = true
+      }
+      if (val === 'updateTurn') {
+        this.controlWindows.addTurn = true
       }
     },
     //详情
     detail(row) {
-      Promise.all([
-        serve.get(row.id),
-        commonServe.getByCompanyIdAccount(row.companyId),
-      ]).then(([firstRes, secondRes]) => {
-        this.oilCompanyMatch = [firstRes.data, secondRes.data];
-        this.controlWindows.addInfo.examineMark = false;
-        this.controlWindows.detail = true;
-      });
+      Promise.all([serve.get(row.id), commonServe.getByCompanyIdAccount(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);
+      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;
+          sums[index] = '合计'
+          return
         }
         switch (item.property) {
-          case "transactionAmount":
-            sums[index] = transactionAmount + "元";
-            break;
-          case "rechargeRebateAmount":
-            sums[index] = rechargeRebateAmount + "元";
-            break;
+          case 'transactionAmount':
+            sums[index] = transactionAmount + '元'
+            break
+          case 'rechargeRebateAmount':
+            sums[index] = rechargeRebateAmount + '元'
+            break
 
           default:
-            break;
+            break
         }
-      });
-      return sums;
+      })
+      return sums
     },
     //重置
     reset() {
       Object.assign(this.parameter, {
         currentPage: 1,
         pageSize: 10,
-        params: {},
-      });
-      this.initDateTime();
+        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);
+      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];
+        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;
+      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);
-    },
-  },
-};
+      return document.documentElement.querySelector(className)
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/financialCenter/enterpriseRechargeDetails/index.vue b/src/views/financialCenter/enterpriseRechargeDetails/index.vue
index aee129d..1d01189 100644
--- a/src/views/financialCenter/enterpriseRechargeDetails/index.vue
+++ b/src/views/financialCenter/enterpriseRechargeDetails/index.vue
@@ -81,10 +81,10 @@
             <p>
               {{
                 row.transactionType === "TURN"
-                  ? LoopBackTypeEnum.find((item) => item.value === row.turnType)
+                  ? LoopBackTypeEnum.find((item) => item.value == row.turnType)
                       .label
                   : rechargeTypeEnum.find(
-                      (item) => item.value === row.transactionType
+                      (item) => item.value == row.transactionType
                     ).label
               }}
             </p>
@@ -96,7 +96,7 @@
             <p>
               {{
                 rechargeStatusEnum.find(
-                  (item) => item.value === row.transactionState
+                  (item) => item.value == row.transactionState
                 ).label
               }}
             </p>
@@ -164,10 +164,10 @@
             {{
               oilCompanyMatch[0].transactionType === "TURN"
                 ? LoopBackTypeEnum.find(
-                    (item) => item.value === oilCompanyMatch[0].turnType
+                    (item) => item.value == oilCompanyMatch[0].turnType
                   ).label
                 : rechargeTypeEnum.find(
-                    (item) => item.value === oilCompanyMatch[0].transactionType
+                    (item) => item.value == oilCompanyMatch[0].transactionType
                   ).label
             }}
           </p>
@@ -176,7 +176,7 @@
           <p>
             {{
               rechargeStatusEnum.find(
-                (item) => item.value === oilCompanyMatch[0].transactionState
+                (item) => item.value == oilCompanyMatch[0].transactionState
               ).label
             }}
           </p>
@@ -185,7 +185,7 @@
           <p>
             {{
               auditMarkEnum.find(
-                (item) => item.value === oilCompanyMatch[0].auditMark
+                (item) => item.value == oilCompanyMatch[0].auditMark
               ).label
             }}
           </p>
@@ -200,7 +200,7 @@
           <p>
             {{
               accountStatusEnum.find(
-                (item) => item.value === oilCompanyMatch[1].accountState
+                (item) => item.value == oilCompanyMatch[1].accountState
               ).label
             }}
           </p>
diff --git a/src/views/refineryAccount/accountManagement/components/add.vue b/src/views/refineryAccount/accountManagement/components/add.vue
new file mode 100644
index 0000000..02ba84f
--- /dev/null
+++ b/src/views/refineryAccount/accountManagement/components/add.vue
@@ -0,0 +1,127 @@
+<template>
+  <el-drawer
+    :title="controlWindows.addInfo.title"
+    direction="ltr"
+    size="40%"
+    :visible.sync="controlWindows.add"
+    @opened="openDrawer"
+    :before-close="closeWindow"
+  >
+    <div class="add">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="账户名称" prop="accountName">
+          <el-input maxlength="50" v-model="form.accountName" placeholder="请输入账户名称"></el-input>
+        </el-form-item>
+        <el-form-item label="账户类型" prop="accountType">
+          <el-select v-model="form.accountType" placeholder="请选择账户类型">
+            <el-option v-for="(item, index) in refineryAccountTypeEnum" :key="index" :label="item.label" :value="item.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="炼厂名称" prop="refineryId">
+          <autocomplete ref="autocomplete" :params="form" :config="configAutocomplete" />
+        </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 refineryInfoServe from 'api/refineryInfo.js'
+import serve from 'api/refineryAccount/accountManagement.js'
+
+import autocomplete from 'components/autocomplete/index.vue'
+export default {
+  components: {
+    autocomplete
+  },
+  props: {
+    controlWindows: Object,
+    refineryAccountTypeEnum: Array
+  },
+  data() {
+    let validatorRefineryId = (rule, value, callback) => {
+      if (this.form.refineryId) callback()
+      else callback('请选择炼厂')
+    }
+    return {
+      form: {},
+      refineryList: [],
+      configAutocomplete: {
+        serveTarget: refineryInfoServe.findByEntity,
+        autocompleteKey: 'refineryName',
+        labelKey: 'refineryName',
+        valueKey: 'id',
+        placeholder: '炼厂名称',
+        querykey: 'refineryId'
+      },
+      rules: {
+        accountName: [{ required: true, message: '请输入账户名称', trigger: 'blur' }],
+        accountType: [{ required: true, message: '请选择账户类型', trigger: 'change' }],
+        refineryId: [{ required: true, validator: validatorRefineryId, trigger: 'change' }]
+      }
+    }
+  },
+  methods: {
+    openDrawer() {},
+    submit() {
+      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)
+    },
+    closeWindow() {
+      this.$emit('closeWindow')
+      this.form = {}
+      this.controlWindows.addInfo = {}
+      this.$nextTick(() => {
+        this.$refs.autocomplete.list = []
+        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/refineryAccount/accountManagement/components/rechargeTurn.vue b/src/views/refineryAccount/accountManagement/components/rechargeTurn.vue
new file mode 100644
index 0000000..e94a88d
--- /dev/null
+++ b/src/views/refineryAccount/accountManagement/components/rechargeTurn.vue
@@ -0,0 +1,160 @@
+<template>
+  <el-drawer title="充值圈回" direction="ltr" size="40%" :visible.sync="controlWindows.rechargeTurn" @opened="openDrawer" :before-close="closeWindow">
+    <div class="recharge-turn">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="炼厂名称" prop="refineryId">
+          <autocomplete ref="autocomplete" :params="form" :config="configAutocomplete" @change="changeRefineryId" />
+        </el-form-item>
+        <el-form-item label="炼厂账户" prop="refineryAccountId">
+          <el-select v-model="form.refineryAccountId" placeholder="请选择">
+            <el-option v-for="item in refineryAccountList" :key="item.id" :label="item.accountName" :value="item.id"> </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item v-if="form.refineryAccountId && form.transactionType === 'TURN'">
+          <el-descriptions title="炼厂账户信息" :column="1" border>
+            <el-descriptions-item>
+              <template slot="label">
+                <i class="el-icon-office-building"></i>
+                炼厂账户
+              </template>
+              {{ refineryAccountInfo.accountName }}</el-descriptions-item
+            >
+            <el-descriptions-item>
+              <template slot="label">
+                <i class="el-icon-bank-card"></i>
+                账户余额
+              </template>
+              {{ refineryAccountInfo.balance }}
+            </el-descriptions-item>
+          </el-descriptions>
+        </el-form-item>
+        <el-form-item label="交易类型" prop="transactionType">
+          <el-select v-model="form.transactionType" placeholder="请选择">
+            <el-option label="充值" value="RECHARGE"> </el-option>
+            <el-option label="圈回" value="TURN"> </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="交易金额" prop="transactionAmount">
+          <el-input v-checkNum v-model="form.transactionAmount" placeholder="请输入"></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 refineryInfoServe from 'api/refineryInfo.js'
+import serve from 'api/refineryAccount/accountManagement.js'
+
+import autocomplete from 'components/autocomplete/index.vue'
+export default {
+  components: {
+    autocomplete
+  },
+  props: {
+    controlWindows: Object
+  },
+  data() {
+    let validatorRefineryId = (rule, value, callback) => {
+      if (this.form.refineryId) callback()
+      else callback('请选择炼厂')
+    }
+    let validatorTransactionAmount = (rule, value, callback) => {
+      if (!value) return callback('请输入交易金额或交易金额不可为0')
+      if (this.form.transactionType === 'TURN' && +value > +this.refineryAccountInfo.balance) return callback('交易金额不可高于账户余额')
+      callback()
+    }
+    return {
+      refineryAccountList: [],
+      form: { refineryAccountId: '' },
+      refineryList: [],
+      configAutocomplete: {
+        serveTarget: refineryInfoServe.findByEntity,
+        autocompleteKey: 'refineryName',
+        labelKey: 'refineryName',
+        valueKey: 'id',
+        placeholder: '炼厂名称',
+        querykey: 'refineryId'
+      },
+      rules: {
+        refineryId: [{ required: true, validator: validatorRefineryId, trigger: 'change' }],
+        refineryAccountId: [{ required: true, message: '请选择炼厂账户', trigger: 'blur' }],
+        transactionType: [{ required: true, message: '请选择交易类型', trigger: 'change' }],
+        transactionAmount: [{ required: true, validator: validatorTransactionAmount, trigger: 'change' }]
+      }
+    }
+  },
+  computed: {
+    refineryAccountInfo() {
+      return this.refineryAccountList.find(item => item.id == this.form.refineryAccountId) || {}
+    }
+  },
+  methods: {
+    openDrawer() {},
+    changeRefineryId(val) {
+      this.form.refineryAccountId = ''
+      this.refineryAccountList = []
+      if (val) {
+        serve.getByList({ refineryId: val }).then(res => {
+          this.refineryAccountList = res.data
+        })
+      }
+    },
+    submit() {
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          serve.rechargeTurnSave(this.form).then(res => {
+            if (res.code === 20000) {
+              this.$message.success(res.msg)
+              this.closeWindow()
+            }
+          })
+        }
+      })
+    },
+    closeWindow() {
+      this.$emit('closeWindow')
+      this.form = { refineryAccountId: '' }
+      this.$nextTick(() => {
+        this.$refs.autocomplete.list = []
+        this.refineryAccountList = []
+        this.$refs.form.clearValidate()
+        this.controlWindows.rechargeTurn = false
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.recharge-turn {
+  padding: 20px;
+  .el-input,
+  .el-select,
+  .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/refineryAccount/accountManagement/index.vue b/src/views/refineryAccount/accountManagement/index.vue
new file mode 100644
index 0000000..a4a242b
--- /dev/null
+++ b/src/views/refineryAccount/accountManagement/index.vue
@@ -0,0 +1,268 @@
+<template>
+  <div class="order">
+    <div class="frame">
+      <autocomplete class="mr20" :params="parameter.params" :config="configAutocomplete" />
+
+      <el-select v-model="parameter.params.refineryType" placeholder="炼厂类型" clearable>
+        <el-option v-for="item in refineryTypeEnum" :key="item.value" :label="item.label" :value="item.value"> </el-option>
+      </el-select>
+      <el-select v-model="parameter.params.accountStatus" placeholder="启用禁用" clearable>
+        <el-option label="启用" value="ENABLE"> </el-option>
+        <el-option label="禁用" value="DISABLE"> </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 prop="orderSerialNumber" label="炼厂账户名称" show-overflow-tooltip>
+          <template slot-scope="{ row }">
+            <el-tag v-if="row.accountStatus === 'ENABLE'" type="success" size="mini">启用</el-tag>
+            <el-tag v-else type="danger" size="mini">禁用</el-tag>
+            <span>{{ row.accountName }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="refineryName" label="炼厂名称" show-overflow-tooltip> </el-table-column>
+        <el-table-column prop="orderSerialNumber" label="账户类型" width="90">
+          <template slot-scope="{ row }">
+            <p v-if="row.accountType">
+              {{ refineryAccountTypeEnum.find(item => item.value == row.accountType).label }}
+            </p>
+          </template>
+        </el-table-column>
+        <el-table-column prop="balance" label="总余额" width="90"> </el-table-column>
+        <el-table-column prop="rechargeBalance" label="充值余额" width="100"> </el-table-column>
+        <el-table-column prop="totalRechargeBalance" label="累计充值余额" width="120"> </el-table-column>
+
+        <el-table-column prop="orderSerialNumber" label="操作" width="100">
+          <template slot-scope="{ row }">
+            <el-link type="primary" :underline="false" @click="detail(row)">详情</el-link>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!-- 分页 -->
+      <pagination :parameter="parameter" @searchAgain="getByPage" />
+    </div>
+
+    <add :controlWindows="controlWindows" :refineryAccountTypeEnum="refineryAccountTypeEnum" @closeWindow="search" />
+
+    <el-drawer title="详情" direction="ltr" size="60%" :withHeader="false" :visible.sync="controlWindows.detail">
+      <general-details
+        class="pft14"
+        title="详情"
+        :isHeader="true"
+        v-if="controlWindows.detail"
+        :sourceData="oilCompanyMatch"
+        :mappingData="mappingData"
+        @close="controlWindows.detail = false"
+      >
+        <template #refineryType>
+          <p>
+            {{ refineryTypeEnum.find(item => item.value == oilCompanyMatch[0].accountType).label }}
+          </p>
+        </template>
+        <template #accountStatus>
+          <p>
+            {{ oilCompanyMatch[0].accountStatus === 'ENABLE' ? '启用' : '禁用' }}
+          </p>
+        </template>
+      </general-details>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+import refineryInfoServe from 'api/refineryInfo.js'
+import serve from 'api/refineryAccount/accountManagement.js'
+
+import add from './components/add.vue'
+
+import pagination from 'components/pagination/index.vue'
+import autocomplete from 'components/autocomplete/index.vue'
+import generalDetails from 'components/generalDetails/index.vue'
+
+import { refineryTypeEnum, refineryAccountTypeEnum } from 'utils/dataType.js'
+
+export default {
+  components: {
+    add,
+    pagination,
+    autocomplete,
+    generalDetails
+  },
+  data() {
+    return {
+      refineryTypeEnum: refineryTypeEnum,
+      refineryAccountTypeEnum: refineryAccountTypeEnum,
+      controlWindows: {
+        add: false,
+        addInfo: {},
+        detail: false
+      },
+      configAutocomplete: {
+        serveTarget: refineryInfoServe.findByEntity,
+        autocompleteKey: 'refineryName',
+        labelKey: 'refineryName',
+        valueKey: 'id',
+        placeholder: '炼厂名称',
+        querykey: 'refineryId'
+      },
+      refineryList: [],
+      tableHeight: 0,
+      tableData: [],
+      parameter: {
+        currentPage: 1,
+        pageSize: 10,
+        total: 0,
+        params: {}
+      },
+      oilCompanyMatch: {},
+      mappingData: [
+        {
+          carTitle: '',
+          carItems: [
+            { label: '账户名称', value: 'accountName' },
+            { label: '账户类型', value: 'refineryType' },
+            { label: '炼厂名称', value: 'refineryName' },
+            { label: '炼厂ID', value: 'refineryId' },
+            { label: '启用状态', value: 'accountStatus' },
+            { label: '创建用户ID', value: 'createUser' },
+            { label: '创建时间', value: 'createTime' },
+            { label: '修改用户ID', value: 'updateUser' },
+            { label: '修改时间', value: 'updateTime' }
+          ]
+        }
+      ]
+    }
+  },
+
+  mounted() {
+    this.$nextTick(() => {
+      this.heightHandle()
+    })
+    window.addEventListener('resize', this.$utils.debounce(this.heightHandle, 500))
+  },
+  created() {
+    this.getByPage()
+  },
+  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
+    },
+    //修改
+    update(row) {
+      this.controlWindows.addInfo = {
+        title: '账户新增',
+        ...row
+      }
+      this.controlWindows.add = true
+    },
+    //详情
+    detail(row) {
+      this.oilCompanyMatch = [row]
+      this.controlWindows.detail = true
+    },
+    //重置
+    reset() {
+      Object.assign(this.parameter, {
+        currentPage: 1,
+        pageSize: 10,
+        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>
+.order {
+  .pft14 {
+    font-size: 14px;
+  }
+  .frame {
+    margin: 20px;
+    padding: 20px;
+    // width: 100%;
+    border-radius: 6px;
+    border: 1px solid #e3e3e5;
+    background: #fff;
+    .el-input,
+    .el-select {
+      width: 183px;
+      height: 40px;
+    }
+    .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-link {
+      margin-right: 10px;
+    }
+  }
+  .pft14 {
+    font-size: 14px;
+  }
+}
+</style>
diff --git a/src/views/refineryAccount/components/add.vue b/src/views/refineryAccount/components/add.vue
deleted file mode 100644
index 7e5a9cb..0000000
--- a/src/views/refineryAccount/components/add.vue
+++ /dev/null
@@ -1,146 +0,0 @@
-<template>
-  <el-drawer
-    :title="controlWindows.addInfo.title"
-    direction="ltr"
-    size="40%"
-    :visible.sync="controlWindows.add"
-    @opened="openDrawer"
-    :before-close="closeWindow"
-  >
-    <div class="add">
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="账户名称" prop="accountName">
-          <el-input
-            maxlength="50"
-            v-model="form.accountName"
-            placeholder="请输入账户名称"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="账户类型" prop="accountType">
-          <el-select v-model="form.accountType" placeholder="请选择账户类型">
-            <el-option
-              v-for="(item, index) in refineryAccountTypeEnum"
-              :key="index"
-              :label="item.label"
-              :value="item.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="炼厂名称" prop="refineryId">
-          <autocomplete
-            ref="autocomplete"
-            :params="form"
-            :config="configAutocomplete"
-          />
-        </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 refineryInfoServe from "api/refineryInfo.js";
-import serve from "api/refineryAccount.js";
-
-import autocomplete from "components/autocomplete/index.vue";
-export default {
-  components: {
-    autocomplete,
-  },
-  props: {
-    controlWindows: Object,
-    refineryAccountTypeEnum: Array,
-  },
-  data() {
-    let validatorRefineryId = (rule, value, callback) => {
-      if (this.form.refineryId) callback();
-      else callback("请选择炼厂");
-    };
-    return {
-      form: {},
-      refineryList: [],
-      configAutocomplete: {
-        serveTarget: refineryInfoServe.findByEntity,
-        autocompleteKey: "refineryName",
-        labelKey: "refineryName",
-        valueKey: "id",
-        placeholder: "炼厂名称",
-        querykey: "refineryId",
-      },
-      rules: {
-        accountName: [
-          { required: true, message: "请输入账户名称", trigger: "blur" },
-        ],
-        accountType: [
-          { required: true, message: "请选择账户类型", trigger: "change" },
-        ],
-        refineryId: [
-          { required: true, validator: validatorRefineryId, trigger: "change" },
-        ],
-      },
-    };
-  },
-  methods: {
-    openDrawer() {},
-    submit() {
-      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);
-    },
-    closeWindow() {
-      this.$emit("closeWindow");
-      this.form = {};
-      this.controlWindows.addInfo = {};
-      this.$nextTick(() => {
-        this.$refs.autocomplete.list = [];
-        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/refineryAccount/index.vue b/src/views/refineryAccount/index.vue
deleted file mode 100644
index 357f129..0000000
--- a/src/views/refineryAccount/index.vue
+++ /dev/null
@@ -1,339 +0,0 @@
-<template>
-  <div class="order">
-    <div class="frame">
-      <autocomplete
-        class="mr20"
-        :params="parameter.params"
-        :config="configAutocomplete"
-      />
-
-      <el-select
-        v-model="parameter.params.refineryType"
-        placeholder="炼厂类型"
-        clearable
-      >
-        <el-option
-          v-for="item in refineryTypeEnum"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
-        >
-        </el-option>
-      </el-select>
-      <el-select
-        v-model="parameter.params.accountStatus"
-        placeholder="启用禁用"
-        clearable
-      >
-        <el-option label="启用" value="ENABLE"> </el-option>
-        <el-option label="禁用" value="DISABLE"> </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> -->
-        <!-- <el-button @click="addition">充值</el-button> -->
-      </div>
-      <el-table
-        v-if="tableHeight"
-        ref="multipleTable"
-        :height="tableHeight"
-        :data="tableData"
-        style="width: 100%"
-      >
-        <el-table-column
-          prop="orderSerialNumber"
-          label="炼厂账户名称"
-          show-overflow-tooltip
-        >
-          <template slot-scope="{ row }">
-            <el-tag
-              v-if="row.accountStatus === 'ENABLE'"
-              type="success"
-              size="mini"
-              >启用</el-tag
-            >
-            <el-tag v-else type="danger" size="mini">禁用</el-tag>
-            <span>{{ row.accountName }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="refineryName"
-          label="炼厂名称"
-          show-overflow-tooltip
-        >
-        </el-table-column>
-        <el-table-column prop="orderSerialNumber" label="账户类型" width="90">
-          <template slot-scope="{ row }">
-            <p v-if="row.accountType">
-              {{
-                refineryAccountTypeEnum.find(
-                  (item) => item.value === row.accountType
-                ).label
-              }}
-            </p>
-          </template>
-        </el-table-column>
-        <el-table-column prop="balance" label="总余额" width="90">
-        </el-table-column>
-        <el-table-column prop="rechargeBalance" label="充值余额" width="100">
-        </el-table-column>
-        <el-table-column
-          prop="totalRechargeBalance"
-          label="累计充值余额"
-          width="120"
-        >
-        </el-table-column>
-
-        <el-table-column prop="orderSerialNumber" label="操作" width="100">
-          <template slot-scope="{ row }">
-            <el-link type="primary" :underline="false" @click="detail(row)"
-              >详情</el-link
-            >
-          </template>
-        </el-table-column>
-      </el-table>
-      <!-- 分页 -->
-      <pagination :parameter="parameter" @searchAgain="getByPage" />
-    </div>
-    <add
-      :controlWindows="controlWindows"
-      :refineryAccountTypeEnum="refineryAccountTypeEnum"
-      @closeWindow="search"
-    />
-
-    <el-drawer
-      title="详情"
-      direction="ltr"
-      size="60%"
-      :withHeader="false"
-      :visible.sync="controlWindows.detail"
-    >
-      <general-details
-        class="pft14"
-        title="详情"
-        :isHeader="true"
-        v-if="controlWindows.detail"
-        :sourceData="oilCompanyMatch"
-        :mappingData="mappingData"
-        @close="controlWindows.detail = false"
-      >
-        <template #refineryType>
-          <p>
-            {{
-              refineryTypeEnum.find(
-                (item) => item.value === oilCompanyMatch[0].accountType
-              ).label
-            }}
-          </p>
-        </template>
-        <template #accountStatus>
-          <p>
-            {{
-              oilCompanyMatch[0].accountStatus === "ENABLE" ? "启用" : "禁用"
-            }}
-          </p>
-        </template>
-      </general-details>
-    </el-drawer>
-  </div>
-</template>
-
-<script>
-import refineryInfoServe from "api/refineryInfo.js";
-import serve from "api/refineryAccount.js";
-
-import add from "./components/add.vue";
-
-import pagination from "components/pagination/index.vue";
-import autocomplete from "components/autocomplete/index.vue";
-import generalDetails from "components/generalDetails/index.vue";
-
-import { refineryTypeEnum, refineryAccountTypeEnum } from "utils/dataType.js";
-
-export default {
-  components: {
-    add,
-    pagination,
-    autocomplete,
-    generalDetails,
-  },
-  data() {
-    return {
-      refineryTypeEnum: refineryTypeEnum,
-      refineryAccountTypeEnum: refineryAccountTypeEnum,
-      controlWindows: {
-        add: false,
-        addInfo: {},
-        detail: false,
-      },
-      configAutocomplete: {
-        serveTarget: refineryInfoServe.findByEntity,
-        autocompleteKey: "refineryName",
-        labelKey: "refineryName",
-        valueKey: "id",
-        placeholder: "炼厂名称",
-        querykey: "refineryId",
-      },
-      refineryList: [],
-      tableHeight: 0,
-      tableData: [],
-      parameter: {
-        currentPage: 1,
-        pageSize: 10,
-        total: 0,
-        params: {},
-      },
-      oilCompanyMatch: {},
-      mappingData: [
-        {
-          carTitle: "",
-          carItems: [
-            { label: "账户名称", value: "accountName" },
-            { label: "账户类型", value: "refineryType" },
-            { label: "炼厂名称", value: "refineryName" },
-            { label: "炼厂ID", value: "refineryId" },
-            { label: "启用状态", value: "accountStatus" },
-            { label: "创建用户ID", value: "createUser" },
-            { label: "创建时间", value: "createTime" },
-            { label: "修改用户ID", value: "updateUser" },
-            { label: "修改时间", value: "updateTime" },
-          ],
-        },
-      ],
-    };
-  },
-
-  mounted() {
-    this.$nextTick(() => {
-      this.heightHandle();
-    });
-    window.addEventListener(
-      "resize",
-      this.$utils.debounce(this.heightHandle, 500)
-    );
-  },
-  created() {
-    this.getByPage();
-  },
-  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;
-    },
-    //修改
-    update(row) {
-      this.controlWindows.addInfo = {
-        title: "账户新增",
-        ...row,
-      };
-      this.controlWindows.add = true;
-    },
-    //详情
-    detail(row) {
-      this.oilCompanyMatch = [row];
-      this.controlWindows.detail = true;
-    },
-    //重置
-    reset() {
-      Object.assign(this.parameter, {
-        currentPage: 1,
-        pageSize: 10,
-        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>
-.order {
-  .pft14 {
-    font-size: 14px;
-  }
-  .frame {
-    margin: 20px;
-    padding: 20px;
-    // width: 100%;
-    border-radius: 6px;
-    border: 1px solid #e3e3e5;
-    background: #fff;
-    .el-input,
-    .el-select {
-      width: 183px;
-      height: 40px;
-    }
-    .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-link {
-      margin-right: 10px;
-    }
-  }
-  .pft14 {
-    font-size: 14px;
-  }
-}
-</style>
diff --git a/src/views/refineryAccount/rechargeManagement/components/examine.vue b/src/views/refineryAccount/rechargeManagement/components/examine.vue
new file mode 100644
index 0000000..cbfa6f4
--- /dev/null
+++ b/src/views/refineryAccount/rechargeManagement/components/examine.vue
@@ -0,0 +1,78 @@
+<template>
+  <el-dialog title="请输入交易审核说明" :visible.sync="controlWindows.examine" width="35%" @closed="closeWindow">
+    <el-descriptions class="margin-top" :column="1" border :labelStyle="{ width: '190px' }">
+      <el-descriptions-item>
+        <template slot="label">
+          <i class="el-icon-office-building"></i>
+          炼厂名称
+        </template>
+        {{ controlWindows.addInfo.refineryName }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          <i class="el-icon-postcard"></i>
+          操作类型
+        </template>
+        {{ controlWindows.addInfo.transactionType === 'RECHARGE' ? '充值' : '圈回' }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          <i class="el-icon-coin"></i>
+          操作金额
+        </template>
+        {{ controlWindows.addInfo.transactionAmount }}
+      </el-descriptions-item>
+    </el-descriptions>
+
+    <el-input type="textarea" v-model="auditRemark" :rows="4" placeholder="交易审核说明"> </el-input>
+
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="closeWindow">取 消</el-button>
+      <el-button type="danger" @click="submit('FAILURE')">审核失败</el-button>
+      <el-button type="primary" @click="submit('SUCCESS')">审核通过</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import serve from '@/api/refineryAccount/rechargeManagement.js'
+export default {
+  props: {
+    controlWindows: Object
+  },
+  data() {
+    return {
+      auditRemark: ''
+    }
+  },
+  methods: {
+    submit(auditMark) {
+      serve
+        .examineRefineryAccountrecharge({
+          auditRemark: this.auditRemark,
+          ...this.controlWindows.addInfo,
+          auditMark
+        })
+        .then(res => {
+          if (res.code === 20000) {
+            this.$message.success(res.msg)
+            this.closeWindow()
+          }
+        })
+    },
+    closeWindow() {
+      this.$emit('closeWindow')
+      this.auditRemark = ''
+      this.controlWindows.addInfo = {}
+      this.controlWindows.examine = false
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.el-textarea {
+  margin-top: 20px;
+}
+</style>
+>
diff --git a/src/views/refineryAccount/rechargeManagement/components/rechargeTurn.vue b/src/views/refineryAccount/rechargeManagement/components/rechargeTurn.vue
new file mode 100644
index 0000000..7281e37
--- /dev/null
+++ b/src/views/refineryAccount/rechargeManagement/components/rechargeTurn.vue
@@ -0,0 +1,160 @@
+<template>
+  <el-drawer title="充值圈回" direction="ltr" size="40%" :visible.sync="controlWindows.rechargeTurn" @opened="openDrawer" :before-close="closeWindow">
+    <div class="recharge-turn">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="炼厂名称" prop="refineryId">
+          <autocomplete ref="autocomplete" :params="form" :config="configAutocomplete" @change="changeRefineryId" />
+        </el-form-item>
+        <el-form-item label="炼厂账户" prop="refineryAccountId">
+          <el-select v-model="form.refineryAccountId" placeholder="请选择">
+            <el-option v-for="item in refineryAccountList" :key="item.id" :label="item.accountName" :value="item.id"> </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item v-if="form.refineryAccountId && form.transactionType === 'TURN'">
+          <el-descriptions title="炼厂账户信息" :column="1" border>
+            <el-descriptions-item>
+              <template slot="label">
+                <i class="el-icon-office-building"></i>
+                炼厂账户
+              </template>
+              {{ refineryAccountInfo.accountName }}</el-descriptions-item
+            >
+            <el-descriptions-item>
+              <template slot="label">
+                <i class="el-icon-bank-card"></i>
+                账户余额
+              </template>
+              {{ refineryAccountInfo.balance }}
+            </el-descriptions-item>
+          </el-descriptions>
+        </el-form-item>
+        <el-form-item label="交易类型" prop="transactionType">
+          <el-select v-model="form.transactionType" placeholder="请选择">
+            <el-option label="充值" value="RECHARGE"> </el-option>
+            <el-option label="圈回" value="TURN"> </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="交易金额" prop="transactionAmount">
+          <el-input v-checkNum v-model="form.transactionAmount" placeholder="请输入"></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 refineryInfoServe from 'api/refineryInfo.js'
+import serve from 'api/refineryAccount/rechargeManagement.js'
+
+import autocomplete from 'components/autocomplete/index.vue'
+export default {
+  components: {
+    autocomplete
+  },
+  props: {
+    controlWindows: Object
+  },
+  data() {
+    let validatorRefineryId = (rule, value, callback) => {
+      if (this.form.refineryId) callback()
+      else callback('请选择炼厂')
+    }
+    let validatorTransactionAmount = (rule, value, callback) => {
+      if (!value) return callback('请输入交易金额或交易金额不可为0')
+      if (this.form.transactionType === 'TURN' && +value > +this.refineryAccountInfo.balance) return callback('交易金额不可高于账户余额')
+      callback()
+    }
+    return {
+      refineryAccountList: [],
+      form: { refineryAccountId: '' },
+      refineryList: [],
+      configAutocomplete: {
+        serveTarget: refineryInfoServe.findByEntity,
+        autocompleteKey: 'refineryName',
+        labelKey: 'refineryName',
+        valueKey: 'id',
+        placeholder: '炼厂名称',
+        querykey: 'refineryId'
+      },
+      rules: {
+        refineryId: [{ required: true, validator: validatorRefineryId, trigger: 'change' }],
+        refineryAccountId: [{ required: true, message: '请选择炼厂账户', trigger: 'blur' }],
+        transactionType: [{ required: true, message: '请选择交易类型', trigger: 'change' }],
+        transactionAmount: [{ required: true, validator: validatorTransactionAmount, trigger: 'change' }]
+      }
+    }
+  },
+  computed: {
+    refineryAccountInfo() {
+      return this.refineryAccountList.find(item => item.id == this.form.refineryAccountId) || {}
+    }
+  },
+  methods: {
+    openDrawer() {},
+    changeRefineryId(val) {
+      this.form.refineryAccountId = ''
+      this.refineryAccountList = []
+      if (val) {
+        serve.getByList({ refineryId: val }).then(res => {
+          this.refineryAccountList = res.data
+        })
+      }
+    },
+    submit() {
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          serve.rechargeTurnSave(this.form).then(res => {
+            if (res.code === 20000) {
+              this.$message.success(res.msg)
+              this.closeWindow()
+            }
+          })
+        }
+      })
+    },
+    closeWindow() {
+      this.$emit('closeWindow')
+      this.form = { refineryAccountId: '' }
+      this.$nextTick(() => {
+        this.$refs.autocomplete.list = []
+        this.refineryAccountList = []
+        this.$refs.form.clearValidate()
+        this.controlWindows.rechargeTurn = false
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.recharge-turn {
+  padding: 20px;
+  .el-input,
+  .el-select,
+  .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/refineryAccount/rechargeManagement/index.vue b/src/views/refineryAccount/rechargeManagement/index.vue
new file mode 100644
index 0000000..0aa2d46
--- /dev/null
+++ b/src/views/refineryAccount/rechargeManagement/index.vue
@@ -0,0 +1,315 @@
+<template>
+  <div class="order">
+    <div class="frame">
+      <autocomplete class="mr20" :params="parameter.params" :config="configAutocomplete" />
+
+      <el-select v-model="parameter.params.refineryType" placeholder="炼厂类型" clearable>
+        <el-option v-for="item in refineryTypeEnum" :key="item.value" :label="item.label" :value="item.value"> </el-option>
+      </el-select>
+      <el-select v-model="parameter.params.accountStatus" placeholder="启用禁用" clearable>
+        <el-option label="启用" value="ENABLE"> </el-option>
+        <el-option label="禁用" value="DISABLE"> </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="rechargeTurn">充值圈回</el-button>
+      </div>
+      <el-table v-if="tableHeight" ref="multipleTable" :height="tableHeight" :data="tableData" style="width: 100%">
+        <el-table-column label="炼厂账户名称" show-overflow-tooltip>
+          <template slot-scope="{ row }">
+            <span>{{ row.accountName }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="refineryName" label="炼厂名称" show-overflow-tooltip> </el-table-column>
+        <el-table-column prop="balance" label="交易类型" width="150">
+          <template slot-scope="{ row }">
+            {{ row.transactionType === 'RECHARGE' ? '充值' : '圈回' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="transactionAmount" label="交易余额（元）" width="150"> </el-table-column>
+        <el-table-column label="审核状态" width="150">
+          <template slot-scope="{ row }">
+            <el-button
+              :disabled="row.auditMark !== 'SUBMITED'"
+              @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 prop="auditTime" label="审核时间" width="180"> </el-table-column>
+        <el-table-column prop="auditUserName" label="审核用户" width="150"> </el-table-column>
+        <el-table-column prop="orderSerialNumber" label="操作" width="100">
+          <template slot-scope="{ row }">
+            <el-link type="primary" :underline="false" @click="detail(row)">详情</el-link>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!-- 分页 -->
+      <pagination :parameter="parameter" @searchAgain="getByPage" />
+    </div>
+    <!-- 充值圈回 -->
+    <recharge-turn :controlWindows="controlWindows" @closeWindow="search" />
+    <!-- 审核 -->
+    <examine :controlWindows="controlWindows" @closeWindow="search" />
+    <!-- 详情 -->
+    <el-drawer title="详情" direction="ltr" size="60%" :withHeader="false" :visible.sync="controlWindows.detail">
+      <general-details
+        class="pft14"
+        title="详情"
+        v-if="controlWindows.detail"
+        :isHeader="true"
+        :sourceData="oilCompanyMatch"
+        :mappingData="mappingData"
+        @close="controlWindows.detail = false"
+      >
+        <template #auditMark>
+          <p>
+            {{ auditMarkEnum.find(item => item.value == oilCompanyMatch[0].auditMark).label }}
+          </p>
+        </template>
+        <template #transactionType>
+          <p>
+            {{ oilCompanyMatch[0].transactionType === 'RECHARGE' ? '充值' : '圈回' }}
+          </p>
+        </template>
+      </general-details>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+import refineryInfoServe from '@/api/refineryInfo.js'
+import serve from '@/api/refineryAccount/rechargeManagement.js'
+
+// import add from './components/add.vue'
+
+import pagination from 'components/pagination/index.vue'
+import autocomplete from 'components/autocomplete/index.vue'
+import generalDetails from 'components/generalDetails/index.vue'
+import rechargeTurn from './components/rechargeTurn.vue'
+import examine from './components/examine.vue'
+
+import { refineryTypeEnum, refineryAccountTypeEnum } from 'utils/dataType.js'
+
+export default {
+  components: {
+    // add,
+    pagination,
+    autocomplete,
+    generalDetails,
+    rechargeTurn,
+    examine
+  },
+  data() {
+    return {
+      auditMarkEnum: [
+        {
+          label: '创建',
+          value: 'SUBMITED',
+          type: 'primary'
+        },
+        {
+          label: '审核成功',
+          value: 'SUCCESS',
+          type: 'success'
+        },
+        {
+          label: '审核失败',
+          value: 'FAILURE',
+          type: 'danger'
+        },
+        {
+          label: '申请取消',
+          value: 'CANCELED',
+          type: 'warning'
+        }
+      ],
+      refineryTypeEnum: refineryTypeEnum,
+      refineryAccountTypeEnum: refineryAccountTypeEnum,
+      controlWindows: {
+        add: false,
+        addInfo: {},
+        detail: false,
+        rechargeTurn: false,
+        examine: false
+      },
+      configAutocomplete: {
+        serveTarget: refineryInfoServe.findByEntity,
+        autocompleteKey: 'refineryName',
+        labelKey: 'refineryName',
+        valueKey: 'id',
+        placeholder: '炼厂名称',
+        querykey: 'refineryId'
+      },
+      tableHeight: 0,
+      tableData: [],
+      parameter: {
+        currentPage: 1,
+        pageSize: 10,
+        total: 0,
+        params: {}
+      },
+      oilCompanyMatch: {},
+      mappingData: [
+        {
+          carTitle: '',
+          carItems: [
+            { label: '炼厂名称', value: 'refineryName' },
+            { label: '炼厂ID', value: 'refineryId' },
+            { label: '炼厂账户名称', value: 'accountName' },
+            { label: '炼厂账户ID', value: 'refineryAccountId' },
+            { label: '交易类型', value: 'transactionType' },
+            { label: '审核状态', value: 'auditMark' },
+            { label: '创建用户', value: 'createUserName' },
+            { label: '创建时间', value: 'createTime' }
+          ]
+        }
+      ]
+    }
+  },
+
+  mounted() {
+    this.$nextTick(() => {
+      this.heightHandle()
+    })
+    window.addEventListener('resize', this.$utils.debounce(this.heightHandle, 500))
+  },
+  created() {
+    this.getByPage()
+  },
+  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
+    // },
+    //修改
+    // update(row) {
+    //   this.controlWindows.addInfo = {
+    //     title: '账户新增',
+    //     ...row
+    //   }
+    //   this.controlWindows.add = true
+    // },
+    // 充值圈回
+    rechargeTurn() {
+      this.controlWindows.rechargeTurn = true
+    },
+    // 详情
+    detail(row) {
+      serve.getOneByEntity({ id: row.id }).then(res => {
+        if (res.code === 20000) {
+          this.oilCompanyMatch = [res.data]
+          this.controlWindows.detail = true
+        }
+      })
+    },
+    // 审核
+    examine(row) {
+      this.controlWindows.addInfo = row
+      this.controlWindows.examine = true
+    },
+    //重置
+    reset() {
+      Object.assign(this.parameter, {
+        currentPage: 1,
+        pageSize: 10,
+        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>
+.order {
+  .pft14 {
+    font-size: 14px;
+  }
+  .frame {
+    margin: 20px;
+    padding: 20px;
+    // width: 100%;
+    border-radius: 6px;
+    border: 1px solid #e3e3e5;
+    background: #fff;
+    .el-input,
+    .el-select {
+      width: 183px;
+      height: 40px;
+    }
+    .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-link {
+      margin-right: 10px;
+    }
+  }
+  .pft14 {
+    font-size: 14px;
+  }
+}
+</style>
diff --git a/src/views/refineryInfo/index.vue b/src/views/refineryInfo/index.vue
index 53344fb..cdf2f4d 100644
--- a/src/views/refineryInfo/index.vue
+++ b/src/views/refineryInfo/index.vue
@@ -67,7 +67,7 @@
           <template slot-scope="{ row }">
             <p v-if="row.refineryType">
               {{
-                refineryTypeEnum.find((item) => item.value === row.refineryType)
+                refineryTypeEnum.find((item) => item.value == row.refineryType)
                   .label
               }}
             </p>
@@ -154,7 +154,7 @@
           <p>
             {{
               refineryTypeEnum.find(
-                (item) => item.value === oilCompanyMatch[0].refineryType
+                (item) => item.value == oilCompanyMatch[0].refineryType
               ).label
             }}
           </p>
diff --git a/vue.config.js b/vue.config.js
index 042482e..bebb8a1 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -8,8 +8,6 @@ function resolve(dir) {
 
 const name = defaultSettings.title || "vue Admin Template";
 
-const port = process.env.port || process.env.npm_config_port || 9530;
-
 module.exports = {
   publicPath: "/refinery",
   outputDir: "dist",
@@ -17,7 +15,7 @@ module.exports = {
   productionSourceMap: false,
   devServer: {
     inline: true,
-    port: port,
+    port: 9530,
     open: false,
     overlay: {
       warnings: false,
@@ -29,7 +27,7 @@ module.exports = {
       [process.env.VUE_APP_BASE_API]: {
         // target: `https://3816t6291y.oicp.vip`,
         // target: 'https://6l438d1757.zicp.fun',
-        target: "http://192.168.0.23:38080",
+        target: "http://192.168.1.85:38080",
         // target: "http://uat.xingoil.com/adminapi",
         changeOrigin: true,
         pathRewrite: {