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

---
 src/layout/components/Navbar.vue |  36 +++++------
 src/store/modules/user.js        |  41 ++++++------
 src/utils/request.js             | 104 +++++++++++++++----------------
 3 files changed, 92 insertions(+), 89 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 118d8d5..680693d 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -1,10 +1,6 @@
 <template>
   <div class="navbar">
-    <hamburger
-      :is-active="sidebar.opened"
-      class="hamburger-container"
-      @toggleClick="toggleSideBar"
-    />
+    <hamburger :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
 
     <breadcrumb class="breadcrumb-container" />
 
@@ -25,34 +21,36 @@
 </template>
 
 <script>
-import { mapGetters } from "vuex";
-import Breadcrumb from "@/components/Breadcrumb";
-import Hamburger from "@/components/Hamburger";
+import { mapGetters } from 'vuex'
+import Breadcrumb from '@/components/Breadcrumb'
+import Hamburger from '@/components/Hamburger'
+import store from '@/store'
 
-import serve from "api/login.js";
+import serve from 'api/login.js'
 
 export default {
   components: {
     Breadcrumb,
-    Hamburger,
+    Hamburger
   },
   computed: {
-    ...mapGetters(["sidebar", "avatar"]),
+    ...mapGetters(['sidebar', 'avatar'])
   },
   methods: {
     toggleSideBar() {
-      this.$store.dispatch("app/toggleSideBar");
+      this.$store.dispatch('app/toggleSideBar')
     },
     logout() {
-      serve.loginOut().then((res) => {
+      serve.loginOut().then(res => {
         if (res.code === 20000) {
-          localStorage.removeItem("businessToken");
-          this.$router.push("/login");
+          localStorage.removeItem('businessToken')
+          store.dispatch('user/removeInfo')
+          this.$router.push('/login')
         }
-      });
-    },
-  },
-};
+      })
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 4e2475e..e963d21 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,40 +1,45 @@
 const getDefaultState = () => {
   return {
-    name: "admin",
-    avatar: "",
+    name: 'admin',
+    avatar: '',
     auth: null,
     companyType: 0,
-    companyId: "",
-  };
-};
+    companyId: ''
+  }
+}
 
-const state = getDefaultState();
+const state = getDefaultState()
 
 const mutations = {
   SET_NAME: (state, name) => {
-    state.name = name;
+    state.name = name
   },
   SET_AUTH: (state, auth) => {
-    state.auth = auth;
+    state.auth = auth
   },
   SET_COMPANYTYPE: (state, data) => {
     //chainParentMark  1：总公司 0：分公司
-    state.companyType = data.chainParentMark;
-    state.companyId = data.userCompany;
-  },
-};
+    state.companyType = data.chainParentMark
+    state.companyId = data.userCompany
+  }
+}
 
 const actions = {
   info({ commit }, data) {
-    commit("SET_AUTH", data.authList);
-    commit("SET_NAME", data.name);
-    commit("SET_COMPANYTYPE", data);
+    commit('SET_AUTH', data.authList)
+    commit('SET_NAME', data.name)
+    commit('SET_COMPANYTYPE', data)
   },
-};
+  removeInfo({ commit }) {
+    commit('SET_AUTH', null)
+    commit('SET_NAME', '')
+    commit('SET_COMPANYTYPE', 0)
+  }
+}
 
 export default {
   namespaced: true,
   state,
   mutations,
-  actions,
-};
+  actions
+}
diff --git a/src/utils/request.js b/src/utils/request.js
index 4b10a73..12d3904 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -1,89 +1,89 @@
-import Vue from "vue";
-import axios from "axios";
-import utils from "@/utils/encode";
+import Vue from 'vue'
+import axios from 'axios'
+import utils from '@/utils/encode'
 //加密白名单
