diff --git a/src/api/model/setup.js b/src/api/model/setup.js index 67247b8..550454c 100644 --- a/src/api/model/setup.js +++ b/src/api/model/setup.js @@ -6,14 +6,14 @@ export default { add: { url: `${config.API_URL}/machine.room.add`, name: "新增机房配置", - post: async function (data = {}) { + post: async function (data) { return await http.post(this.url, data); }, }, list: { url: `${config.API_URL}/machine.room.list`, name: "机房配置列表", - get: async function (data = {}) { + get: async function (data) { return await http.post(this.url, data); }, }, @@ -22,14 +22,14 @@ export default { set:{ url: `${config.API_URL}/mail.config.set`, name: "源邮件配置", - post: async function (data = {}) { + post: async function (data) { return await http.post(this.url, data); }, }, get:{ url: `${config.API_URL}/mail.config.get`, name: "源邮件获取", - post: async function (data = {}) { + post: async function (data) { return await http.post(this.url, data); }, } @@ -38,14 +38,30 @@ export default { set:{ url: `${config.API_URL}/k3.api.config.set`, name: "金蝶ERP接口配置", - post: async function (data = {}) { + post: async function (data) { return await http.post(this.url, data); }, }, get:{ url: `${config.API_URL}/k3.api.config.get`, name: "金蝶ERP接口配置获取", - post: async function (data = {}) { + post: async function (data) { + return await http.post(this.url, data); + }, + } + }, + cost:{ + set:{ + url: `${config.API_URL}/cost.category.add`, + name: "新增费用列别配置", + post: async function (data) { + return await http.post(this.url, data); + }, + }, + get:{ + url: `${config.API_URL}/cost.category.list`, + name: "费用类别配置", + post: async function (data) { return await http.post(this.url, data); }, } @@ -54,21 +70,21 @@ export default { list:{ url: `${config.API_URL}/bom.list`, name: "bom列表", - get: async function (data = {}) { + get: async function (data) { return await http.post(this.url, data); }, }, info:{ url: `${config.API_URL}/bom.detail`, name: "bom详情", - post: async function (data = {}) { + post: async function (data) { return await http.post(this.url, data); }, }, refresh:{ url: `${config.API_URL}/bom.refresh`, name: "重新拉取bom", - post: async function (data = {}) { + post: async function (data) { return await http.post(this.url, data); }, } diff --git a/src/api/model/system.js b/src/api/model/system.js index bf86218..717c234 100644 --- a/src/api/model/system.js +++ b/src/api/model/system.js @@ -113,6 +113,7 @@ export default { return await http.post(this.url, params); } }, + roleCode: { url: `${config.API_URL}/authorize.role.codes`, name: "角色对应CODE列表", @@ -482,5 +483,5 @@ export default { } } }, - + }; diff --git a/src/assets/icons/CostSetup.vue b/src/assets/icons/CostSetup.vue new file mode 100644 index 0000000..7c55723 --- /dev/null +++ b/src/assets/icons/CostSetup.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/assets/icons/K3Api.vue b/src/assets/icons/K3Api.vue new file mode 100644 index 0000000..742997d --- /dev/null +++ b/src/assets/icons/K3Api.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/assets/icons/index.js b/src/assets/icons/index.js index 9af9ddb..823c507 100644 --- a/src/assets/icons/index.js +++ b/src/assets/icons/index.js @@ -26,6 +26,8 @@ export { default as Finish } from './Finish.vue' export { default as FormXls } from './FormXls.vue' 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 DataSource } from './DataSource.vue' export { default as MachineRoom } from './MachineRoom.vue' export { default as CreateFolder } from './CreateFolder.vue' diff --git a/src/style/fix.scss b/src/style/fix.scss index 1988f29..b984edc 100644 --- a/src/style/fix.scss +++ b/src/style/fix.scss @@ -30,6 +30,12 @@ --el-menu-item-height:50px; --el-component-size-small:28px; + + --el-order-color-1:#E8641B; + --el-order-color-2:#3072FF; + --el-order-color-3:#0DA525; + --el-order-color-4:#FFB103; + --el-order-color-5:#E81B1B; } .el-table{ diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 056c0cd..908afcf 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -159,7 +159,7 @@ h2{ height: 36px; display: flex; - align-items: baseline; + align-items: flex-start; font-size: 24px; position: relative; padding-left: 18px; @@ -167,7 +167,7 @@ font-weight: 500; .origin{ position: absolute; - left: 0; + left: 4px; top: 12px; display: inline-block; width: 8px; diff --git a/src/views/order/create-order.vue b/src/views/order/create-order.vue index 9f8c789..bb262c8 100644 --- a/src/views/order/create-order.vue +++ b/src/views/order/create-order.vue @@ -170,7 +170,7 @@
- 确认保存 + 确认保存
diff --git a/src/views/order/orderList/detailView.vue b/src/views/order/orderList/detailView.vue index e158a36..49f9e7c 100644 --- a/src/views/order/orderList/detailView.vue +++ b/src/views/order/orderList/detailView.vue @@ -6,7 +6,8 @@ 当前状态： - {{item.label}} + {{item.label}} diff --git a/src/views/order/orderList/index.vue b/src/views/order/orderList/index.vue index 2720e56..caaee54 100644 --- a/src/views/order/orderList/index.vue +++ b/src/views/order/orderList/index.vue @@ -49,7 +49,8 @@ diff --git a/src/views/order/repairList/index.vue b/src/views/order/repairList/index.vue index d7ea466..e119bfb 100644 --- a/src/views/order/repairList/index.vue +++ b/src/views/order/repairList/index.vue @@ -2,8 +2,8 @@
- 新增工单 - + 新增维修 + diff --git a/src/views/order/submit-order.vue b/src/views/order/submit-order.vue index ad96388..041b28a 100644 --- a/src/views/order/submit-order.vue +++ b/src/views/order/submit-order.vue @@ -9,7 +9,8 @@ 当前状态： - {{item.label}} + {{item.label}}
@@ -164,7 +165,7 @@
- 确认提交 + 确认提交
diff --git a/src/views/setting/advanced/index.vue b/src/views/setting/advanced/index.vue index 7515461..524f899 100644 --- a/src/views/setting/advanced/index.vue +++ b/src/views/setting/advanced/index.vue @@ -42,11 +42,11 @@ export default { seting: defineAsyncComponent(() => import('./setup/computerRoom')), pushSettings: defineAsyncComponent(() => import('./setup/computerRoom')), password: defineAsyncComponent(() => import('./setup/computerRoom')), - space: defineAsyncComponent(() => import('./setup/computerRoom')), upToEnterprise: defineAsyncComponent(() => import('./setup/computerRoom')), bind: defineAsyncComponent(() => import('./setup/computerRoom')), mail: defineAsyncComponent(() => import('./setup/mail')), interface: defineAsyncComponent(() => import('./setup/interface')), + cost: defineAsyncComponent(() => import('./setup/cost')), }, data() { return { @@ -80,10 +80,16 @@ export default { actions:'mailConfigSet' }, { - icon: "sc-icon-AgentMaintenance", + icon: "sc-icon-K3Api", title: "K3接口配置", component: "interface", actions:'k3ApiConfigSet' + }, + { + icon: "sc-icon-CostSetup", + title: "费用类别配置", + component: "cost", + actions:'costCategoryAdd' } ] }, diff --git a/src/views/setting/advanced/setup/cost.vue b/src/views/setting/advanced/setup/cost.vue new file mode 100644 index 0000000..1a1ef4b --- /dev/null +++ b/src/views/setting/advanced/setup/cost.vue @@ -0,0 +1,99 @@ + + + + + diff --git a/src/views/setting/role/dataPermissions.vue b/src/views/setting/role/dataPermissions.vue new file mode 100644 index 0000000..d3c28df --- /dev/null +++ b/src/views/setting/role/dataPermissions.vue @@ -0,0 +1,262 @@ + + + + + diff --git a/src/views/setting/role/dataTree.vue b/src/views/setting/role/dataTree.vue index cea835b..267c304 100644 --- a/src/views/setting/role/dataTree.vue +++ b/src/views/setting/role/dataTree.vue @@ -183,7 +183,7 @@ export default { border-top:1px solid var(--el-border-color-light); } .tableBody .trTitle{ - background: var(--el-bg-color-overlay); + background: #f5f7fa; display: flex; justify-content: space-between; align-items: center; diff --git a/src/views/setting/role/index.vue b/src/views/setting/role/index.vue index 2703141..f425c41 100644 --- a/src/views/setting/role/index.vue +++ b/src/views/setting/role/index.vue @@ -45,7 +45,7 @@ - + @@ -105,6 +105,7 @@ import saveDialog from './save'; import permissionDialog from './permission'; import dataTree from "./dataTree"; + import dataPermissions from "./dataPermissions"; import members from "./members"; import treeUser from "./tree" @@ -114,6 +115,7 @@ saveDialog, permissionDialog, dataTree, + dataPermissions, members, treeUser }, @@ -147,6 +149,10 @@ menu: { list: [], }, + dataPermissionsLoading:false, + dataPermissions:{ + list:[], + }, roleUserLoading:false, roleUser:{ list:[]