From c77131aa5ec390ac17b45fea22a816c1618ffe13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BE=99=E8=BF=90=E6=A8=A1?= <1724894114@qq.com> Date: Sun, 1 Dec 2024 21:43:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84BOM=E5=8D=95=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/model/setup.js | 57 +++++ src/components/scImport/index.vue | 2 +- src/layout/components/userbar.vue | 3 +- .../home/console/components/shortcuts.vue | 6 +- src/views/maintenance/mainView.vue | 53 ++++- .../components/queryHistory.vue | 24 +- src/views/personalCenter/index.vue | 1 - src/views/serveView/components/commonPage.vue | 1 - src/views/serveView/components/term.vue | 3 +- src/views/setting/bom/index.vue | 72 +++++- src/views/setting/bom/save.vue | 209 ++++++++++++++++++ 11 files changed, 407 insertions(+), 24 deletions(-) create mode 100644 src/views/setting/bom/save.vue diff --git a/src/api/model/setup.js b/src/api/model/setup.js index 810dcf7..52e9eb8 100644 --- a/src/api/model/setup.js +++ b/src/api/model/setup.js @@ -280,6 +280,62 @@ export default { return await http.post(this.url, data); }, }, + field:{ + url: `${config.API_URL}/bom.field.list`, + name: "清单字段选择列表", + post: async function (data) { + return await http.post(this.url, data); + }, + }, + statusList:{ + url: `${config.API_URL}/bom.status.const.list`, + name: "清单状态常量列表", + post: async function (data) { + return await http.post(this.url, data); + }, + }, + disabledStatus:{ + url: `${config.API_URL}/bom.disabled.state.const.list`, + name: "清单禁用状态列表", + post: async function (data) { + return await http.post(this.url, data); + }, + }, + add:{ + url: `${config.API_URL}/bom.add`, + name: "bom单条新增或者编辑", + post: async function (data) { + return await http.post(this.url, data); + }, + }, + delete:{ + url: `${config.API_URL}/bom.delete`, + name: "bom删除", + post: async function (data) { + return await http.post(this.url, data); + }, + }, + enable:{ + url: `${config.API_URL}/bom.enable`, + name: "bom启用/禁用", + post: async function (data) { + return await http.post(this.url, data); + }, + }, + import:{ + url: `${config.API_URL}/bom.import`, + name: "BOM导入", + post: async function (params) { + return await http.post(this.url,params,{'Content-Type': 'multipart/form-data'}); + } + }, + template:{ + url: `${config.API_URL}/bom.list.import.template`, + name: "bom导入模版", + post: async function (params) { + return await http.get(this.url,params,{responseType: 'arraybuffer'}); + } + }, export:{ url: `${config.API_URL}/bom.export`, name: "BOM导出", @@ -287,5 +343,6 @@ export default { return await http.post(this.url,params); } }, + } }; diff --git a/src/components/scImport/index.vue b/src/components/scImport/index.vue index 2978af9..d4860a0 100644 --- a/src/components/scImport/index.vue +++ b/src/components/scImport/index.vue @@ -108,7 +108,7 @@ export default { }, methods:{ getWsResult(res){ - if(res.data && (res.data.type == 4 || res.data.type == 5 || res.data.type == 10 || res.data.type == 17 || res.data.type == 18 || res.data.type == 28 || res.data.type == 31)){ + if(res.data && (res.data.type == 4 || res.data.type == 5 || res.data.type == 10 || res.data.type == 17 || res.data.type == 18 || res.data.type == 28 || res.data.type == 31 || res.data.type == 42)){ this.importInfo = res.data; this.progressShow = true; if(res.data.status == 0){ diff --git a/src/layout/components/userbar.vue b/src/layout/components/userbar.vue index 433540d..7ce3a80 100644 --- a/src/layout/components/userbar.vue +++ b/src/layout/components/userbar.vue @@ -54,7 +54,7 @@ - +
{{ userNameF }} @@ -157,6 +157,7 @@ } }, linkUser(){ + this.$refs.userDropdown.handleClose(); this.$router.push({ path: '/user/center' }); }, clearCache(){ diff --git a/src/views/home/console/components/shortcuts.vue b/src/views/home/console/components/shortcuts.vue index ea9f9c1..95f032f 100644 --- a/src/views/home/console/components/shortcuts.vue +++ b/src/views/home/console/components/shortcuts.vue @@ -4,7 +4,7 @@
- +
{{item.meta && item.meta.title}}
@@ -27,7 +27,7 @@