-const encryptWhite = [];
-const env = process.env.VUE_APP_ENV;
+const encryptWhite = []
+const env = process.env.VUE_APP_ENV
 
 const service = axios.create({
   baseURL: process.env.VUE_APP_BASE_API,
-  timeout: 20000,
-});
+  timeout: 20000
+})
 // 请求拦截
 service.interceptors.request.use(
-  (config) => {
-    let token = localStorage.getItem("businessToken");
+  config => {
+    let token = localStorage.getItem('businessToken')
 
     if (token) {
-      config.headers["Authorization"] = token;
-    } else delete config.headers["Authorization"];
+      config.headers['Authorization'] = token
+    } else delete config.headers['Authorization']
 
-    const JSESSIONID = utils.uuid();
-    config.headers["JSESSIONID"] = JSESSIONID;
-    config.headers["token"] = utils.bcrypt(JSESSIONID);
+    const JSESSIONID = utils.uuid()
+    config.headers['JSESSIONID'] = JSESSIONID
+    config.headers['token'] = utils.bcrypt(JSESSIONID)
     config.headers['dataSources'] = 'WEB'
-    if (env === "development") {
-      return config;
+    if (env === 'development') {
+      return config
     }
-    if (env === "production" || ebv === "test") {
+    if (env === 'production' || env === 'test') {
       //加密
       config.data = {
-        params: utils.encrypt(JSON.stringify(config.data)),
-      };
+        params: utils.encrypt(JSON.stringify(config.data))
+      }
     }
 
-    if (config.responseType === "blob" && !encryptWhite.includes(config.url)) {
-      const data = {
-        params: utils.encrypt(JSON.stringify(config.data)),
-      };
-      config.data = data;
-    }
-    return config;
+    // if (config.responseType === 'blob' && !encryptWhite.includes(config.url)) {
+    //   const data = {
+    //     params: utils.encrypt(JSON.stringify(config.data))
+    //   }
+    //   config.data = data
+    // }
+    return config
   },
-  (error) => {
-    console.log("axios request error:", error);
-    return Promise.reject();
+  error => {
+    console.log('axios request error:', error)
+    return Promise.reject()
   }
-);
+)
 // 响应拦截
 service.interceptors.response.use(
-  (response) => {
-    const res = response.data;
-    const contentType = response.headers["content-type"];
+  response => {
+    const res = response.data
+    const contentType = response.headers['content-type']
     //流文件
-    if (!contentType.includes("application/json")) return res;
+    if (!contentType.includes('application/json')) return res
 
-    if (env === "production" || env === "test") {
+    if (env === 'production' || env === 'test') {
       if (res.encrypt === 1) {
-        const dataParam = JSON.parse(utils.decrypt(res.data));
-        res.data = JSON.stringify(dataParam) === "{}" ? null : dataParam;
+        const dataParam = JSON.parse(utils.decrypt(res.data))
+        res.data = JSON.stringify(dataParam) === '{}' ? null : dataParam
       }
     }
 
     if (res && res.code) {
       if (res.code === 42011) {
-        Vue.prototype.$message.error(res.msg || "您的登录已失效，请重新登录");
-        localStorage.removeItem("businessToken");
+        Vue.prototype.$message.error(res.msg || '您的登录已失效，请重新登录')
+        localStorage.removeItem('businessToken')
         setTimeout(() => {
-          window.location.reload();
-        }, 1000);
-        return;
+          window.location.reload()
+        }, 1000)
+        return
       }
       // 白名单
       if (![20000, 42014, 46001].includes(res.code)) {
-        console.log("code码:" + res.code);
-        Vue.prototype.$message.error(res.msg);
-        return Promise.reject();
+        console.log('code码:' + res.code)
+        Vue.prototype.$message.error(res.msg)
+        return Promise.reject()
       } else {
-        return res;
+        return res
       }
     }
   },
-  (error) => {
-    Vue.prototype.$message.error("请求失败");
-    console.log("axios response error:", error);
-    return Promise.reject(error);
+  error => {
+    Vue.prototype.$message.error('请求失败')
+    console.log('axios response error:', error)
+    return Promise.reject(error)
   }
-);
+)
 
-export default service;
+export default service

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

---
 src/api/common.js                             | 60 ++++++++++---------
 .../components/rechargeTurn.vue               | 22 ++++++-
 .../rechargeManagement/index.vue              |  2 +-
 3 files changed, 52 insertions(+), 32 deletions(-)

diff --git a/src/api/common.js b/src/api/common.js
index 1b9552a..f506633 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -1,39 +1,40 @@
-import request from "utils/axios.js";
+import request from 'utils/axios.js'
 // 远程搜索公司
-const getRefineryCompanyList = (params) => {
-  return request.postJson(
-    "/oil-user/oilCompanyInfo/getRefineryCompanyList",
-    params
-  );
-};
+const getRefineryCompanyList = params => {
+  return request.postJson('/oil-user/oilCompanyInfo/getRefineryCompanyList', params)
+}
 // 远程总公司
-const getCompanyNames = (query) => {
-  return request.get(`oil-user/oilCompanyInfo/getCompanyNames/${query}`);
-};
+const getCompanyNames = query => {
+  return request.get(`oil-user/oilCompanyInfo/getCompanyNames/${query}`)
+}
 // 远程搜索用户
-const liekQuery = (query) => {
-  return request.get(`oil-user/sysCustomerInfo/liekQuery/${query}`);
-};
+const liekQuery = query => {
+  return request.get(`oil-user/sysCustomerInfo/liekQuery/${query}`)
+}
 // 用户详情
-const getInfo = (id) => {
-  return request.get(`/oil-user/oilCompanyInfo/get/${id}`);
-};
+const getInfo = id => {
+  return request.get(`/oil-user/oilCompanyInfo/get/${id}`)
+}
 //公司财务信息
-const getByCompanyIdFinance = (query) => {
-  return request.get(`/oil-user/oilCompanyFinance/getByCompanyId/${query}`);
-};
+const getByCompanyIdFinance = query => {
+  return request.get(`/oil-user/oilCompanyFinance/getByCompanyId/${query}`)
+}
 // 公司认证信息
-const getByCompanyIdAuth = (id) => {
-  return request.get(`/oil-user/oilCompanyAuth/getByCompanyId/${id}`);
-};
+const getByCompanyIdAuth = id => {
+  return request.get(`/oil-user/oilCompanyAuth/getByCompanyId/${id}`)
+}
 //公司账户信息
-const getByCompanyIdAccount = (query) => {
-  return request.get(`/oil-finance/oilCompanyAccount/getByCompanyId/${query}`);
-};
+const getByCompanyIdAccount = query => {
+  return request.get(`/oil-finance/oilCompanyAccount/getByCompanyId/${query}`)
+}
 // 银行信息
-const getByCompanyIdBankCard = (id) => {
-  return request.get(`/oil-finance/oilCompanyBankCard/getByCompanyId/${id}`);
-};
+const getByCompanyIdBankCard = id => {
+  return request.get(`/oil-finance/oilCompanyBankCard/getByCompanyId/${id}`)
+}
+// 炼厂中心账户
+const findByEntity = params => {
+  return request.postJson('/oil-refinery/xoilRefineryCenterAccount/findByEntity', params)
+}
 export default {
   getRefineryCompanyList,
   getCompanyNames,
@@ -43,4 +44,5 @@ export default {
   getByCompanyIdAuth,
   getByCompanyIdFinance,
   getByCompanyIdBankCard,
-};
+  findByEntity
+}
diff --git a/src/views/refineryAccount/rechargeManagement/components/rechargeTurn.vue b/src/views/refineryAccount/rechargeManagement/components/rechargeTurn.vue
index ddea4be..131b7b0 100644
--- a/src/views/refineryAccount/rechargeManagement/components/rechargeTurn.vue
+++ b/src/views/refineryAccount/rechargeManagement/components/rechargeTurn.vue
@@ -28,6 +28,9 @@
             </el-descriptions-item>
           </el-descriptions>
         </el-form-item>
+        <el-form-item label="炼厂中心账户" prop="refineryCenterAccountId">
+          <autocomplete :params="form" :config="accountNameAutocomplete" />
+        </el-form-item>
         <el-form-item label="交易类型" prop="transactionType">
           <el-select v-model="form.transactionType" placeholder="请选择">
             <el-option label="充值" value="RECHARGE"> </el-option>
@@ -49,6 +52,7 @@
 <script>
 import refineryInfoServe from 'api/refineryInfo.js'
 import serve from '@/api/refineryAccount/rechargeManagement.js'
+import commonServe from '@/api/common.js'
 
 import autocomplete from 'components/autocomplete/index.vue'
 export default {
@@ -63,14 +67,19 @@ export default {
       if (this.form.refineryId) callback()
       else callback('请选择炼厂')
     }
+
+    let validatorRefineryCenterAccountId = (rule, value, callback) => {
+      if (this.form.refineryCenterAccountId) 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 {
+      form: { refineryAccountId: '', refineryCenterAccountId: '' },
       refineryAccountList: [],
-      form: { refineryAccountId: '' },
       refineryList: [],
       configAutocomplete: {
         serveTarget: refineryInfoServe.findByEntity,
@@ -80,11 +89,20 @@ export default {
         placeholder: '炼厂名称',
         querykey: 'refineryId'
       },
+      accountNameAutocomplete: {
+        serveTarget: commonServe.findByEntity,
+        autocompleteKey: 'accountName',
+        labelKey: 'accountName',
+        valueKey: 'id',
+        placeholder: '炼厂中心账户',
+        querykey: 'refineryCenterAccountId'
+      },
       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' }]
+        transactionAmount: [{ required: true, validator: validatorTransactionAmount, trigger: 'change' }],
+        refineryCenterAccountId: [{ required: true, validator: validatorRefineryCenterAccountId, trigger: 'change' }]
       }
     }
   },
diff --git a/src/views/refineryAccount/rechargeManagement/index.vue b/src/views/refineryAccount/rechargeManagement/index.vue
index 28c43f6..0644fb0 100644
--- a/src/views/refineryAccount/rechargeManagement/index.vue
+++ b/src/views/refineryAccount/rechargeManagement/index.vue
@@ -19,7 +19,7 @@
     </div>
     <div class="table">
       <div class="operation">
-        <el-button @click="rechargeTurn">充值圈回</el-button>
+        <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>

From 514cd0a652f6e857704ef9ea49f48e8819854dae Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Mon, 19 Jun 2023 17:45:27 +0800
Subject: [PATCH 03/11] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/financialCenter/enterpriseRecharge.js |  55 ++--
 src/components/autocomplete/index.vue         |   5 +-
 .../enterpriseRecharge/components/add.vue     | 308 ++++++++----------
 .../enterpriseRecharge/components/addTurn.vue | 222 ++++++-------
 4 files changed, 271 insertions(+), 319 deletions(-)

diff --git a/src/api/financialCenter/enterpriseRecharge.js b/src/api/financialCenter/enterpriseRecharge.js
index ad58207..bfcf1f7 100644
--- a/src/api/financialCenter/enterpriseRecharge.js
+++ b/src/api/financialCenter/enterpriseRecharge.js
@@ -1,42 +1,33 @@
-import request from "utils/axios.js";
+import request from 'utils/axios.js'
 // table
-const getByPage = (params) => {
-  return request.postJson(
-    "/oil-finance/oilCompanyAccountReverse/getByPage",
-    params
-  );
-};
+const getByPage = params => {
+  return request.postJson('/oil-finance/oilCompanyAccountReverse/getByPage', params)
+}
 //详情
-const get = (query) => {
-  return request.get(`/oil-finance/oilCompanyAccountReverse/get/${query}`);
-};
+const get = query => {
+  return request.get(`/oil-finance/oilCompanyAccountReverse/get/${query}`)
+}
 
 //公司财务详情
-const getByCompanyId = (query) => {
-  return request.get(`/oil-user/oilCompanyFinance/getByCompanyId/${query}`);
-};
+const getByCompanyId = query => {
+  return request.get(`/oil-user/oilCompanyFinance/getByCompanyId/${query}`)
+}
 // 新增
-const save = (params) => {
-  return request.postJson("/oil-finance/oilCompanyAccountReverse/save", params);
-};
+const save = params => {
+  return request.postJson('/oil-finance/oilCompanyAccountReverse/refineryCustomerRecharge', params)
+}
 // 修改
-const update = (params) => {
-  return request.postPut(
-    "/oil-finance/oilCompanyAccountReverse/update",
-    params
-  );
-};
+const update = params => {
+  return request.postPut('/oil-finance/oilCompanyAccountReverse/update', params)
+}
 // 级联
 const getCascaderList = () => {
-  return request.get("/oil-finance/internalCompany/getCascaderList");
-};
+  return request.get('/oil-finance/internalCompany/getCascaderList')
+}
 // 审核
-const audit = (params) => {
-  return request.postJson(
-    "/oil-finance/oilCompanyAccountReverse/refinery/audit",
-    params
-  );
-};
+const audit = params => {
+  return request.postJson('/oil-finance/oilCompanyAccountReverse/refinery/audit', params)
+}
 
 //公司 远程搜索
 // const getLikeByNameSuccess = (params) => {
@@ -53,6 +44,6 @@ export default {
   save,
   update,
   getCascaderList,
-  audit,
+  audit
   // getLikeByNameSuccess,
-};
+}
diff --git a/src/components/autocomplete/index.vue b/src/components/autocomplete/index.vue
index 8c7cacb..9293467 100644
--- a/src/components/autocomplete/index.vue
+++ b/src/components/autocomplete/index.vue
@@ -34,9 +34,10 @@ export default {
     // config: {
     //   serveTarget: {}, // 远程搜索接口
     //   autocompleteKey: "", //远程搜索接口参数名
-    //   labelKey: "", //接口返回数据label名
+    //   labelKey: [] || '', //接口返回数据label
     //   valueKey: "", //接口返回数据id
     //   querykey: "", //查询接口参数名
+    //   echoId:'', //
     // },
   },
   data() {
@@ -50,6 +51,7 @@ export default {
   watch: {
     'config.echoId': {
       handler(nval, oval) {
+        console.log('nvalnvalnvalnvalnval', nval)
         this.list = []
         let type = this.$utils.typeJudgment(this.config.echoName)
         if (nval && ['String'].includes(type)) {
@@ -97,6 +99,7 @@ export default {
     },
     // 远程搜索
     remoteMethod(query) {
+      console.log('query', query)
       if (query !== '') {
         this.loading = true
         let type = this.$utils.typeJudgment(this.config.autocompleteKey)
diff --git a/src/views/financialCenter/enterpriseRecharge/components/add.vue b/src/views/financialCenter/enterpriseRecharge/components/add.vue
index 8c23456..2a3baec 100644
--- a/src/views/financialCenter/enterpriseRecharge/components/add.vue
+++ b/src/views/financialCenter/enterpriseRecharge/components/add.vue
@@ -10,36 +10,19 @@
     <div class="add">
       <el-form ref="form" :model="form" :rules="rules" label-width="140px">
         <el-form-item label="公司" prop="companyId">
-          <autocomplete
-            :params="form"
-            :config="configAutocomplete"
-            @change="companyChange"
-          />
+          <autocomplete :params="form" :config="configAutocomplete" @change="companyChange" />
         </el-form-item>
         <el-form-item label="交易类型" prop="transactionType">
-          <el-select
-            :disabled="!!form.id"
-            v-model="form.transactionType"
-            placeholder="请选择交易类型"
-            @change="changeTransactionType"
-          >
+          <el-select :disabled="!!form.id" v-model="form.transactionType" placeholder="请选择交易类型" @change="changeTransactionType">
             <el-option label="充值" value="RECHARGE" />
             <!-- <el-option label="赊销" value="CHARGE_SALES" />
             <el-option label="消费返利" value="CONSUME_REBATE" /> -->
           </el-select>
         </el-form-item>
 
-        <template
-          v-if="
-            companyFinance.settlementModes === 1 ||
-            companyFinance.settlementModes === 3
-          "
-        >
+        <template v-if="companyFinance.settlementModes === 1 || companyFinance.settlementModes === 3">
           <el-form-item label="充值返利比例">
-            <el-input
-              disabled
-              v-model="companyFinance.rechargeRebate"
-            ></el-input>
+            <el-input disabled v-model="companyFinance.rechargeRebate"></el-input>
           </el-form-item>
           <el-form-item label="预计充值返利金额">
             <el-input disabled v-model="rechargeRebateAmount"></el-input>
@@ -47,28 +30,20 @@
         </template>
 
         <el-form-item label="交易金额" prop="transactionAmount">
-          <el-input
-            v-checkNum
-            v-model="form.transactionAmount"
-            placeholder="请输入交易金额"
-          ></el-input>
+          <el-input v-checkNum v-model="form.transactionAmount" placeholder="请输入交易金额"></el-input>
         </el-form-item>
 
         <template v-if="form.transactionType === 'RECHARGE'">
           <el-form-item label="企业收款账户">
-            <el-cascader
-              :options="cascaderList"
-              v-model="form.companyBankCardArr"
-              filterable
-              clearable
-            ></el-cascader>
+            <el-cascader :options="cascaderList" v-model="form.companyBankCardArr" filterable clearable></el-cascader>
+          </el-form-item>
+
+          <el-form-item label="炼厂中心账户" prop="refineryCenterAccountId">
+            <autocomplete :params="form" :config="accountNameAutocomplete" />
           </el-form-item>
 
           <el-form-item label="线下汇款公司账户" prop="offlinePaymentCompany">
-            <el-input
-              v-model="form.offlinePaymentCompany"
-              placeholder="请输入线下汇款公司账户"
-            ></el-input>
+            <el-input v-model="form.offlinePaymentCompany" placeholder="请输入线下汇款公司账户"></el-input>
           </el-form-item>
 
           <el-form-item label="线下交易发起时间" prop="offlineStartTime">
@@ -96,20 +71,14 @@
           </el-form-item>
         </template>
 
-        <el-form-item
-          v-if="
-            form.transactionType === 'CONSUME_REBATE' ||
-            form.transactionType === 'RECHARGE'
-          "
-          label="线下交易凭证"
-        >
+        <el-form-item v-if="form.transactionType === 'CONSUME_REBATE' || form.transactionType === 'RECHARGE'" label="线下交易凭证">
           <el-upload
             :action="uploadUrl"
             :data="{
               ossKey: 'xingyou',
               pathKey: 'other',
               encrypt: 'PUBLIC',
-              code: 'A003',
+              code: 'A003'
             }"
             list-type="picture-card"
             :on-preview="handlePictureCardPreview"
@@ -127,13 +96,7 @@
         </el-form-item>
 
         <el-form-item label="交易说明">
-          <el-input
-            type="textarea"
-            :rows="2"
-            placeholder="请输入交易说明"
-            v-model="form.reverseRemark"
-          >
-          </el-input>
+          <el-input type="textarea" :rows="2" placeholder="请输入交易说明" v-model="form.reverseRemark"> </el-input>
         </el-form-item>
       </el-form>
     </div>
@@ -145,41 +108,42 @@
 </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 autocomplete from "components/autocomplete/index.vue";
+import autocomplete from 'components/autocomplete/index.vue'
 
-import utils from "utils/encode";
-const JSESSIONID = utils.uuid();
+import utils from 'utils/encode'
+const JSESSIONID = utils.uuid()
 
 export default {
   components: {
-    autocomplete,
+    autocomplete
   },
   props: {
-    controlWindows: Object,
+    controlWindows: Object
   },
   data() {
     let validatorcompanyId = (rule, value, callback) => {
-      if (this.form.companyId) callback();
-      else callback("请选择公司");
-    };
+      if (this.form.companyId) callback()
+      else callback('请选择公司')
+    }
+    let validatorRefineryCenterAccountId = (rule, value, callback) => {
+      if (this.form.refineryCenterAccountId) callback()
+      else callback('请选择炼厂中心账户')
+    }
     // let validatorofflineTransactionProof = (rule, value, callback) => {
     //   if (this.form.offlineTransactionProof) callback();
     //   else callback("请上传凭证");
     // };
     return {
-      uploadUrl:
-        process.env.VUE_APP_ENV === "development"
-          ? "/api/oil-oss/obejct/uploadFile"
-          : "/adminapi/oil-oss/obejct/uploadFile",
+      uploadUrl: process.env.VUE_APP_ENV === 'development' ? '/api/oil-oss/obejct/uploadFile' : '/adminapi/oil-oss/obejct/uploadFile',
       imgDialog: false,
       headers: {
-        dataSources: "WEB",
-        Authorization: localStorage.getItem("businessToken"),
+        dataSources: 'WEB',
+        Authorization: localStorage.getItem('businessToken'),
         JSESSIONID: JSESSIONID,
-        token: utils.bcrypt(JSESSIONID),
+        token: utils.bcrypt(JSESSIONID)
       },
       fileList: [],
       cascaderList: [],
@@ -187,179 +151,183 @@ export default {
       form: {},
       configAutocomplete: {
         serveTarget: commonServe.getRefineryCompanyList,
-        autocompleteKey: "name",
-        labelKey: "name",
-        valueKey: "id",
-        placeholder: "企业名称",
-        querykey: "companyId",
-        echoId: "",
-        echoName: "",
-        isDisabled: false,
+        autocompleteKey: 'name',
+        labelKey: 'name',
+        valueKey: 'id',
+        placeholder: '企业名称',
+        querykey: 'companyId',
+        echoId: '',
+        echoName: '',
+        isDisabled: false
+      },
+      accountNameAutocomplete: {
+        serveTarget: commonServe.findByEntity,
+        autocompleteKey: 'accountName',
+        labelKey: 'accountName',
+        valueKey: 'id',
+        placeholder: '炼厂中心账户',
+        querykey: 'refineryCenterAccountId',
+        echoId: '',
+        echoName: '',
+        isDisabled: false
       },
       rules: {
-        companyId: [
-          { required: true, validator: validatorcompanyId, trigger: "change" },
-        ],
-        transactionType: [
-          { required: true, message: "请选择交易类型", trigger: "change" },
-        ],
-        transactionAmount: [
-          { required: true, message: "请输入交易金额", trigger: "blur" },
-        ],
+        companyId: [{ required: true, validator: validatorcompanyId, trigger: 'change' }],
+        transactionType: [{ required: true, message: '请选择交易类型', trigger: 'change' }],
+        transactionAmount: [{ required: true, message: '请输入交易金额', trigger: 'blur' }],
         offlinePaymentCompany: [
           {
             required: true,
-            message: "请输入线下汇款公司账户",
-            trigger: "blur",
-          },
+            message: '请输入线下汇款公司账户',
+            trigger: 'blur'
+          }
         ],
         offlineStartTime: [
           {
             required: true,
-            message: "请选择线下交易发起时间",
-            trigger: "change",
-          },
+            message: '请选择线下交易发起时间',
+            trigger: 'change'
+          }
         ],
         offlineCompleteTime: [
           {
             required: true,
-            message: "请选择线下交易完成时间",
-            trigger: "change",
-          },
+            message: '请选择线下交易完成时间',
+            trigger: 'change'
+          }
         ],
         offlineCompleteTime: [
           {
             required: true,
-            message: "请选择企业收款账户",
-            trigger: "change",
-          },
+            message: '请选择企业收款账户',
+            trigger: 'change'
+          }
         ],
-      },
-    };
+        refineryCenterAccountId: [{ required: true, validator: validatorRefineryCenterAccountId, trigger: 'change' }]
+      }
+    }
   },
   computed: {
     rechargeRebateAmount() {
-      if (
-        this.companyFinance.settlementModes === 1 ||
-        this.companyFinance.settlementModes === 3
-      ) {
-        return (
-          (this.form.transactionAmount || 0) *
-          this.companyFinance.rechargeRebate
-        );
-      } else return this.companyFinance.rechargeRebateAmount;
-    },
+      if (this.companyFinance.settlementModes === 1 || this.companyFinance.settlementModes === 3) {
+        return (this.form.transactionAmount || 0) * this.companyFinance.rechargeRebate
+      } else return this.companyFinance.rechargeRebateAmount
+    }
   },
   created() {
-    this.getCascaderList();
+    this.getCascaderList()
   },
   methods: {
     openDrawer() {
-      let { id } = this.controlWindows.addInfo;
+      let { id, companyName, refineryCenterAccountId, refineryCenterAccountName } = this.controlWindows.addInfo
       //回显
       if (id) {
-        this.form = JSON.parse(JSON.stringify(this.controlWindows.addInfo));
-        this.form["companyBankCardArr"] = [
-          +this.form.internalCompanyId,
-          this.form.companyBankCardId,
-        ];
+        this.form = JSON.parse(JSON.stringify(this.controlWindows.addInfo))
+        this.form['companyBankCardArr'] = [+this.form.internalCompanyId, this.form.companyBankCardId]
         if (this.form.offlineTransactionProof) {
           this.fileList.push({
-            url: this.form.offlineTransactionProof,
-          });
+            url: this.form.offlineTransactionProof
+          })
         }
-      }
-      let configUpdata = {
-        echoId: id || "",
-        echoName: this.form.refineryName || "",
-        isDisabled: !!id,
-      };
 
-      Object.assign(this.configAutocomplete, configUpdata);
+        let configUpdata = {
+          echoId: id || '',
+          echoName: companyName || '',
+          isDisabled: !!id
+        }
+        let configUpdata2 = {
+          echoId: refineryCenterAccountId || '',
+          echoName: refineryCenterAccountName || '',
+          isDisabled: !!id
+        }
+
+        Object.assign(this.configAutocomplete, configUpdata)
+        Object.assign(this.accountNameAutocomplete, configUpdata2)
+      }
     },
     // 公司change
     companyChange(id) {
       if (id) {
-        serve.getByCompanyId(id).then((res) => {
-          this.companyFinance = res.data;
-        });
+        serve.getByCompanyId(id).then(res => {
+          this.companyFinance = res.data
+        })
       }
     },
     // 交易类型 change
     changeTransactionType(val) {
-      if (val === "CHARGE_SALES") {
-        this.handleRemove();
+      if (val === 'CHARGE_SALES') {
+        this.handleRemove()
       }
     },
     beforeHandle(file) {
-      if (file.type.indexOf("image/") === -1) {
-        this.$message.error("上传的文件不是图片格式!");
-        return false;
+      if (file.type.indexOf('image/') === -1) {
+        this.$message.error('上传的文件不是图片格式!')
+        return false
       } else if (file.size / 1024 / 1024 > 5) {
-        this.$message.error("上传图片大小不能超过 5MB!");
-        return false;
+        this.$message.error('上传图片大小不能超过 5MB!')
+        return false
       }
-      return true;
+      return true
     },
 
     //img大图
     handlePictureCardPreview(file) {
-      this.form.offlineTransactionProof = file.url;
-      this.imgDialog = true;
+      this.form.offlineTransactionProof = file.url
+      this.imgDialog = true
     },
     // img remove
     handleRemove(file, fileList) {
-      this.form.offlineTransactionProof = "";
+      this.form.offlineTransactionProof = ''
     },
     // 上传成功
     handleSuccess(response, file, fileList) {
       if (response.code !== 20000) {
-        this.$message.error(response.msg);
-        this.fileList = [];
-        return;
+        this.$message.error(response.msg)
+        this.fileList = []
+        return
       }
-      console.log("response", response);
-      this.form.offlineTransactionProof = response.data.publicUrl;
+      console.log('response', response)
+      this.form.offlineTransactionProof = response.data.publicUrl
     },
     //企业收款账户
     getCascaderList() {
-      serve.getCascaderList().then((res) => {
-        this.cascaderList = res.data;
-      });
+      serve.getCascaderList().then(res => {
+        this.cascaderList = res.data
+      })
     },
     submit() {
-      this.$refs["form"].validate((valid) => {
+      this.$refs['form'].validate(valid => {
         if (valid) {
-          let params = { transactionType: "RECHARGE", ...this.form };
+          let params = { transactionType: 'RECHARGE', ...this.form }
           if (this.form.companyBankCardArr.length) {
-            let index = this.form.companyBankCardArr.length - 1;
-            params["companyBankCardId"] = this.form.companyBankCardArr[index];
+            let index = this.form.companyBankCardArr.length - 1
+            params['companyBankCardId'] = this.form.companyBankCardArr[index]
           }
-          this.judgeInterface(params).then((res) => {
-            this.$message.success(res.msg);
-            this.closeWindow();
-          });
+          this.judgeInterface(params).then(res => {
+            this.$message.success(res.msg)
+            this.closeWindow()
+          })
         }
-      });
+      })
     },
     judgeInterface(form) {
-      let { id } = this.controlWindows.addInfo;
-      if (id) return serve.update(form);
-      else return serve.save(form);
+      let { id } = this.controlWindows.addInfo
+      if (id) return serve.update(form)
+      else return serve.save(form)
     },
     closeWindow() {
-      this.$emit("closeWindow");
-      this.form = {};
-      this.companyFinance = {};
-      this.fileList = [];
-      this.controlWindows.addInfo = {};
+      this.$emit('closeWindow')
+      this.form = {}
+      this.companyFinance = {}
+      this.fileList = []
+      this.controlWindows.addInfo = {}
       this.$nextTick(() => {
-        this.$refs.form.clearValidate();
-        this.controlWindows.add = false;
-      });
-    },
-  },
-};
+        this.$refs.form.clearValidate()
+        this.controlWindows.add = false
+      })
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/financialCenter/enterpriseRecharge/components/addTurn.vue b/src/views/financialCenter/enterpriseRecharge/components/addTurn.vue
index 1e10d77..d251492 100644
--- a/src/views/financialCenter/enterpriseRecharge/components/addTurn.vue
+++ b/src/views/financialCenter/enterpriseRecharge/components/addTurn.vue
@@ -10,24 +10,11 @@
     <div class="add">
       <el-form ref="form" :model="form" :rules="rules" label-width="140px">
         <el-form-item label="公司" prop="companyId">
