diff --git a/src/api/common.js b/src/api/common.js index ebd2207..73275f6 100644 --- a/src/api/common.js +++ b/src/api/common.js @@ -10,9 +10,12 @@ const getRefineryCompanyList = (params) => { const liekQuery = (query) => { return request.get(`oil-user/sysCustomerInfo/liekQuery/${query}`); }; - +// 用户详情 +const getInfo = (id) => { + return request.get(`/oil-user/oilCompanyInfo/get/${id}`); +}; //公司账户信息 -const getByCompanyId = (query) => { +const getByCompanyIdAccount = (query) => { return request.get(`/oil-finance/oilCompanyAccount/getByCompanyId/${query}`); }; //公司财务信息 @@ -27,7 +30,8 @@ const getByCompanyIdAuth = (id) => { export default { getRefineryCompanyList, liekQuery, - getByCompanyId, + getInfo, + getByCompanyIdAccount, getByCompanyIdFinance, getByCompanyIdAuth, }; diff --git a/src/api/customerManagement/companyManagement.js b/src/api/customerManagement/companyManagement.js index ac8f3b2..7cdc076 100644 --- a/src/api/customerManagement/companyManagement.js +++ b/src/api/customerManagement/companyManagement.js @@ -11,21 +11,37 @@ const getCompanyAccountRecord = (params) => { params ); }; -//启禁用 +//保存 +const save = (params) => { + return request.postJson("/oil-user/oilCompanyInfo/save", params); +}; +//修改 const update = (params) => { - return request.postJson("oil-user/oilCompanyInfo/update", params); + return request.postPut("oil-user/oilCompanyInfo/update", params); +}; +//认证信息保存 +const saveAttestation = (params) => { + return request.postJson("/oil-user/oilCompanyAuth/save", params); +}; +//认证信息修改 +const updateAttestation = (params) => { + return request.postPut("oil-user/oilCompanyAuth/update", params); +}; +//财务信息保存 +const saveFinance = (params) => { + return request.postJson("/oil-user/oilCompanyFinance/save", params); +}; +//财务信息修改 +const updateFinance = (params) => { + return request.postPut("oil-user/oilCompanyFinance/update", params); }; //企业负责人 远程搜索 const liekQuery = (query) => { return request.get(`/oil-user/sysCustomerInfo/liekQuery/${query}`); }; -//保存 -const save = (params) => { - return request.postJson("/oil-user/oilCompanyInfo/save", params); -}; -// 用户详情 -const getInfo = (id) => { - return request.get(`/oil-user/oilCompanyInfo/get/${id}`); +// 级联 +const getTree = () => { + return request.get("/oil-dict/areaCode/getTree"); }; export default { getByPage, @@ -33,5 +49,10 @@ export default { update, liekQuery, save, - getInfo, + getTree, + saveAttestation, + updateAttestation, + saveFinance, + updateFinance, + // getInfo, }; diff --git a/src/api/financialCenter/accountManagement.js b/src/api/financialCenter/accountManagement.js index 1e1866f..da5e30f 100644 --- a/src/api/financialCenter/accountManagement.js +++ b/src/api/financialCenter/accountManagement.js @@ -20,9 +20,9 @@ const save = (params) => { return request.postJson("/oil-finance/oilCompanyAccountReverse/save", params); }; -const getInfo = (id) => { - return request.get(`/oil-user/oilCompanyInfo/get/${id}`); -}; +// const getInfo = (id) => { +// return request.get(`/oil-user/oilCompanyInfo/get/${id}`); +// }; // //详情 // const getCompanyAccountRecord = (params) => { @@ -37,5 +37,5 @@ export default { get, save, // getByCompanyIdAuth, - getInfo, + // getInfo, }; diff --git a/src/api/financialCenter/enterpriseRecharge.js b/src/api/financialCenter/enterpriseRecharge.js index 42756ae..ad58207 100644 --- a/src/api/financialCenter/enterpriseRecharge.js +++ b/src/api/financialCenter/enterpriseRecharge.js @@ -26,7 +26,7 @@ const update = (params) => { params ); }; -// 企业收款账户 +// 级联 const getCascaderList = () => { return request.get("/oil-finance/internalCompany/getCascaderList"); }; diff --git a/src/components/autocomplete/index.vue b/src/components/autocomplete/index.vue index 3ff41f1..6a60b70 100644 --- a/src/components/autocomplete/index.vue +++ b/src/components/autocomplete/index.vue @@ -44,10 +44,13 @@ export default { watch: { "config.echoId": { handler(nval, oval) { - if (nval) { - this.remoteMethod(this.config.echoName); - } + this.list = []; this.isDisabled = !!this.config.isDisabled; + if (nval) { + let resultName = this.config.echoName.replace(/\s*/g, ""); + if (!resultName) return; + this.remoteMethod(resultName); + } }, deep: true, immediate: true, diff --git a/src/utils/index.js b/src/utils/index.js index 49fcf20..e192493 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -32,6 +32,7 @@ export function parseTime(time) { return formatRes; } +// 防抖 export function debounce(fn, delay) { let timer = null; return function () { @@ -39,7 +40,6 @@ export function debounce(fn, delay) { let _this = this; let _arguments = arguments; timer = setTimeout(function () { - // 在执行时，通过apply来使用_this和_arguments fn.apply(_this, _arguments); }, delay); }; @@ -55,8 +55,8 @@ export function isLicensePlate(no) { export function cellStyle() { return "text-align:center"; } - +// 类型判断 export function typeJudgment(object) { let res = {}.__proto__.toString.call(object); - return res ? res : ""; + return res || ""; } diff --git a/src/views/customerManagement/companyManagement/components/add.vue b/src/views/customerManagement/companyManagement/components/add.vue index d474136..c10b92c 100644 --- a/src/views/customerManagement/companyManagement/components/add.vue +++ b/src/views/customerManagement/companyManagement/components/add.vue @@ -168,25 +168,15 @@ export default { this.form = JSON.parse(JSON.stringify(this.controlWindows.addInfo)); } // 上级公司 - let configUpdata = id - ? { - echoId: this.form.parentId, - echoName: this.form.name, - } - : { - echoId: "", - echoName: "", - }; + let configUpdata = { + echoId: this.form.parentId || "", + echoName: this.form.name || "", + }; // 企业负责人 - let configUpdataLeader = id - ? { - echoId: this.form.businessLeader, - echoName: this.form.businessLeader, - } - : { - echoId: "", - echoName: "", - }; + let configUpdataLeader = { + echoId: this.form.businessLeader || "", + echoName: this.form.businessLeader || "", + }; Object.assign(this.configAutocomplete, configUpdata); Object.assign(this.configAutocompleteLeader, configUpdataLeader); }, diff --git a/src/views/customerManagement/companyManagement/components/attestation.vue b/src/views/customerManagement/companyManagement/components/attestation.vue new file mode 100644 index 0000000..2650e38 --- /dev/null +++ b/src/views/customerManagement/companyManagement/components/attestation.vue @@ -0,0 +1,297 @@ + + + + diff --git a/src/views/customerManagement/companyManagement/components/finance.vue b/src/views/customerManagement/companyManagement/components/finance.vue new file mode 100644 index 0000000..91ffcf2 --- /dev/null +++ b/src/views/customerManagement/companyManagement/components/finance.vue @@ -0,0 +1,273 @@ + + + + diff --git a/src/views/customerManagement/companyManagement/index.vue b/src/views/customerManagement/companyManagement/index.vue index 6616360..342256c 100644 --- a/src/views/customerManagement/companyManagement/index.vue +++ b/src/views/customerManagement/companyManagement/index.vue @@ -275,7 +275,7 @@ align="center" >