From 1b13f7106b8514d0729829c37df9c681033a24f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BE=99=E8=BF=90=E6=A8=A1?= <1724894114@qq.com> Date: Mon, 2 Sep 2024 18:51:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=A9=E6=96=99=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/model/setup.js | 30 + src/assets/icons/MaterialSetup.vue | 13 + src/assets/icons/index.js | 1 + src/components/scImport/index.vue | 9 +- .../advanced/components/addMaterial.vue | 110 + src/views/setting/advanced/index.vue | 13 +- .../setting/advanced/setup/computerRoom.vue | 2 +- src/views/setting/advanced/setup/cost.vue | 4 +- .../setting/advanced/setup/interface.vue | 4 +- src/views/setting/advanced/setup/mail.vue | 4 +- src/views/setting/advanced/setup/material.vue | 121 + yarn.lock | 9546 +++++++++-------- 12 files changed, 5133 insertions(+), 4724 deletions(-) create mode 100644 src/assets/icons/MaterialSetup.vue create mode 100644 src/views/setting/advanced/components/addMaterial.vue create mode 100644 src/views/setting/advanced/setup/material.vue diff --git a/src/api/model/setup.js b/src/api/model/setup.js index 3856abb..5c9d8bf 100644 --- a/src/api/model/setup.js +++ b/src/api/model/setup.js @@ -73,6 +73,36 @@ export default { }, } }, + material:{ + list:{ + url: `${config.API_URL}/material.cost.list`, + name: "物料成本列表", + get: async function (data) { + return await http.post(this.url, data); + }, + }, + add:{ + url: `${config.API_URL}/material.cost.add`, + name: "物料成本添加", + post: async function (data) { + return await http.post(this.url, data); + }, + }, + template:{ + url: `${config.API_URL}/material.cost.import.template`, + name: "物料成本导入模版", + post: async function (params) { + return await http.get(this.url,params,{responseType: 'arraybuffer'}); + } + }, + import:{ + url: `${config.API_URL}/material.cost.batch.import`, + name: "物料成本导入", + post: async function (params) { + return await http.post(this.url,params,{'Content-Type': 'multipart/form-data'}); + } + }, + }, bom:{ list:{ url: `${config.API_URL}/bom.list`, diff --git a/src/assets/icons/MaterialSetup.vue b/src/assets/icons/MaterialSetup.vue new file mode 100644 index 0000000..12731cb --- /dev/null +++ b/src/assets/icons/MaterialSetup.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/assets/icons/index.js b/src/assets/icons/index.js index fd884db..76a25b0 100644 --- a/src/assets/icons/index.js +++ b/src/assets/icons/index.js @@ -28,6 +28,7 @@ export { default as AgentMaintenance } from './AgentMaintenance.vue' export { default as CostAllocation } from './CostAllocation.vue' export { default as K3Api } from './K3Api.vue' export { default as CostSetup } from './CostSetup.vue' +export { default as MaterialSetup } from './MaterialSetup.vue' export { default as MaintenanceSetup } from './MaintenanceSetup.vue' export { default as ConfirmOrder } from './ConfirmOrder.vue' export { default as DataSource } from './DataSource.vue' diff --git a/src/components/scImport/index.vue b/src/components/scImport/index.vue index 6c78af3..5b939e8 100644 --- a/src/components/scImport/index.vue +++ b/src/components/scImport/index.vue @@ -65,7 +65,6 @@ + + diff --git a/src/views/setting/advanced/index.vue b/src/views/setting/advanced/index.vue index 524f899..734eca0 100644 --- a/src/views/setting/advanced/index.vue +++ b/src/views/setting/advanced/index.vue @@ -38,15 +38,15 @@ import { defineAsyncComponent } from 'vue' export default { components: { - account: defineAsyncComponent(() => import('./setup/computerRoom')), - seting: defineAsyncComponent(() => import('./setup/computerRoom')), pushSettings: defineAsyncComponent(() => import('./setup/computerRoom')), password: defineAsyncComponent(() => import('./setup/computerRoom')), upToEnterprise: defineAsyncComponent(() => import('./setup/computerRoom')), + account: defineAsyncComponent(() => import('./setup/computerRoom')), bind: defineAsyncComponent(() => import('./setup/computerRoom')), mail: defineAsyncComponent(() => import('./setup/mail')), interface: defineAsyncComponent(() => import('./setup/interface')), cost: defineAsyncComponent(() => import('./setup/cost')), + material: defineAsyncComponent(() => import('./setup/material')), }, data() { return { @@ -90,6 +90,12 @@ export default { title: "费用类别配置", component: "cost", actions:'costCategoryAdd' + }, + { + icon: "sc-icon-MaterialSetup", + title: "物料成本配置", + component: "material", + actions:'materialCostAdd' } ] }, @@ -126,10 +132,11 @@ export default { item.list.forEach(em=>{ if(permissions.auth.indexOf(em.actions)!=-1){ item.show = true; - this.page = item.list[0].component } }) }) + let pageView = this.menu.find(item=> item.show === true).list.find(em=> permissions.auth.indexOf(em.actions)!=-1); + this.page = pageView.component; }, methods: { openPage(item){ diff --git a/src/views/setting/advanced/setup/computerRoom.vue b/src/views/setting/advanced/setup/computerRoom.vue index 55013e4..35468a2 100644 --- a/src/views/setting/advanced/setup/computerRoom.vue +++ b/src/views/setting/advanced/setup/computerRoom.vue @@ -1,5 +1,5 @@