diff --git a/com.actionsoft.apps.coe.pal.datamigration/src/components/system-text-import.vue b/com.actionsoft.apps.coe.pal.datamigration/src/components/system-text-import.vue
new file mode 100644
index 0000000..9aa3d93
--- /dev/null
+++ b/com.actionsoft.apps.coe.pal.datamigration/src/components/system-text-import.vue
@@ -0,0 +1,183 @@
+
+
+
+
+
+
+
+
+ 导入XML文件
+
+
+ 仅支持XML格式文本
+
+
+
+
+
+
+
+
+
- - 修改{{currRepositoryDetail.methodName}}
+ - 修改{{currRepositoryDetail.methodName}}
- 打开文件
@@ -263,7 +263,7 @@
- 版本管理
- - 附件管理
+ - 附件管理
- 流程手册
@@ -273,11 +273,11 @@
- 导出文件
- - 导出{{currRepositoryDetail.methodName}}
+ - 导出{{currRepositoryDetail.methodName}}
- 删除文件
- - 删除{{currRepositoryDetail.methodName}}
+ - 删除{{currRepositoryDetail.methodName}}
@@ -454,6 +454,7 @@
havingRemovePerm: false,// 是否有删除权限
havingVersionManagePerm: false,// 是否有版本管理权限
imgPath: require('@/assets/double-arro-right.png'),
+ crrentUserId:'',
currRepositoryDetail: {
name: '',
id: '',
@@ -544,6 +545,7 @@
}
},
created() {
+ this.initParam();
},
mounted(){
this.initData();
@@ -563,6 +565,24 @@
});
},
methods: {
+ initParam() {// 初始化参数
+ const that = this;
+ const data = {
+ url:'jd',
+ data:{
+ cmd : 'com.actionsoft.apps.coe.pal_nav_header_data',
+ mainType : mainType
+ }
+ };
+ awsuiAxios.post(data).then(function (ro) {
+ if (ro.result == 'ok') {
+ let data = ro.data;
+ that.crrentUserId=data.crrentUserId;
+ }
+ }).catch(error=>{
+ console.log(error);
+ })
+ },
openModelConvertDialog(repositoryId,sourceMethod,type){
let that = this;
that.modelConvertDialog.visible = true;
@@ -1077,6 +1097,17 @@
break;
}
}
+ if(this.singleSelectedRepository.folder==true && this.crrentUserId!='admin'){
+ this.$message({message: '文件夹不可进行移动操作！！',type: 'warning'});
+ return;
+ }
+ if(this.singleSelectedRepository.versionStatus!="") {
+ if (this.singleSelectedRepository.versionStatus.isPublish == true) {
+ this.$message({message: '当前文件已处于发布状态，不可进行移动文件操作！！', type: 'warning'});
+ return;
+
+ }
+ }
console.log(this.singleSelectedRepository)
//主repository移动文件
if(undefined == this.singleSelectedRepository.id || null == this.singleSelectedRepository.id){
@@ -1089,6 +1120,22 @@
if (this.checkedRepositorys.length == 0) {
this.$message({message: '请选择移入的目标文件',type: 'warning'});
return;
+ }else{
+ for(let i=0;i
-
+
diff --git a/com.actionsoft.apps.coe.pal/src/views/repository/RepositoryMainList.vue b/com.actionsoft.apps.coe.pal/src/views/repository/RepositoryMainList.vue
index c2f6002..c651f41 100644
--- a/com.actionsoft.apps.coe.pal/src/views/repository/RepositoryMainList.vue
+++ b/com.actionsoft.apps.coe.pal/src/views/repository/RepositoryMainList.vue
@@ -52,6 +52,7 @@
@@ -246,6 +247,7 @@
defaultCategoryName: '',
recentData: [],
commonData: [],
+ crrentUserId:'',
havingWritePerm: false,
folderDialog: {
dialogVisible: false,
@@ -273,7 +275,7 @@
},
created() {
this.initData();
-
+ this.initParam();
// 【伊利架构筛选需求】将本组件内的initData方法暴露 方便别的组件调用
let self = this;
this.$nextTick(() => {
@@ -289,6 +291,24 @@
});
},
methods: {
+ initParam() {// 初始化参数
+ const that = this;
+ const data = {
+ url:'jd',
+ data:{
+ cmd : 'com.actionsoft.apps.coe.pal_nav_header_data',
+ mainType : mainType
+ }
+ };
+ awsuiAxios.post(data).then(function (ro) {
+ if (ro.result == 'ok') {
+ let data = ro.data;
+ that.crrentUserId=data.crrentUserId;
+ }
+ }).catch(error=>{
+ console.log(error);
+ })
+ },
handleRecnetOrStore(tab, event){
this.switchTabCard(tab.name);
},
diff --git a/com.actionsoft.apps.coe.pal/src/views/system/Navigation.vue b/com.actionsoft.apps.coe.pal/src/views/system/Navigation.vue
index fe515fa..63a68a1 100644
--- a/com.actionsoft.apps.coe.pal/src/views/system/Navigation.vue
+++ b/com.actionsoft.apps.coe.pal/src/views/system/Navigation.vue
@@ -81,9 +81,25 @@
:hide-on-click=true
@command="handleUserCommand"
trigger="click">
-
+
+
+
+
+ - 姓名: {{currentUserName}}
+ - 角色名称: {{currentUserRole}}
+ - 部门名称: {{crrentUserDep}}
+
+
![]()
-
+
+
+
+
管理中心
@@ -200,6 +216,10 @@
isManage: isManage,
isSecAdminUser: isSecAdminUser,// 是否安全保密员，三员开启且为安全保密员为true
userPhoto : '',
+ currentUserName:'',
+ currentUserRole:'',
+ crrentUserDep:'',
+ crrentUserId:'',
isPbulishActive : false,
isCooperationActive : false,
wsLabel : '',
@@ -230,7 +250,8 @@
},
cooperationDrawer: {
showCooperationDetail: false,
- }
+ },
+
}
},
inject : ['openAppDrawer', 'closeAppDrawer', 'openPwdConfig', 'logout', 'openCooperationDrawer', 'closeCooperationDrawer', 'saveAccessOpLog'],// 父组件方法注入
@@ -358,6 +379,12 @@
if (ro.result == 'ok') {
let data = ro.data;
that.userPhoto = data.userPhoto;
+
+ //增加用户姓名/用户角色/用户部门信息 by zhaolei
+ that.currentUserName = data.currentUserName;
+ that.currentUserRole = data.currentUserRole;
+ that.crrentUserDep = data.crrentUserDep;
+ that.crrentUserId=data.crrentUserId;
that.isPbulishActive = data.isPbulishActive;
that.isCooperationActive = data.isCooperationActive;
that.appList = data.appList;
@@ -446,7 +473,8 @@
},
openProcessManagePortalPage() {// 跳转到流程管理门户页面
newPageWin('publishPortal', this.$store.state.sessionId, 'com.actionsoft.apps.coe.pal.publisher_client_home');
- }
+ },
+
},
created() {
this.initParam();
@@ -618,4 +646,52 @@
.quick-access-btn :hover {
color: #4E7FF9 !important;
}
+
+
+
+
+ .hover_wrapper {
+ position: relative;
+ display: flex;
+ }
+ .hover_text{
+ width: 100px;
+ height: 24px;
+ text-align: center;
+ line-height: 24px;
+ }
+ .btn{
+ width: 24px;
+ height: 24px;
+ border: 1px solid #ccc;
+ border-radius: 50%;
+ text-align: center;
+ line-height: 22px;
+ position: relative;
+ cursor: pointer;
+ }
+ .hover_container{
+ width: 100px;
+ height: 100px;
+ border: 1px solid #ccc;
+ border-radius: 8px;
+ text-align: center;
+ line-height: 98px;
+ position: absolute;
+ left: 50px;
+ top: 50%;
+ z-index: 99;
+ transform: translateY(-50%);
+ }
+ .hover_login_data{
+ font-size: 14px;
+ color: rgb(147,147,153);
+ margin-right: 8px;
+ width:200px;
+ white-space:nowrap;
+ text-overflow:ellipsis;
+ overflow:hidden;
+ }
+
+