diff --git a/src/api/api.js b/src/api/api.js
index c9fa8b17..e788aa25 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -121,6 +121,9 @@ const getFileInfo = (params) => getAction('/sys/oss/file/queryById', params)
// 标准选择框,分页查询标准数据
const getStandardList = (params) => getAction('', params)
+// 内部工作组,左侧树查询
+const getWorkGroupTreeList = (params) => getAction('/sys/lawsWorkingGroup/list', params)
+
export {
addRole,
editRole,
@@ -189,5 +192,7 @@ export {
addCategoryItem,
editCategoryItem,
- getStandardList
+ getStandardList,
+
+ getWorkGroupTreeList
}
diff --git a/src/common/lang/system/en.js b/src/common/lang/system/en.js
index cba0fd2c..f99016e5 100644
--- a/src/common/lang/system/en.js
+++ b/src/common/lang/system/en.js
@@ -47,5 +47,18 @@ module.exports = {
parentName: '父级名称',
select: '下拉选择',
tree: '树形结构'
+ },
+ // 内部工作组
+ internalWorkGroup: {
+ treeSearchPlaceholder: '输入树状图体系',
+ name: '姓名',
+ workNo: '工号',
+ role: '角色',
+ post: '职位',
+ templateName: '内部工作组表模板',
+ exportName: '内部工作组表',
+ nodeName: '节点名称',
+ user: '用户',
+ pleaseSelectASystem: '请选择左侧体系'
}
}
diff --git a/src/common/lang/system/zh.js b/src/common/lang/system/zh.js
index b92067d0..187e1826 100644
--- a/src/common/lang/system/zh.js
+++ b/src/common/lang/system/zh.js
@@ -50,5 +50,18 @@ module.exports = {
parentName: '父级名称',
select: '下拉选择',
tree: '树形结构'
+ },
+ // 内部工作组
+ internalWorkGroup: {
+ treeSearchPlaceholder: '输入树状图体系',
+ name: '姓名',
+ workNo: '工号',
+ role: '角色',
+ post: '职位',
+ templateName: '内部工作组表模板',
+ exportName: '内部工作组表',
+ nodeName: '节点名称',
+ user: '用户',
+ pleaseSelectASystem: '请选择左侧体系'
}
}
diff --git a/src/mixins/JeroListMixin.js b/src/mixins/JeroListMixin.js
index e0a3e8be..5655361d 100644
--- a/src/mixins/JeroListMixin.js
+++ b/src/mixins/JeroListMixin.js
@@ -54,7 +54,7 @@ export const JeroListMixin = {
/** 高级查询拼接方式 */
superQueryMatchType: 'and',
operateMaxNum: 1, // 表格操作列最多显示的按钮,其他显示在更多中
- needFilterTableBtn: true // 是否需要过滤表格操作列没有权限的按钮
+ needFilterTableBtn: false // 是否需要过滤表格操作列没有权限的按钮
}
},
created () {
@@ -79,6 +79,9 @@ export const JeroListMixin = {
head['tenant-id'] = tenantid
}
return head
+ },
+ importExcelUrl: function () {
+ return `${window._CONFIG.domianURL}/${this.url.importExcelUrl}`
}
},
methods: {
diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue
index 3536235f..ca8b39f5 100644
--- a/src/views/dashboard/Analysis.vue
+++ b/src/views/dashboard/Analysis.vue
@@ -1,21 +1,266 @@
-
+
跳转一般检索
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
提交
diff --git a/src/views/system/internalWorkGroup/WorkingGroupList.vue b/src/views/system/internalWorkGroup/WorkingGroupList.vue
new file mode 100644
index 00000000..83d05896
--- /dev/null
+++ b/src/views/system/internalWorkGroup/WorkingGroupList.vue
@@ -0,0 +1,382 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ name }}
+
+ {{ name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ name }}
+
+ {{ name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ $t('newlyAdded') }}
+
+
+ {{ $t('import') }}
+
+
+
+ {{ $t('export') }}
+
+
+
+ {{ $t('templateDownload') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/system/internalWorkGroup/modules/TreeNodeModal.vue b/src/views/system/internalWorkGroup/modules/TreeNodeModal.vue
new file mode 100644
index 00000000..eed10ce7
--- /dev/null
+++ b/src/views/system/internalWorkGroup/modules/TreeNodeModal.vue
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/system/internalWorkGroup/modules/WorkingGroupModal.vue b/src/views/system/internalWorkGroup/modules/WorkingGroupModal.vue
new file mode 100644
index 00000000..3ec5d832
--- /dev/null
+++ b/src/views/system/internalWorkGroup/modules/WorkingGroupModal.vue
@@ -0,0 +1,110 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+