diff --git a/src/api/common.js b/src/api/common.js index 73275f6..1b9552a 100644 --- a/src/api/common.js +++ b/src/api/common.js @@ -6,6 +6,10 @@ const getRefineryCompanyList = (params) => { params ); }; +// 远程总公司 +const getCompanyNames = (query) => { + return request.get(`oil-user/oilCompanyInfo/getCompanyNames/${query}`); +}; // 远程搜索用户 const liekQuery = (query) => { return request.get(`oil-user/sysCustomerInfo/liekQuery/${query}`); @@ -14,10 +18,6 @@ const liekQuery = (query) => { const getInfo = (id) => { return request.get(`/oil-user/oilCompanyInfo/get/${id}`); }; -//公司账户信息 -const getByCompanyIdAccount = (query) => { - return request.get(`/oil-finance/oilCompanyAccount/getByCompanyId/${query}`); -}; //公司财务信息 const getByCompanyIdFinance = (query) => { return request.get(`/oil-user/oilCompanyFinance/getByCompanyId/${query}`); @@ -26,12 +26,21 @@ const getByCompanyIdFinance = (query) => { const getByCompanyIdAuth = (id) => { return request.get(`/oil-user/oilCompanyAuth/getByCompanyId/${id}`); }; - +//公司账户信息 +const getByCompanyIdAccount = (query) => { + return request.get(`/oil-finance/oilCompanyAccount/getByCompanyId/${query}`); +}; +// 银行信息 +const getByCompanyIdBankCard = (id) => { + return request.get(`/oil-finance/oilCompanyBankCard/getByCompanyId/${id}`); +}; export default { getRefineryCompanyList, + getCompanyNames, liekQuery, getInfo, getByCompanyIdAccount, - getByCompanyIdFinance, getByCompanyIdAuth, + getByCompanyIdFinance, + getByCompanyIdBankCard, }; diff --git a/src/api/customerManagement/companyManagement.js b/src/api/customerManagement/companyManagement.js index 7cdc076..ab9a7d3 100644 --- a/src/api/customerManagement/companyManagement.js +++ b/src/api/customerManagement/companyManagement.js @@ -27,6 +27,17 @@ const saveAttestation = (params) => { const updateAttestation = (params) => { return request.postPut("oil-user/oilCompanyAuth/update", params); }; +//银行信息保存/修改 +const saveBank = (params) => { + return request.postJson( + "/oil-finance/oilCompanyBankCard/saveBatchCompanyRelationBank", + params + ); +}; +// //银行信息修改 +// const updateBank = (params) => { +// return request.postPut("oil-user/oilCompanyAuth/update", params); +// }; //财务信息保存 const saveFinance = (params) => { return request.postJson("/oil-user/oilCompanyFinance/save", params); @@ -39,6 +50,10 @@ const updateFinance = (params) => { const liekQuery = (query) => { return request.get(`/oil-user/sysCustomerInfo/liekQuery/${query}`); }; +// 开户行名称 远程搜索 +const findAllByName = (query) => { + return request.get(`/oil-site/sysSheet/findAllByName?name=${query}`); +}; // 级联 const getTree = () => { return request.get("/oil-dict/areaCode/getTree"); @@ -48,10 +63,13 @@ export default { getCompanyAccountRecord, update, liekQuery, + findAllByName, save, getTree, saveAttestation, updateAttestation, + saveBank, + // updateBank, saveFinance, updateFinance, // getInfo, diff --git a/src/api/login.js b/src/api/login.js index a33b1f3..e3e80ee 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -3,10 +3,14 @@ import request from "utils/axios.js"; const login = (params) => { return request.postJson("/oil-identity/oilRefinery/loginOMSByPwd", params); }; - +// 登出 const loginOut = () => { return request.get("/oil-identity/authorization/logout"); }; +// info +const info = () => { + return request.get("/oil-identity/unionAuth/info"); +}; //路由 const getCustomerRouters = () => { @@ -14,4 +18,4 @@ const getCustomerRouters = () => { "/oil-identity/oilRefinery/getCustomerRouters/REFINERY_OMS_WEB" ); }; -export default { login, loginOut, getCustomerRouters }; +export default { login, loginOut, info, getCustomerRouters }; diff --git a/src/components/autocomplete/index.vue b/src/components/autocomplete/index.vue index 6a60b70..dbc3c1f 100644 --- a/src/components/autocomplete/index.vue +++ b/src/components/autocomplete/index.vue @@ -45,7 +45,7 @@ export default { "config.echoId": { handler(nval, oval) { this.list = []; - this.isDisabled = !!this.config.isDisabled; + // this.isDisabled = !!this.config.isDisabled; if (nval) { let resultName = this.config.echoName.replace(/\s*/g, ""); if (!resultName) return; @@ -55,6 +55,17 @@ export default { deep: true, immediate: true, }, + "config.isDisabled": { + handler(nval, oval) { + let type = this.$utils.typeJudgment(nval); + console.log("type", type); + if (type.includes("Boolean") || type.includes("String")) { + this.isDisabled = !!this.config.isDisabled; + } + }, + deep: true, + immediate: true, + }, }, methods: { // 远程搜索 @@ -94,7 +105,7 @@ export default { } }, change(val) { - this.$emit("change", val); + this.$emit("change", val, this.list); }, }, }; diff --git a/src/permission.js b/src/permission.js index 0af3825..f3145ab 100644 --- a/src/permission.js +++ b/src/permission.js @@ -28,11 +28,9 @@ router.beforeEach(async (to, from, next) => { try { // let infoRes = await serve.getUserInfo(); // infoRes.data.authList = [1]; - let infoRes = { - data: { - authList: [1], - }, - }; + let infoRes = await serve.info(); + // infoRes.data.authList = infoRes.authList; + store.dispatch("user/info", infoRes.data); let routerRes = await serve.getCustomerRouters(); diff --git a/src/utils/directive.js b/src/utils/directive.js index b2a4833..d590fc1 100644 --- a/src/utils/directive.js +++ b/src/utils/directive.js @@ -1,4 +1,5 @@ import Vue from "vue"; +import store from "@/store"; const handle = (e, vNode) => { let val = e.target.value; @@ -29,3 +30,24 @@ Vue.directive("checkNum", { // } }, }); + +Vue.directive("permission", { + inserted(el, binding, vnode) { + const { value } = binding; + const auth = store.getters && store.getters.auth; + + if (value && value instanceof Array && value.length > 0) { + const permissionRoles = value; + + const hasPermission = auth.some((role) => { + return permissionRoles.includes(role); + }); + + if (!hasPermission) { + el.parentNode && el.parentNode.removeChild(el); + } + } else { + throw new Error(`need auths! Like v-permission="['admin','editor']"`); + } + }, +}); diff --git a/src/views/customerManagement/companyAuth/OilCompanyAuthAdd.vue b/src/views/customerManagement/companyAuth/OilCompanyAuthAdd.vue deleted file mode 100644 index 56bc6f4..0000000 --- a/src/views/customerManagement/companyAuth/OilCompanyAuthAdd.vue +++ /dev/null @@ -1,457 +0,0 @@ - - - diff --git a/src/views/customerManagement/companyManagement/OilCompanyInfoAdd.vue b/src/views/customerManagement/companyManagement/OilCompanyInfoAdd.vue deleted file mode 100644 index 37a7927..0000000 --- a/src/views/customerManagement/companyManagement/OilCompanyInfoAdd.vue +++ /dev/null @@ -1,197 +0,0 @@ - - diff --git a/src/views/customerManagement/companyManagement/OilCompanyInfoUpdate.vue b/src/views/customerManagement/companyManagement/OilCompanyInfoUpdate.vue deleted file mode 100644 index 1da36a4..0000000 --- a/src/views/customerManagement/companyManagement/OilCompanyInfoUpdate.vue +++ /dev/null @@ -1,215 +0,0 @@ - - diff --git a/src/views/customerManagement/companyManagement/components/bank.vue b/src/views/customerManagement/companyManagement/components/bank.vue new file mode 100644 index 0000000..f7401bb --- /dev/null +++ b/src/views/customerManagement/companyManagement/components/bank.vue @@ -0,0 +1,297 @@ + + + + diff --git a/src/views/customerManagement/companyManagement/index.vue b/src/views/customerManagement/companyManagement/index.vue index 342256c..721d4bc 100644 --- a/src/views/customerManagement/companyManagement/index.vue +++ b/src/views/customerManagement/companyManagement/index.vue @@ -69,31 +69,11 @@ /> - - - + + - + - +