-          <autocomplete
-            :params="form"
-            :config="configAutocomplete"
-            @change="companyChange"
-          />
+          <autocomplete :params="form" :config="configAutocomplete" @change="companyChange" />
         </el-form-item>
         <el-form-item label="交易类型" prop="turnType">
-          <el-select
-            :disabled="!!form.id"
-            v-model="form.turnType"
-            placeholder="请选择交易类型"
-          >
-            <el-option
-              v-for="(item, index) in correspondTypeEnum"
-              :key="index"
-              :label="item.label"
-              :value="item.value"
-            />
+          <el-select :disabled="!!form.id" v-model="form.turnType" placeholder="请选择交易类型">
+            <el-option v-for="(item, index) in correspondTypeEnum" :key="index" :label="item.label" :value="item.value" />
           </el-select>
         </el-form-item>
 
@@ -43,17 +30,9 @@
             <el-descriptions-item>
               <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
-                ]
-              }}
+              {{ companyInfo[correspondTypeEnum.find(item => item.value == form.turnType).valueKey] }}
             </el-descriptions-item>
             <!-- <el-descriptions-item label="赊销余额"></el-descriptions-item>
             <el-descriptions-item label="充值返利余额"></el-descriptions-item>
@@ -61,23 +40,16 @@
           </el-descriptions>
         </el-form-item>
 
