From ee057050d1edbdc2f95a6039af3d66a954cdfa7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BE=99=E8=BF=90=E6=A8=A1?= <1724894114@qq.com> Date: Wed, 30 Oct 2024 17:46:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=87=E4=BB=B6=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/model/system.js | 47 +++++- src/utils/eventBus.js | 2 +- .../setting/partsMag/components/info.vue | 111 ++++++++++--- .../setting/partsMag/components/library.vue | 65 +++++--- src/views/setting/partsMag/infoSave.vue | 123 ++++++++++++++ src/views/setting/partsMag/librarySave.vue | 150 ++++++++++++++++++ src/views/setting/user/review.vue | 23 ++- 7 files changed, 469 insertions(+), 52 deletions(-) create mode 100644 src/views/setting/partsMag/infoSave.vue create mode 100644 src/views/setting/partsMag/librarySave.vue diff --git a/src/api/model/system.js b/src/api/model/system.js index 0f50fd7..e3834a9 100644 --- a/src/api/model/system.js +++ b/src/api/model/system.js @@ -398,6 +398,13 @@ export default { return await http.post(this.url, params); } }, + userCompanyField:{ + url: `${config.API_URL}/user.company.field.list`, + name: "用户公司下拉选择", + post: async function (params) { + return await http.post(this.url, params); + } + }, export:{ url: `${config.API_URL}/user.export`, name: "用户列表导出", @@ -419,7 +426,6 @@ export default { return await http.post(this.url,params,{'Content-Type': 'multipart/form-data'}); } }, - generateRegistration:{ url: `${config.API_URL}/generate.registration.challenge`, name: "passKey 创建", @@ -434,7 +440,6 @@ export default { return await http.post(this.url, params); } }, - generateAuthentication:{ url: `${config.API_URL}/generate.authentication.challenge`, name: "passKey登录生成", @@ -580,6 +585,42 @@ export default { return await http.post(this.url, params); }, }, - + }, + spareInfo:{ + list: { + url: `${config.API_URL}/spare.parts.info.list`, + name: "备件信息列表", + get: async function (params) { + return await http.post(this.url, params); + }, + }, + add:{ + url: `${config.API_URL}/spare.parts.info.add`, + name: "新增备件信息", + post: async function (params) { + return await http.post(this.url, params); + }, + }, + info:{ + url: `${config.API_URL}/spare.parts.info.detail`, + name: "备件信息明细", + post: async function (params) { + return await http.post(this.url, params); + }, + }, + delete:{ + url: `${config.API_URL}/spare.parts.info.delete`, + name: "删除备件信息", + post: async function (params) { + return await http.post(this.url, params); + }, + }, + field:{ + url: `${config.API_URL}/spare.parts.info.field.list`, + name: "备件信息检索", + post: async function (params) { + return await http.post(this.url, params); + }, + }, } }; diff --git a/src/utils/eventBus.js b/src/utils/eventBus.js index 6636de8..da1f482 100644 --- a/src/utils/eventBus.js +++ b/src/utils/eventBus.js @@ -11,7 +11,7 @@ export const eventBus = { $emit(eventName, ...args) { const listeners = this.listeners[eventName]; - if (listeners) { + if (listeners && listeners.length>0) { listeners.forEach((listener) => listener(...args)); } }, diff --git a/src/views/setting/partsMag/components/info.vue b/src/views/setting/partsMag/components/info.vue index 777e71d..5bd8339 100644 --- a/src/views/setting/partsMag/components/info.vue +++ b/src/views/setting/partsMag/components/info.vue @@ -1,26 +1,81 @@ diff --git a/src/views/setting/partsMag/components/library.vue b/src/views/setting/partsMag/components/library.vue index cb67388..a1672ee 100644 --- a/src/views/setting/partsMag/components/library.vue +++ b/src/views/setting/partsMag/components/library.vue @@ -4,7 +4,7 @@
新增备件 批量导入 - 删除 + 删除
@@ -21,6 +21,7 @@
+ diff --git a/src/views/setting/partsMag/infoSave.vue b/src/views/setting/partsMag/infoSave.vue new file mode 100644 index 0000000..ffe0d12 --- /dev/null +++ b/src/views/setting/partsMag/infoSave.vue @@ -0,0 +1,123 @@ + + + + + diff --git a/src/views/setting/partsMag/librarySave.vue b/src/views/setting/partsMag/librarySave.vue new file mode 100644 index 0000000..bff39fd --- /dev/null +++ b/src/views/setting/partsMag/librarySave.vue @@ -0,0 +1,150 @@ + + + + + diff --git a/src/views/setting/user/review.vue b/src/views/setting/user/review.vue index db68891..957c0a6 100644 --- a/src/views/setting/user/review.vue +++ b/src/views/setting/user/review.vue @@ -29,7 +29,9 @@ - + + + @@ -58,6 +60,8 @@ export default { visible: false, passLoading:false, isSave: false, + + companyList:[], //表单数据 form: { id:"", @@ -80,9 +84,22 @@ export default { } }, mounted() { - + this.getCompanyList(); }, methods: { + async getCompanyList() { + let params = { + field:"full_name", + id:{ + operator:"in", + value:[] + } + } + const res = await this.$API.system.user.userCompanyField.post(params); + if(res.code == 200){ + this.companyList = res.data; + } + }, //显示 open(mode='add'){ this.mode = mode; @@ -121,7 +138,7 @@ export default { this.form.login_name = data.login_name; this.form.name = data.name; this.form.avatar = data.avatar && data.avatar!==""?data.avatar:'https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png'; - this.form.company_full_name = data.company_info?data.company_info.full_name:'' + this.form.company_full_name = data.company_info?data.company_info.full_name:''; } } }