diff --git a/src/api/api.js b/src/api/api.js index e788aa25..e2c3be78 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -124,6 +124,9 @@ const getStandardList = (params) => getAction('', params) // 内部工作组,左侧树查询 const getWorkGroupTreeList = (params) => getAction('/sys/lawsWorkingGroup/list', params) +// 企业级别映射管理,获取列表 +const getEnterpriseLevelMapList = (params) => getAction('/sys/lawsGrade/list', params) + export { addRole, editRole, @@ -194,5 +197,7 @@ export { getStandardList, - getWorkGroupTreeList + getWorkGroupTreeList, + + getEnterpriseLevelMapList } diff --git a/src/assets/less/common.less b/src/assets/less/common.less index 36dfc7a8..aa42f07c 100644 --- a/src/assets/less/common.less +++ b/src/assets/less/common.less @@ -103,6 +103,15 @@ } } +/*表格操作栏只有两个按钮时的按钮间距*/ +.action-span-cell > a { + margin-left: 8px; +} + +.action-span-cell > a:first-child { + margin-left: 0; +} + /*列表页面弹出modal*/ .ant-modal-cust-warp { height: 100% diff --git a/src/common/lang/system/en.js b/src/common/lang/system/en.js index f99016e5..7111b24a 100644 --- a/src/common/lang/system/en.js +++ b/src/common/lang/system/en.js @@ -50,15 +50,30 @@ module.exports = { }, // 内部工作组 internalWorkGroup: { - treeSearchPlaceholder: '输入树状图体系', - name: '姓名', - workNo: '工号', - role: '角色', - post: '职位', - templateName: '内部工作组表模板', - exportName: '内部工作组表', - nodeName: '节点名称', - user: '用户', - pleaseSelectASystem: '请选择左侧体系' + treeSearchPlaceholder: 'Please enter the tree system', + name: 'Name', + workNo: 'Job Number', + role: 'Role', + post: 'Position', + templateName: 'Internal workgroup table template', + exportName: 'Internal workgroup table', + nodeName: 'Node Name', + user: 'User', + pleaseSelectASystem: 'Please select the left system' + }, + // 企标级别映射 + enterpriseLevelMap: { + levelCategory: 'Grade classification of enterprise standard', + canLookDepart: 'Viewable department', + remark: 'Remarks' + }, + // 友情练级管理 + friendshipLink: { + name: 'Link Name', + shelfStatus: 'Shelf Status', + linkName: 'Link Name', + link: 'Link', + isShelf: 'Shelf Or Not', + sort: 'Sort' } } diff --git a/src/common/lang/system/zh.js b/src/common/lang/system/zh.js index 187e1826..79c34ae2 100644 --- a/src/common/lang/system/zh.js +++ b/src/common/lang/system/zh.js @@ -63,5 +63,20 @@ module.exports = { nodeName: '节点名称', user: '用户', pleaseSelectASystem: '请选择左侧体系' + }, + // 企标级别映射 + enterpriseLevelMap: { + levelCategory: '企标等级分类', + canLookDepart: '可查看部门', + remark: '备注' + }, + // 友情练级管理 + friendshipLink: { + name: '链接名称', + shelfStatus: '上架状态', + linkName: '链接名称', + link: '链接', + isShelf: '是否上架', + sort: '排序' } } diff --git a/src/components/customField/Search.vue b/src/components/customField/Search.vue index c13b5ef9..3661c43a 100644 --- a/src/components/customField/Search.vue +++ b/src/components/customField/Search.vue @@ -1,7 +1,7 @@ +
- {{$t('query')}} - {{$t('reset')}} - + {{ !toggleSearchStatus ? $t('open') : $t('putAway') }} + {{$t('query')}} + {{$t('reset')}}
- - - - - diff --git a/src/views/system/enterpriseLevelMapManage/EnterpriseLevelMapList.vue b/src/views/system/enterpriseLevelMapManage/EnterpriseLevelMapList.vue new file mode 100644 index 00000000..f49809e1 --- /dev/null +++ b/src/views/system/enterpriseLevelMapManage/EnterpriseLevelMapList.vue @@ -0,0 +1,85 @@ + + + + + diff --git a/src/views/system/enterpriseLevelMapManage/modules/EnterpriseMapModal.vue b/src/views/system/enterpriseLevelMapManage/modules/EnterpriseMapModal.vue new file mode 100644 index 00000000..27236dc4 --- /dev/null +++ b/src/views/system/enterpriseLevelMapManage/modules/EnterpriseMapModal.vue @@ -0,0 +1,147 @@ + + + + + diff --git a/src/views/system/firendshipLinkManage/FriendshipLinkList.vue b/src/views/system/firendshipLinkManage/FriendshipLinkList.vue new file mode 100644 index 00000000..58eeca33 --- /dev/null +++ b/src/views/system/firendshipLinkManage/FriendshipLinkList.vue @@ -0,0 +1,182 @@ + + + + + diff --git a/src/views/system/firendshipLinkManage/modules/FriendshipLinkModal.vue b/src/views/system/firendshipLinkManage/modules/FriendshipLinkModal.vue new file mode 100644 index 00000000..15e0cc37 --- /dev/null +++ b/src/views/system/firendshipLinkManage/modules/FriendshipLinkModal.vue @@ -0,0 +1,116 @@ + + + + + diff --git a/src/views/system/internalWorkGroup/WorkingGroupList.vue b/src/views/system/internalWorkGroup/WorkingGroupList.vue index 83d05896..5343c7b4 100644 --- a/src/views/system/internalWorkGroup/WorkingGroupList.vue +++ b/src/views/system/internalWorkGroup/WorkingGroupList.vue @@ -2,13 +2,16 @@
+ @change="handleTreeChange" /> @@ -29,7 +32,12 @@ - {{ name }} + + {{ name.substr(0, name.indexOf(treeInput)) }} + {{ treeInput }} + {{ name.substr(name.indexOf(treeInput) + treeInput.length) }} + + {{ name }}