+        <el-form-item label="炼厂中心账户" prop="refineryCenterAccountId">
+          <autocomplete :params="form" :config="accountNameAutocomplete" />
+        </el-form-item>
+
         <el-form-item label="圈回金额" prop="transactionAmount">
-          <el-input
-            v-checkNum
-            placeholder="圈回金额"
-            v-model="form.transactionAmount"
-          >
-          </el-input>
+          <el-input v-checkNum placeholder="圈回金额" v-model="form.transactionAmount"> </el-input>
         </el-form-item>
 
         <el-form-item label="圈回原因" prop="reverseRemark">
-          <el-input
-            type="textarea"
-            :rows="2"
-            placeholder="请输入圈回原因"
-            v-model="form.reverseRemark"
-          >
-          </el-input>
+          <el-input type="textarea" :rows="2" placeholder="请输入圈回原因" v-model="form.reverseRemark"> </el-input>
         </el-form-item>
       </el-form>
     </div>
@@ -89,17 +61,17 @@
 </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 autocomplete from "components/autocomplete/index.vue";
+import autocomplete from 'components/autocomplete/index.vue'
 
 export default {
   components: {
-    autocomplete,
+    autocomplete
   },
   props: {
-    controlWindows: Object,
+    controlWindows: Object
   },
   data() {
     // let validatorcompanyId = (rule, value, callback) => {
@@ -107,55 +79,65 @@ export default {
     //   else callback("请选择公司");
     // };
     let validatortransactionAmount = (rule, value, callback) => {
-      let typeTarget = this.correspondTypeEnum.find(
-        (item) => item.value == this.form.turnType
-      );
-      let superiorLimit = this.companyInfo[typeTarget.valueKey];
-      if (value == "") callback("请输入圈回金额");
+      let typeTarget = this.correspondTypeEnum.find(item => item.value == this.form.turnType)
+      let superiorLimit = this.companyInfo[typeTarget.valueKey]
+      if (value == '') callback('请输入圈回金额')
       if (value > superiorLimit) {
-        callback(`圈回金额不可超过${typeTarget.label}`);
+        callback(`圈回金额不可超过${typeTarget.label}`)
       }
-      callback();
-    };
+      callback()
+    }
+    let validatorRefineryCenterAccountId = (rule, value, callback) => {
+      if (this.form.refineryCenterAccountId) callback()
+      else callback('请选择炼厂中心账户')
+    }
     return {
       companyFinance: {},
       companyInfo: {},
       form: {},
       configAutocomplete: {
         serveTarget: commonServe.getRefineryCompanyList,
-        autocompleteKey: "name",
-        labelKey: "name",
-        valueKey: "id",
-        placeholder: "企业名称",
-        querykey: "companyId",
-        echoId: "",
-        echoName: "",
-        isDisabled: false,
+        autocompleteKey: 'name',
+        labelKey: 'name',
+        valueKey: 'id',
+        placeholder: '企业名称',
+        querykey: 'companyId',
+        echoId: '',
+        echoName: '',
+        isDisabled: false
+      },
+      accountNameAutocomplete: {
+        serveTarget: commonServe.findByEntity,
+        autocompleteKey: 'accountName',
+        labelKey: 'accountName',
+        valueKey: 'id',
+        placeholder: '炼厂中心账户',
+        querykey: 'refineryCenterAccountId',
+        echoId: '',
+        echoName: '',
+        isDisabled: false
       },
       rules: {
         // companyId: [
         //   { required: true, validator: validatorcompanyId, trigger: "change" },
         // ],
-        turnType: [
-          { required: true, message: "请选择交易类型", trigger: "change" },
-        ],
+        turnType: [{ required: true, message: '请选择交易类型', trigger: 'change' }],
         transactionAmount: [
           {
             required: true,
             validator: validatortransactionAmount,
-            trigger: "change",
-          },
-        ],
-        reverseRemark: [
-          { required: true, message: "请输入圈回说明", trigger: "blur" },
+            trigger: 'blur'
+          }
         ],
+        reverseRemark: [{ required: true, message: '请输入圈回说明', trigger: 'blur' }],
+        refineryCenterAccountId: [{ required: true, validator: validatorRefineryCenterAccountId, trigger: 'change' }]
       },
       correspondTypeEnum: [
         {
           value: 1,
-          label: "充值余额",
-          valueKey: "rechargeBalance",
-        },
+          label: '充值余额',
+          valueKey: 'rechargeBalance'
+        }
         // {
         //   value: 2,
         //   label: "赊销余额",
@@ -171,77 +153,85 @@ export default {
         //   label: "消费返利余额",
         //   valueKey: "consumeRebateBalance",
         // },
-      ],
-    };
+      ]
+    }
   },
   computed: {
-    correspondingEnum() {},
+    correspondingEnum() {}
   },
   methods: {
     openDrawer() {
-      let { id } = this.controlWindows.addInfo;
+      let { id, companyName, refineryCenterAccountId, refineryCenterAccountName } = this.controlWindows.addInfo
       //回显
       if (id) {
-        this.form = JSON.parse(JSON.stringify(this.controlWindows.addInfo));
-        this.form.transactionAmount = Math.abs(this.form.transactionAmount);
-        this.companyChange(this.form.companyId);
+        this.form = JSON.parse(JSON.stringify(this.controlWindows.addInfo))
+        this.form.transactionAmount = Math.abs(this.form.transactionAmount)
+        this.companyChange(this.form.companyId)
+
+        let configUpdata = {
+          echoId: id || '',
+          echoName: companyName || '',
+          isDisabled: !!id
+        }
+        // ? { echoId: id || '', echoName: this.form.refineryName || '', isDisabled: !!id }
+        // : {
+        //     echoId: "",
+        //     echoName: "",
+        //     isDisabled: false,
+        //   };
+        let configUpdata2 = {
+          echoId: refineryCenterAccountId || '',
+          echoName: refineryCenterAccountName || '',
+          isDisabled: !!refineryCenterAccountId
+        }
+        Object.assign(this.configAutocomplete, configUpdata)
+        Object.assign(this.accountNameAutocomplete, configUpdata2)
+        console.log('this.accountNameAutocomplete', this.accountNameAutocomplete)
       }
-      let configUpdata = {
-        echoId: id || "",
-        echoName: this.form.refineryName || "",
-        isDisabled: !!id,
-      };
-      // ? { echoId: id || '', echoName: this.form.refineryName || '', isDisabled: !!id }
-      // : {
-      //     echoId: "",
-      //     echoName: "",
-      //     isDisabled: false,
-      //   };
-      Object.assign(this.configAutocomplete, configUpdata);
     },
     // 公司财务信息
     companyChange(id) {
       if (id) {
-        serve.getByCompanyId(id).then((res) => {
-          this.companyFinance = res.data;
-          this.getByCompanyId(res.data.companyId);
-        });
+        serve.getByCompanyId(id).then(res => {
+          this.companyFinance = res.data
+          this.getByCompanyId(res.data.companyId)
+        })
       }
     },
     //
     getByCompanyId(id) {
-      commonServe.getByCompanyIdAccount(id).then((res) => {
-        this.companyInfo = res.data;
-      });
+      commonServe.getByCompanyIdAccount(id).then(res => {
+        this.companyInfo = res.data
+      })
     },
 
     submit() {
-      this.$refs["form"].validate((valid) => {
+      this.$refs['form'].validate(valid => {
         if (valid) {
-          let params = { transactionType: "TURN", ...this.form };
-          this.judgeInterface(params).then((res) => {
-            this.$message.success(res.msg);
-            this.closeWindow();
-          });
+          let params = { transactionType: 'TURN', ...this.form }
+          this.judgeInterface(params).then(res => {
+            this.$message.success(res.msg)
+            this.closeWindow()
+          })
         }
-      });
+      })
     },
     judgeInterface(form) {
-      let { id } = this.controlWindows.addInfo;
-      if (id) return serve.update(form);
-      else return serve.save(form);
+      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.$emit('closeWindow')
+      this.form = {}
+      this.controlWindows.addInfo = {}
       this.$nextTick(() => {
-        this.$refs.form.clearValidate();
-        this.controlWindows.addTurn = false;
-      });
-    },
-  },
-};
+        this.$refs.form.clearValidate()
+        this.controlWindows.addTurn = false
+      })
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>

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

