From 70d54bcfa583d8d7c6ae7dcc4b1a94589104f11c Mon Sep 17 00:00:00 2001 From: xiaozhiyong Date: Thu, 23 Feb 2023 16:08:14 +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 --- src/api/common.js | 4 +- .../customerManagement/companyManagement.js | 33 + src/components/autocomplete/index.vue | 30 +- src/layout/components/Navbar.vue | 2 +- src/permission.js | 2 +- src/utils/dataType.js | 20 +- src/utils/request.js | 4 +- .../companyManagement/components/add.vue | 209 ++++++ .../companyManagement/index.vue | 604 +++++++----------- .../accountManagement/components/recharge.vue | 2 +- .../enterpriseRecharge/components/add.vue | 2 +- .../enterpriseRecharge/index.vue | 13 - .../enterpriseRechargeDetails/index.vue | 31 - src/views/login/index.vue | 2 +- 14 files changed, 513 insertions(+), 445 deletions(-) create mode 100644 src/api/customerManagement/companyManagement.js create mode 100644 src/views/customerManagement/companyManagement/components/add.vue diff --git a/src/api/common.js b/src/api/common.js index 05e5809..ebd2207 100644 --- a/src/api/common.js +++ b/src/api/common.js @@ -8,9 +8,7 @@ const getRefineryCompanyList = (params) => { }; // 远程搜索用户 const liekQuery = (query) => { - return request.get( - `oil-user/sysCustomerInfo/liekQuery/${query.queryTypeGet}` - ); + return request.get(`oil-user/sysCustomerInfo/liekQuery/${query}`); }; //公司账户信息 diff --git a/src/api/customerManagement/companyManagement.js b/src/api/customerManagement/companyManagement.js new file mode 100644 index 0000000..158d279 --- /dev/null +++ b/src/api/customerManagement/companyManagement.js @@ -0,0 +1,33 @@ +import request from "utils/axios.js"; +// table +const getByPage = (params) => { + return request.postJson("/oil-user/oilCompanyInfo/getByPage", params); +}; + +//详情 +const getCompanyAccountRecord = (params) => { + return request.postJson( + "oil-finance/oilCompanyAccountRecord/getCompanyAccountRecord", + params + ); +}; +//启禁用 +const update = (params) => { + return request.postJson("oil-user/oilCompanyInfo/update", params); +}; +//企业负责人 远程搜索 +const liekQuery = (query) => { + return request.get(`/oil-user/sysCustomerInfo/liekQuery/${query}`); +}; +//保存 +const save = (params) => { + return request.postJson("/oil-user/oilCompanyInfo/save", params); +}; + +export default { + getByPage, + getCompanyAccountRecord, + update, + liekQuery, + save, +}; diff --git a/src/components/autocomplete/index.vue b/src/components/autocomplete/index.vue index 126bba9..3ff41f1 100644 --- a/src/components/autocomplete/index.vue +++ b/src/components/autocomplete/index.vue @@ -58,27 +58,33 @@ export default { remoteMethod(query) { if (query !== "") { this.loading = true; - let params = {}; let type = this.$utils.typeJudgment(this.config.autocompleteKey); - if (!type.includes("Object") && !type.includes("String")) return; - + // if (!type.includes("Object") && !type.includes("String")) { + // this.loading = false; + // this.$message.warning("config.autocompleteKey格式有误"); + // return; + // } + let params = {}; if (type.includes("Object")) { params[this.config.autocompleteKey.key] = query; params["enableMark"] = this.config.autocompleteKey.enableMark; } - if (type.includes("String")) { + if ( + type.includes("String") || + type.includes("Undefined") || + type.includes("Null") + ) { + // 接口为get类型时需将autocompleteKey值设为空 + console.log(); this.config.autocompleteKey ? (params[this.config.autocompleteKey] = query) - : (params["queryTypeGet"] = query); + : (params = query); } this.config.serveTarget(params).then((res) => { - let timeInstance = setTimeout(() => { - this.loading = false; - clearTimeout(timeInstance); - if (res.data.length) { - this.list = res.data; - } else this.list = []; - }, 1000 * Math.random()); + this.loading = false; + if (res.data.length) { + this.list = res.data; + } else this.list = []; }); } else { this.list = []; diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 81570c4..118d8d5 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -46,7 +46,7 @@ export default { logout() { serve.loginOut().then((res) => { if (res.code === 20000) { - localStorage.removeItem("token"); + localStorage.removeItem("businessToken"); this.$router.push("/login"); } }); diff --git a/src/permission.js b/src/permission.js index 758b924..0af3825 100644 --- a/src/permission.js +++ b/src/permission.js @@ -15,7 +15,7 @@ const whiteList = ["/login"]; // no redirect whitelist router.beforeEach(async (to, from, next) => { NProgress.start(); document.title = getPageTitle(to.meta.title); - const hasToken = localStorage.getItem("token"); + const hasToken = localStorage.getItem("businessToken"); if (hasToken) { if (to.path === "/login") { next({ path: "/" }); diff --git a/src/utils/dataType.js b/src/utils/dataType.js index f04ae71..3c52b13 100644 --- a/src/utils/dataType.js +++ b/src/utils/dataType.js @@ -70,25 +70,7 @@ export const rechargeStatusEnum = [ value: -1, }, ]; -// 赊销还款审核 -export const repaymentExamineEnum = [ - { - label: "还款待审核", - value: 0, - }, - { - label: "还款成功", - value: 1, - }, - { - label: "还款失败", - value: -1, - }, - { - label: "待还款", - value: -2, - }, -]; + // 账户状态 export const accountStatusEnum = [ { diff --git a/src/utils/request.js b/src/utils/request.js index aefd37b..3ec6f2b 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -12,7 +12,7 @@ const service = axios.create({ // 请求拦截 service.interceptors.request.use( (config) => { - let token = localStorage.getItem("token"); + let token = localStorage.getItem("businessToken"); if (token) { config.headers["Authorization"] = token; @@ -63,7 +63,7 @@ service.interceptors.response.use( if (res && res.code) { if (res.code === 42011) { Vue.prototype.$message.error(res.msg || "您的登录已失效，请重新登录"); - localStorage.removeItem("token"); + localStorage.removeItem("businessToken"); setTimeout(() => { window.location.reload(); }, 1000); diff --git a/src/views/customerManagement/companyManagement/components/add.vue b/src/views/customerManagement/companyManagement/components/add.vue new file mode 100644 index 0000000..5794d29 --- /dev/null +++ b/src/views/customerManagement/companyManagement/components/add.vue @@ -0,0 +1,209 @@ + + + + diff --git a/src/views/customerManagement/companyManagement/index.vue b/src/views/customerManagement/companyManagement/index.vue index 0ed3da3..a6e80dc 100644 --- a/src/views/customerManagement/companyManagement/index.vue +++ b/src/views/customerManagement/companyManagement/index.vue @@ -2,95 +2,75 @@
- + - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - + + + - - - - - - - - - + + + - - + --> - - - - - - + + + +
- - - 添加 - - 查询 - 重置 + 查询 + 重置
-
+
+ 添加 +
@@ -193,9 +163,7 @@ {{ row.consumRebateStrategy == "TYFL" ? "统一费率" : "油站等级" }} - {{ - row.consumRebateScale ? row.consumRebateScale : "0" - }} + {{ row.consumRebateScale || "0" }}

{{ row.consumRebateStrategy == "TYSSFL" ? "统一升数" : "未知" }} @@ -205,9 +173,9 @@

暂无 @@ -217,19 +185,9 @@ @@ -265,11 +223,15 @@ v-model="row.enableMark" :active-value="1" :inactive-value="0" - @change="enableMarkClike(row)" + @change=" + (val) => { + enableMark(val, row); + } + " > - + - - -