---
 .../enterpriseRecharge/index.vue              |   3 +-
 src/views/refineryCenter/index.vue            | 437 +++++++++---------
 2 files changed, 214 insertions(+), 226 deletions(-)

diff --git a/src/views/financialCenter/enterpriseRecharge/index.vue b/src/views/financialCenter/enterpriseRecharge/index.vue
index e2c55f8..2b66473 100644
--- a/src/views/financialCenter/enterpriseRecharge/index.vue
+++ b/src/views/financialCenter/enterpriseRecharge/index.vue
@@ -382,7 +382,8 @@ export default {
         this.oilCompanyMatch = [firstRes.data, secondRes.data]
         this.controlWindows.addInfo = {
           examineMark: row.auditMark === 0,
-          id: row.id
+          id: row.id,
+          refineryCenterAccountId: row.refineryCenterAccountId
         }
         this.controlWindows.detail = true
       })
diff --git a/src/views/refineryCenter/index.vue b/src/views/refineryCenter/index.vue
index db3cbef..246140a 100644
--- a/src/views/refineryCenter/index.vue
+++ b/src/views/refineryCenter/index.vue
@@ -2,52 +2,43 @@
   <div class="order">
     <div class="frame">
       <div class="centerStyle">
-        <div>
-          油批中心账户
-        </div>
-        <div  class="centerStyle-bottom">
+        <div>油批中心账户</div>
+        <div class="centerStyle-bottom">
           <div>
-            <span>{{topData.balance}}</span><br>
+            <span>{{ topData.balance }}</span
+            ><br />
             <span>总余额</span>
           </div>
           <div>
-            <span>{{topData.rechargeBalance}}</span><br>
+            <span>{{ topData.rechargeBalance }}</span
+            ><br />
             <span>充值余额</span>
           </div>
-          <div>
-            <span>{{topData.totalRechargeBalance}}</span><br>
+          <!-- <div>
+            <span>{{ topData.totalRechargeBalance }}</span
+            ><br />
             <span>累计充值余额</span>
-          </div>
+          </div> -->
         </div>
       </div>
     </div>
     <div class="frame">
       <!-- 公司名称 -->
-      <autocomplete
-          class="mr20"
-          :params="parameter.params"
-          :config="configAutocomplete"
-        />
-      <el-select style="margin-right: 20px;" v-model="parameter.params.transactionType" placeholder="交易类型" clearable>
-        <el-option
-          v-for="item in refineryList"
-          :key="item.val"
-          :label="item.label"
-          :value="item.val"
-        >
-        </el-option>
+      <autocomplete class="mr20" :params="parameter.params" :config="configAutocomplete" />
+      <el-select style="margin-right: 20px" v-model="parameter.params.transactionType" placeholder="交易类型" clearable>
+        <el-option v-for="item in refineryList" :key="item.val" :label="item.label" :value="item.val"> </el-option>
       </el-select>
       <el-date-picker
-          v-model="parameter.params.createTime"
-          type="datetimerange"
-          align="right"
-          start-placeholder="开始时间"
-          end-placeholder="结束时间"
-          :default-time="['00:00:00', '23:59:59']"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          @change="changeDateTime"
-        >
-        </el-date-picker>
+        v-model="parameter.params.createTime"
+        type="datetimerange"
+        align="right"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        :default-time="['00:00:00', '23:59:59']"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        @change="changeDateTime"
+      >
+      </el-date-picker>
       <!-- <el-select v-model="parameter.params.id" placeholder="产品名称" clearable>
         <el-option
           v-for="item in refineryList"
@@ -58,9 +49,7 @@
         </el-option>
       </el-select> -->
       <div class="buttons">
-        <el-button icon="el-icon-search" @click="handleCurrentChange(1)"
-          >查询</el-button
-        >
+        <el-button icon="el-icon-search" @click="handleCurrentChange(1)">查询</el-button>
         <el-button icon="el-icon-refresh" @click="reset">重置</el-button>
       </div>
     </div>
@@ -68,27 +57,18 @@
       <div class="operation">
         <!-- <el-button icon="el-icon-upload2" @click="addition">炼厂入驻</el-button> -->
       </div>
-      <el-table
-        v-if="tableHeight"
-        ref="multipleTable"
-        :height="tableHeight"
-        :data="tableData"
-        style="width: 100%"
-      >
-      <el-table-column
-          prop="companyName"
-          label="公司名称"
-          show-overflow-tooltip
-          minWidth="250"
-        >
-      </el-table-column>
-        <el-table-column label="交易类型" minWidth="120">
+      <el-table v-if="tableHeight" ref="multipleTable" :height="tableHeight" :data="tableData" style="width: 100%">
+        <el-table-column label="公司名称" show-overflow-tooltip minWidth="250">
           <template slot-scope="{ row }">
-              <span>{{ row.transactionType|refineryType }}</span>
+            <span>{{ row.companyName || row.refineryAccountName }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="交易金额" minWidth="120" prop="transactionAmount">
+        <el-table-column label="交易类型" minWidth="120">
+          <template slot-scope="{ row }">
+            <span>{{ row.transactionType | refineryType }}</span>
+          </template>
         </el-table-column>
+        <el-table-column label="交易金额" minWidth="120" prop="transactionAmount"> </el-table-column>
         <el-table-column label="总余额变动" minWidth="120">
           <template slot-scope="{ row }">
             <p class="gray">
@@ -109,7 +89,7 @@
             </p>
           </template>
         </el-table-column>
-        <el-table-column label="累计充值余额变动" minWidth="120">
+        <!-- <el-table-column label="累计充值余额变动" minWidth="120">
           <template slot-scope="{ row }">
             <p class="gray">
               当前 <span>{{ row.currentTotalRechargeAmount }}</span>
@@ -118,11 +98,9 @@
               上次 <span>{{ row.lastTotalRechargeAmount }}</span>
             </p>
           </template>
-        </el-table-column>
-        <el-table-column prop="orderId" label="业务订单号" minWidth="180">
-        </el-table-column>
-        <el-table-column prop="createTime" label="创建时间" minWidth="210">
-        </el-table-column>
+        </el-table-column> -->
+        <el-table-column prop="orderId" label="业务订单号" minWidth="180"> </el-table-column>
+        <el-table-column prop="createTime" label="创建时间" minWidth="210"> </el-table-column>
       </el-table>
       <el-pagination
         background
@@ -138,13 +116,7 @@
       </el-pagination>
     </div>
 
-    <el-drawer
-      title="详情"
-      direction="ltr"
-      size="60%"
-      :withHeader="false"
-      :visible="controlWindows.detail"
-    >
+    <el-drawer title="详情" direction="ltr" size="60%" :withHeader="false" :visible="controlWindows.detail">
       <general-details
         title="详情"
         :isHeader="true"
@@ -161,86 +133,91 @@
 </template>
 
 <script>
-import serve from "api/refineryInfo.js";
-import commonServe from "api/common.js";
-import order from "api/order.js";
-import generalDetails from "components/generalDetails/index.vue";
-import autocomplete from "components/autocomplete/index.vue";
-import billOfLading from "./components/billOfLading.vue";
+import serve from 'api/refineryInfo.js'
+import commonServe from 'api/common.js'
+import order from 'api/order.js'
+import generalDetails from 'components/generalDetails/index.vue'
+import autocomplete from 'components/autocomplete/index.vue'
+import billOfLading from './components/billOfLading.vue'
 
 export default {
-  filters:{
-    refineryType(val){
-      switch(val){
-        case 'RECHARGE': return '充值'
-        case 'TURN': return '圈回'
-        case 'CORRECTION': return '修正平账'
-        case 'PAYMENT': return '订单支付'
-        case 'RETURN': return '订单回退'
-        case 'REFUND': return '订单退款'
-        case 'TRANSFER': return '转账'
+  filters: {
+    refineryType(val) {
+      switch (val) {
+        case 'RECHARGE':
+          return '充值'
+        case 'TURN':
+          return '圈回'
+        case 'CORRECTION':
+          return '修正平账'
+        case 'PAYMENT':
+          return '订单支付'
+        case 'RETURN':
+          return '订单回退'
+        case 'REFUND':
+          return '订单退款'
+        case 'TRANSFER':
+          return '转账'
       }
-      return val?val:'暂无数据'
-    },
+      return val ? val : '暂无数据'
+    }
   },
   refineryList: [
-        {val:'RECHARGE',label:'充值'},
-        {val:'TURN',label:'圈回'},
-        {val:'CORRECTION',label:'修正平账'},
-        {val:'PAYMENT',label:'订单支付'},
-        {val:'RETURN',label:'订单回退'},
-        {val:'REFUND',label:'订单退款'},
-        {val:'TRANSFER',label:'转账'}
-      ],
+    { val: 'RECHARGE', label: '充值' },
+    { val: 'TURN', label: '圈回' },
+    { val: 'CORRECTION', label: '修正平账' },
+    { val: 'PAYMENT', label: '订单支付' },
+    { val: 'RETURN', label: '订单回退' },
+    { val: 'REFUND', label: '订单退款' },
+    { val: 'TRANSFER', label: '转账' }
+  ],
   data() {
     return {
-      topData:{},
+      topData: {},
       controlWindows: {
         add: false,
-        addInfo: {
-
-        },
+        addInfo: {},
         detail: false,
-        bill: false,
+        bill: false
       },
       configAutocomplete: {
         serveTarget: commonServe.getRefineryCompanyList,
-        autocompleteKey: "name",
-        labelKey: "name",
-        valueKey: "id",
-        placeholder: "企业名称",
-        querykey: "customerId",
+        autocompleteKey: 'name',
+        labelKey: 'name',
+        valueKey: 'id',
+        placeholder: '企业名称',
+        querykey: 'customerId'
       },
       configAutocompleteLc: {
         serveTarget: serve.findByEntity,
-        autocompleteKey: "name",
-        labelKey: "refineryName",
-        valueKey: "id",
-        placeholder: "炼厂名称",
-        querykey: "refineryId",
+        autocompleteKey: 'name',
+        labelKey: 'refineryName',
+        valueKey: 'id',
+        placeholder: '炼厂名称',
+        querykey: 'refineryId'
       },
       configAutocompleteCp: {
         serveTarget: serve.findByEntity,
-        autocompleteKey: "name",
-        labelKey: "refineryName",
-        valueKey: "id",
-        placeholder: "产品名称",
-        querykey: "refineryId",
+        autocompleteKey: 'name',
+        labelKey: 'refineryName',
+        valueKey: 'id',
+        placeholder: '产品名称',
+        querykey: 'refineryId'
       },
       refineryTypeEnum: [
         {
-          label: "普通炼厂",
-          value: "COMMON",
-        },
+          label: '普通炼厂',
+          value: 'COMMON'
+        }
       ],
       refineryList: [
-        {val:'RECHARGE',label:'充值'},
-        {val:'TURN',label:'圈回'},
-        {val:'CORRECTION',label:'修正平账'},
-        {val:'PAYMENT',label:'订单支付'},
-        {val:'RETURN',label:'订单回退'},
-        {val:'REFUND',label:'订单退款'},
-        {val:'TRANSFER',label:'转账'}
+        { val: 'RECHARGE', label: '充值' },
+        { val: 'TURN', label: '圈回' },
+        { val: 'CORRECTION', label: '修正平账' },
+        { val: 'PAYMENT', label: '订单支付' },
+        { val: 'RETURN', label: '订单回退' },
+        { val: 'REFUND', label: '订单退款' },
+        { val: 'TRANSFER', label: '转账' }
       ],
       tableHeight: 0,
       tableData: [],
@@ -249,27 +226,27 @@ export default {
         currentPage: 1,
         pageSize: 10,
         total: 0,
-        params: {},
+        params: {}
       },
       oilCompanyMatch: {},
-      billData:[],
+      billData: [],
       mappingData: [
         {
-          carTitle: "",
+          carTitle: '',
           carItems: [
-            { label: "订单ID", value: "id" },
-            { label: "炼厂ID", value: "refineryId" },
-            { label: "支付状态", value: "payStatus" },
-            { label: "订单状态", value: "orderStatus" },
-            { label: "提货单数量", value: "deliveryCount" },
+            { label: '订单ID', value: 'id' },
+            { label: '炼厂ID', value: 'refineryId' },
+            { label: '支付状态', value: 'payStatus' },
+            { label: '订单状态', value: 'orderStatus' },
+            { label: '提货单数量', value: 'deliveryCount' }
             // { label: "创建用户ID", value: "createUser" },
             // { label: "创建时间", value: "createTime" },
             // { label: "修改用户ID", value: "updateUser" },
             // { label: "修改时间", value: "updateTime" },
-          ],
-        },
-      ],
-    };
+          ]
+        }
+      ]
+    }
   },
   components: {
     generalDetails,
@@ -278,139 +255,150 @@ export default {
   },
   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))
   },
   created() {
-    this.getByPage();
+    this.getByPage()
   },
   methods: {
     changeDateTime(val) {
       if (val) {
-        this.parameter.params.startCreateTime = val[0];
-        this.parameter.params.endCreateTime = val[1];
+        this.parameter.params.startCreateTime = val[0]
+        this.parameter.params.endCreateTime = val[1]
       }
     },
-    payTagType(val){
-      switch(val){
-        case 'PREPAID': return {label:'预支付',type:'info'}
-        case 'PAYING': return {label:'支付中',type:'warning'}
-        case 'SUCCESS': return {label:'支付成功',type:'success',effect:'dark'}
-        case 'FAILURE': return {label:'支付失败',type:'danger',effect:'dark'}
-        case 'CANCELED': return {label:'支付取消',type:'info'}
-        case 'REFUNDED': return {label:'退款成功',type:'danger',effect:'dark'}
-        case 'REFUNDING': return{label:'退款中',type:'warning'}
-        case 'REFUNDFAIL': return{label:'退款失败',type:'info',effect:'dark'}
+    payTagType(val) {
+      switch (val) {
+        case 'PREPAID':
+          return { label: '预支付', type: 'info' }
+        case 'PAYING':
+          return { label: '支付中', type: 'warning' }
+        case 'SUCCESS':
+          return { label: '支付成功', type: 'success', effect: 'dark' }
+        case 'FAILURE':
+          return { label: '支付失败', type: 'danger', effect: 'dark' }
+        case 'CANCELED':
+          return { label: '支付取消', type: 'info' }
+        case 'REFUNDED':
+          return { label: '退款成功', type: 'danger', effect: 'dark' }
+        case 'REFUNDING':
+          return { label: '退款中', type: 'warning' }
+        case 'REFUNDFAIL':
+          return { label: '退款失败', type: 'info', effect: 'dark' }
       }
-      return {label:val?val:'暂无数据',type:'info',effect:'plain'}
+      return { label: val ? val : '暂无数据', type: 'info', effect: 'plain' }
     },
-    orderTagType(val){
-      switch(val){
-        case 'SUBMITED': return {label:'订单提交 ',type:'info'}
-        case 'ORDER_LOCKED': return {label:'订单锁定',type:'warning'}
-        case 'ORDER_SUCCESS': return {label:'下单成功',type:'success',effect:'dark'}
-        case 'DELIVERING': return {label:'提货中', type: ''}
-        case 'COMPLETE': return {label:'订单完成',type:'success',effect:'dark'}
-        case 'CANCELED': return {label:'订单取消',type:'info'}
+    orderTagType(val) {
+      switch (val) {
+        case 'SUBMITED':
+          return { label: '订单提交 ', type: 'info' }
+        case 'ORDER_LOCKED':
+          return { label: '订单锁定', type: 'warning' }
+        case 'ORDER_SUCCESS':
+          return { label: '下单成功', type: 'success', effect: 'dark' }
+        case 'DELIVERING':
+          return { label: '提货中', type: '' }
+        case 'COMPLETE':
+          return { label: '订单完成', type: 'success', effect: 'dark' }
+        case 'CANCELED':
+          return { label: '订单取消', type: 'info' }
       }
-      return {label:val?val:'暂无数据',type:'info'}
+      return { label: val ? val : '暂无数据', type: 'info' }
     },
     // currentPage change
     handleCurrentChange(page) {
-      this.parameter.currentPage = page;
-      this.getByPage();
+      this.parameter.currentPage = page
+      this.getByPage()
     },
     // pageSize change
     handleSizeChange(size) {
-      this.parameter.currentPage = 1;
-      this.parameter.pageSize = size;
-      this.getByPage();
+      this.parameter.currentPage = 1
+      this.parameter.pageSize = size
+      this.getByPage()
     },
     //table list
     getByPage() {
       this.parameter.params.id = '123454321'
-      order.getlnfoByld({id:this.parameter.params.id}).then((res) => {
+      order.getlnfoByld({ id: this.parameter.params.id }).then(res => {
         this.topData = res.data
         // this.tableData = res.data.list;
         // this.total = res.data.totalCount;
-      });
-      order.getRecordsByActld(this.parameter).then((res) => {
-        this.tableData = res.data.list;
-        this.total = res.data.totalCount;
-      });
+      })
+      order.getRecordsByActld(this.parameter).then(res => {
+        this.tableData = res.data.list
+        this.total = res.data.totalCount
+      })
     },
-    
+
     //下单取消
-    orderCencle(row){
-      if(row.orderStatus=='SUBMITED'||row.orderStatus=='ORDER_LOCKED'){
-        order.orderUpdate({id:row.id,orderStatus:'CANCELED'}).then((res) => {
-          if(res.code==20000){
+    orderCencle(row) {
+      if (row.orderStatus == 'SUBMITED' || row.orderStatus == 'ORDER_LOCKED') {
+        order.orderUpdate({ id: row.id, orderStatus: 'CANCELED' }).then(res => {
+          if (res.code == 20000) {
             this.getByPage()
           }
-        });
-      }else{
-        order.orderRefund({id:row.id}).then((res) => {
-          if(res.code==20000){
+        })
+      } else {
+        order.orderRefund({ id: row.id }).then(res => {
+          if (res.code == 20000) {
             this.getByPage()
           }
-        });
+        })
       }
     },
     //新增
     addition() {
-      this.controlWindows.addInfo.title = "炼厂入驻";
-      this.controlWindows.add = true;
+      this.controlWindows.addInfo.title = '炼厂入驻'
+      this.controlWindows.add = true
     },
     //提货单
-    async billOfLading(row){
-      this.controlWindows.addInfo.title = "";
-      await order.findDeliveryByOrderId(row.id).then((res) => {
+    async billOfLading(row) {
+      this.controlWindows.addInfo.title = ''
+      await order.findDeliveryByOrderId(row.id).then(res => {
         this.billData.list = res.data
-      });
-      await order.findByOrderId(row.id).then((res) => {
+      })
+      await order.findByOrderId(row.id).then(res => {
         this.billData.orderInfo = res.data
-      });
+      })
       this.controlWindows.addInfo = row
       this.controlWindows.bill = true
     },
     //详情
     detail(row) {
-      this.oilCompanyMatch = [row];
-      this.controlWindows.detail = true;
+      this.oilCompanyMatch = [row]
+      this.controlWindows.detail = true
     },
     //订单锁定
     Locked(row) {
-      if(row.orderStatus=='SUBMITED'){
-        order.orderLock({id:row.id}).then((res) => {
-          if(res.code == 20000){
+      if (row.orderStatus == 'SUBMITED') {
+        order.orderLock({ id: row.id }).then(res => {
+          if (res.code == 20000) {
             this.getByPage()
           }
-        });
-      }else{
-        order.orderSuccess({id:row.id}).then((res) => {
-          if(res.code == 20000){
+        })
+      } else {
+        order.orderSuccess({ id: row.id }).then(res => {
+          if (res.code == 20000) {
             this.getByPage()
           }
-        });
+        })
       }
     },
     //启用禁用
     switchTrigger(val, row) {
-      row.enableMark = row.enableMark;
+      row.enableMark = row.enableMark
       serve
         .update({
           id: row.id,
-          enableMark: val,
+          enableMark: val
         })
-        .then((res) => {
+        .then(res => {
           if (res.code === 20000) {
-            this.getByPage();
-          } else this.$message.error(res.msg);
-        });
+            this.getByPage()
+          } else this.$message.error(res.msg)
+        })
     },
     //重置
     reset() {
@@ -418,24 +406,23 @@ export default {
         currentPage: 1,
         pageSize: 10,
         total: 0,
-        params: {},
-      };
+        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;
-      let centerHeight = this.obtainElement(".centerStyle").clientHeight;
-      this.tableHeight =
-        bodyHeight - frameHeight - operationHeight - paginationHeight - centerHeight - 280;
+      let bodyHeight = document.body.clientHeight
+      let frameHeight = this.obtainElement('.frame').clientHeight
+      let operationHeight = this.obtainElement('.operation').clientHeight
+      let paginationHeight = this.obtainElement('.el-pagination').clientHeight
+      let centerHeight = this.obtainElement('.centerStyle').clientHeight
+      this.tableHeight = bodyHeight - frameHeight - operationHeight - paginationHeight - centerHeight - 280
     },
     obtainElement(className) {
-      return document.documentElement.querySelector(className);
-    },
-  },
-};
+      return document.documentElement.querySelector(className)
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>
@@ -493,13 +480,13 @@ export default {
     }
   }
 }
-.centerStyle{
+.centerStyle {
   width: 50%;
-  .centerStyle-bottom{
+  .centerStyle-bottom {
     display: flex;
-      div{
-        width: 30%;
-      }
+    div {
+      width: 30%;
+    }
   }
 }
 </style>

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

---
 .../financialCenter/enterpriseRecharge/components/add.vue   | 6 +++---
 .../enterpriseRecharge/components/addTurn.vue               | 6 +++---
 .../rechargeManagement/components/rechargeTurn.vue          | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/financialCenter/enterpriseRecharge/components/add.vue b/src/views/financialCenter/enterpriseRecharge/components/add.vue
index 2a3baec..e8047ad 100644
--- a/src/views/financialCenter/enterpriseRecharge/components/add.vue
+++ b/src/views/financialCenter/enterpriseRecharge/components/add.vue
@@ -38,7 +38,7 @@
             <el-cascader :options="cascaderList" v-model="form.companyBankCardArr" filterable clearable></el-cascader>
           </el-form-item>
 
-          <el-form-item label="炼厂中心账户" prop="refineryCenterAccountId">
+          <el-form-item label="油批中心账户" prop="refineryCenterAccountId">
             <autocomplete :params="form" :config="accountNameAutocomplete" />
           </el-form-item>
 
@@ -130,7 +130,7 @@ export default {
     }
     let validatorRefineryCenterAccountId = (rule, value, callback) => {
       if (this.form.refineryCenterAccountId) callback()
-      else callback('请选择炼厂中心账户')
+      else callback('请选择油批中心账户')
     }
     // let validatorofflineTransactionProof = (rule, value, callback) => {
     //   if (this.form.offlineTransactionProof) callback();
@@ -165,7 +165,7 @@ export default {
         autocompleteKey: 'accountName',
         labelKey: 'accountName',
         valueKey: 'id',
-        placeholder: '炼厂中心账户',
+        placeholder: '油批中心账户',
         querykey: 'refineryCenterAccountId',
         echoId: '',
         echoName: '',
diff --git a/src/views/financialCenter/enterpriseRecharge/components/addTurn.vue b/src/views/financialCenter/enterpriseRecharge/components/addTurn.vue
index d251492..d956eb7 100644
--- a/src/views/financialCenter/enterpriseRecharge/components/addTurn.vue
+++ b/src/views/financialCenter/enterpriseRecharge/components/addTurn.vue
@@ -40,7 +40,7 @@
           </el-descriptions>
         </el-form-item>
 
-        <el-form-item label="炼厂中心账户" prop="refineryCenterAccountId">
+        <el-form-item label="油批中心账户" prop="refineryCenterAccountId">
           <autocomplete :params="form" :config="accountNameAutocomplete" />
         </el-form-item>
 
@@ -89,7 +89,7 @@ export default {
     }
     let validatorRefineryCenterAccountId = (rule, value, callback) => {
       if (this.form.refineryCenterAccountId) callback()
-      else callback('请选择炼厂中心账户')
+      else callback('请选择油批中心账户')
     }
     return {
       companyFinance: {},
@@ -111,7 +111,7 @@ export default {
         autocompleteKey: 'accountName',
         labelKey: 'accountName',
         valueKey: 'id',
-        placeholder: '炼厂中心账户',
+        placeholder: '油批中心账户',
         querykey: 'refineryCenterAccountId',
         echoId: '',
         echoName: '',
diff --git a/src/views/refineryAccount/rechargeManagement/components/rechargeTurn.vue b/src/views/refineryAccount/rechargeManagement/components/rechargeTurn.vue
index 131b7b0..7b9b01b 100644
--- a/src/views/refineryAccount/rechargeManagement/components/rechargeTurn.vue
+++ b/src/views/refineryAccount/rechargeManagement/components/rechargeTurn.vue
@@ -28,7 +28,7 @@
             </el-descriptions-item>
           </el-descriptions>
         </el-form-item>
-        <el-form-item label="炼厂中心账户" prop="refineryCenterAccountId">
+        <el-form-item label="油批中心账户" prop="refineryCenterAccountId">
           <autocomplete :params="form" :config="accountNameAutocomplete" />
         </el-form-item>
         <el-form-item label="交易类型" prop="transactionType">
@@ -70,7 +70,7 @@ export default {
 
     let validatorRefineryCenterAccountId = (rule, value, callback) => {
       if (this.form.refineryCenterAccountId) callback()
-      else callback('请选择炼厂中心账户')
+      else callback('请选择油批中心账户')
     }
     let validatorTransactionAmount = (rule, value, callback) => {
       if (!value) return callback('请输入交易金额或交易金额不可为0')
@@ -94,7 +94,7 @@ export default {
         autocompleteKey: 'accountName',
         labelKey: 'accountName',
         valueKey: 'id',
-        placeholder: '炼厂中心账户',
+        placeholder: '油批中心账户',
         querykey: 'refineryCenterAccountId'
       },
       rules: {

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

---
 src/utils/index.js                 |  4 ----
 src/views/refineryCenter/index.vue | 18 +++++++++++++++---
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/utils/index.js b/src/utils/index.js
index 8a97833..1f9850f 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -52,10 +52,6 @@ export function isLicensePlate(number) {
   return instance.test(number)
 }
 
-export function cellStyle() {
-  return 'text-align:center'
-}
-
 // 类型判断
 export function typeJudgment(object) {
   let res = {}.__proto__.toString.call(object)
diff --git a/src/views/refineryCenter/index.vue b/src/views/refineryCenter/index.vue
index 246140a..ebff031 100644
--- a/src/views/refineryCenter/index.vue
+++ b/src/views/refineryCenter/index.vue
@@ -85,7 +85,7 @@
               当前 <span>{{ row.currentRechargeBalance }}</span>
             </p>
             <p class="gray">
-              上次 <span>{{ row.lasttRechargeBalance }}</span>
+              上次 <span>{{ row.lastRechargeBalance }}</span>
             </p>
           </template>
         </el-table-column>
@@ -99,7 +99,7 @@
             </p>
           </template>
         </el-table-column> -->
-        <el-table-column prop="orderId" label="业务订单号" minWidth="180"> </el-table-column>
+        <el-table-column prop="reverseId" label="业务单号" minWidth="180"> </el-table-column>
         <el-table-column prop="createTime" label="创建时间" minWidth="210"> </el-table-column>
       </el-table>
       <el-pagination
@@ -158,6 +158,10 @@ export default {
           return '订单退款'
         case 'TRANSFER':
           return '转账'
+        case 'refineryRECHARGE':
+          return '炼厂充值'
+        case 'refineryTURN':
+          return '炼厂圈回'
       }
       return val ? val : '暂无数据'
     }
@@ -327,7 +331,15 @@ export default {
         // this.total = res.data.totalCount;
       })
       order.getRecordsByActld(this.parameter).then(res => {
-        this.tableData = res.data.list
+        let data = res.data.list.map(item => {
+          // 2023.06.20 因孔哥时间不够 应其强烈要求 暂出此下策
+          if (item.refineryAccountName) {
+            item.transactionType === 'TURN' && (item.transactionType = 'refineryRECHARGE')
+            item.transactionType === 'RECHARGE' && (item.transactionType = 'refineryTURN')
+          }
+          return item
+        })
+        this.tableData = data
         this.total = res.data.totalCount
       })
     },

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

---
 .../financialCenter/enterpriseRecharge/components/add.vue | 6 +++++-
 .../enterpriseRecharge/components/addTurn.vue             | 2 +-
 src/views/order/components/billOfLading.vue               | 2 +-
 src/views/refineryCenter/index.vue                        | 8 ++++----
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/views/financialCenter/enterpriseRecharge/components/add.vue b/src/views/financialCenter/enterpriseRecharge/components/add.vue
index e8047ad..ce155fb 100644
--- a/src/views/financialCenter/enterpriseRecharge/components/add.vue
+++ b/src/views/financialCenter/enterpriseRecharge/components/add.vue
@@ -128,6 +128,10 @@ export default {
       if (this.form.companyId) callback()
       else callback('请选择公司')
     }
+    let checkZero = (rule, value, callback) => {
+      if (!+value) callback('请输入交易金额或交易金额不可为0')
+      else callback()
+    }
     let validatorRefineryCenterAccountId = (rule, value, callback) => {
       if (this.form.refineryCenterAccountId) callback()
       else callback('请选择油批中心账户')
@@ -174,7 +178,7 @@ export default {
       rules: {
         companyId: [{ required: true, validator: validatorcompanyId, trigger: 'change' }],
         transactionType: [{ required: true, message: '请选择交易类型', trigger: 'change' }],
-        transactionAmount: [{ required: true, message: '请输入交易金额', trigger: 'blur' }],
+        transactionAmount: [{ required: true, validator: checkZero, trigger: 'blur' }],
         offlinePaymentCompany: [
           {
             required: true,
diff --git a/src/views/financialCenter/enterpriseRecharge/components/addTurn.vue b/src/views/financialCenter/enterpriseRecharge/components/addTurn.vue
index d956eb7..862190f 100644
--- a/src/views/financialCenter/enterpriseRecharge/components/addTurn.vue
+++ b/src/views/financialCenter/enterpriseRecharge/components/addTurn.vue
@@ -79,9 +79,9 @@ export default {
     //   else callback("请选择公司");
     // };
     let validatortransactionAmount = (rule, value, callback) => {
+      if (!+value) callback('请输入圈回金额或圈回金额不可为0')
       let typeTarget = this.correspondTypeEnum.find(item => item.value == this.form.turnType)
       let superiorLimit = this.companyInfo[typeTarget.valueKey]
-      if (value == '') callback('请输入圈回金额')
       if (value > superiorLimit) {
         callback(`圈回金额不可超过${typeTarget.label}`)
       }
diff --git a/src/views/order/components/billOfLading.vue b/src/views/order/components/billOfLading.vue
index e8a8a78..f8cbf62 100644
--- a/src/views/order/components/billOfLading.vue
+++ b/src/views/order/components/billOfLading.vue
@@ -362,7 +362,7 @@ export default {
       if (refineryInfo) {
         let balance = refineryInfo.balance * 10000
         let costTotal = orderInfo.floorPrice * orderInfo.preQuantity * 10000
-        let total = this.$utils.fixedHandle((balance + costTotal) / 10000)
+        let total = this.$utils.fixedHandle((balance - costTotal) / 10000)
         return total
       }
       return 0
diff --git a/src/views/refineryCenter/index.vue b/src/views/refineryCenter/index.vue
index ebff031..04a8161 100644
--- a/src/views/refineryCenter/index.vue
+++ b/src/views/refineryCenter/index.vue
@@ -14,11 +14,11 @@
             ><br />
             <span>充值余额</span>
           </div>
-          <!-- <div>
+          <div>
             <span>{{ topData.totalRechargeBalance }}</span
             ><br />
             <span>累计充值余额</span>
-          </div> -->
+          </div>
         </div>
       </div>
     </div>
@@ -89,7 +89,7 @@
             </p>
           </template>
         </el-table-column>
-        <!-- <el-table-column label="累计充值余额变动" minWidth="120">
+        <el-table-column label="累计充值余额变动" minWidth="120">
           <template slot-scope="{ row }">
             <p class="gray">
               当前 <span>{{ row.currentTotalRechargeAmount }}</span>
@@ -98,7 +98,7 @@
               上次 <span>{{ row.lastTotalRechargeAmount }}</span>
             </p>
           </template>
-        </el-table-column> -->
+        </el-table-column>
         <el-table-column prop="reverseId" label="业务单号" minWidth="180"> </el-table-column>
         <el-table-column prop="createTime" label="创建时间" minWidth="210"> </el-table-column>
       </el-table>

From 4824a61f983e0a28d7f780a4b9e9d5979eaf70b4 Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Mon, 26 Jun 2023 16:40:43 +0800
Subject: [PATCH 08/11] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/refineryCenter/index.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/views/refineryCenter/index.vue b/src/views/refineryCenter/index.vue
index 04a8161..c85ed22 100644
--- a/src/views/refineryCenter/index.vue
+++ b/src/views/refineryCenter/index.vue
@@ -19,6 +19,11 @@
             ><br />
             <span>累计充值余额</span>
           </div>
+          <div>
+            <span>{{ topData.sumOrderPreAmount }}</span
+            ><br />
+            <span>已预约未提货</span>
+          </div>
         </div>
       </div>
     </div>

From 57a2bbe5745c9d9034e5e4a4dc518d817ab44290 Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Thu, 29 Jun 2023 14:20:26 +0800
Subject: [PATCH 09/11] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/refineryCenter/index.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/views/refineryCenter/index.vue b/src/views/refineryCenter/index.vue
index c85ed22..dbb44ae 100644
--- a/src/views/refineryCenter/index.vue
+++ b/src/views/refineryCenter/index.vue
@@ -20,9 +20,14 @@
             <span>累计充值余额</span>
           </div>
           <div>
-            <span>{{ topData.sumOrderPreAmount }}</span
+            <span>{{ topData.preAndAct.preAndActA || '暂无' }}</span
             ><br />
-            <span>已预约未提货</span>
+            <span>已预约未提货金额</span>
+          </div>
+          <div>
+            <span>{{ topData.preAndAct.preAndActQ || '暂无' }}</span
+            ><br />
+            <span>已预约未提货数量</span>
           </div>
         </div>
       </div>

From 3d2592d7611397638b4440c59727d999d1b0ce80 Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Thu, 29 Jun 2023 14:37:02 +0800
Subject: [PATCH 10/11] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/refineryCenter/index.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/refineryCenter/index.vue b/src/views/refineryCenter/index.vue
index dbb44ae..bb6c47c 100644
--- a/src/views/refineryCenter/index.vue
+++ b/src/views/refineryCenter/index.vue
@@ -187,7 +187,9 @@ export default {
   ],
   data() {
     return {
-      topData: {},
+      topData: {
+        preAndAct: {}
+      },
       controlWindows: {
         add: false,
         addInfo: {},

From e49eab5fa1ad6bf300767591eccbe0e46fcf6dff Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Thu, 29 Jun 2023 15:35:37 +0800
Subject: [PATCH 11/11] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/refineryCenter/index.vue b/src/views/refineryCenter/index.vue
index bb6c47c..c0c0b39 100644
--- a/src/views/refineryCenter/index.vue
+++ b/src/views/refineryCenter/index.vue
@@ -19,7 +19,7 @@
             ><br />
             <span>累计充值余额</span>
           </div>
-          <div>
+          <!-- <div>
             <span>{{ topData.preAndAct.preAndActA || '暂无' }}</span
             ><br />
             <span>已预约未提货金额</span>
@@ -28,7 +28,7 @@
             <span>{{ topData.preAndAct.preAndActQ || '暂无' }}</span
             ><br />
             <span>已预约未提货数量</span>
-          </div>
+          </div> -->
         </div>
       </div>
     </div>