Browse Source

工作指派显示bug修改 弹窗关闭按钮显示

master
kim131 4 years ago
parent
commit
dfb5f6a6db
5 changed files with 16 additions and 10 deletions
  1. +1
    -1
      src/components/app-header/components/user_center.vue
  2. +6
    -7
      src/views/components_web/distWork/distWork.vue
  3. +1
    -1
      src/views/components_web/head/head.vue
  4. +7
    -0
      src/views/main_web/workspace/service.js
  5. +1
    -1
      src/views/manage_system/index.vue

+ 1
- 1
src/components/app-header/components/user_center.vue View File

@@ -1255,7 +1255,7 @@ export default {
this.$confirm("退出当前账户,是否继续?", "", {
confirmButtonText: "确定",
cancelButtonText: "取消",
showClose: false,
// showClose: false,
type: "warning",
}).then(() => {
this.logout();


+ 6
- 7
src/views/components_web/distWork/distWork.vue View File

@@ -721,7 +721,7 @@ export default {
this.loadProjManager();
},
mounted: function () {
this._getUserInfo(sessionStorage.createUserID);
this._getUserInfo(sessionStorage.userId);
// this.getNowProject();
// this.getListProjProp();
// this.listFolderChildren();
@@ -898,7 +898,7 @@ export default {
this.$confirm("退出职员选择将清空您的所有操作!确定返回吗?", "", {
confirmButtonText: "退出",
cancelButtonText: "取消",
showClose:false,
//showClose:false,
type: "warning"
}).then(() => {
// 注意这里将folderID修改为 id字段
@@ -1561,16 +1561,15 @@ export default {
async _getUserInfo(userId) {
try {
let res = await getUserInfo(userId);
console.log('我是用户的信息',res);
let createUser = await getUserInfo(sessionStorage.createUserID);
// console.log('我是用户的信息',res);
this.curProjCreatePeop =
res.cnName + " 指派了新工作,请完成工作指派";
createUser.cnName + " 指派了新工作,请完成工作指派";
if (sessionStorage.allocated == 1)
{
this.curProjCreatePeop = "项目管理";
}
if(res.roleName === "项目负责人") {
this.isProjManager = true;
}
this.isProjManager = true;
} catch(err) {
console.log(err);
}


+ 1
- 1
src/views/components_web/head/head.vue View File

@@ -1925,7 +1925,7 @@ export default {
this.$confirm("退出当前账户,是否继续?", "", {
confirmButtonText: "确定",
cancelButtonText: "取消",
showClose: false,
// showClose: false,
type: "warning",
}).then(() => {
thisApp.$store.logout();


+ 7
- 0
src/views/main_web/workspace/service.js View File

@@ -85,4 +85,11 @@ export async function queryFileExchange(currentTemplateId, currentNodeId, nested
export async function addFile(file) {
const res = await fetchApi('file/addFile', file);
return res;
}
/**
* 删除文件
*/
export async function deleteFile(fileId) {
const res = await fetchApi('file/deleteFile', {fileId});
return res;
}

+ 1
- 1
src/views/manage_system/index.vue View File

@@ -53,7 +53,7 @@ export default {
this.$confirm("退出当前账户,是否继续?", "", {
confirmButtonText: "确定",
cancelButtonText: "取消",
showClose: false,
// showClose: false,
type: "warning",
}).then(() => {
// this.logout();


Loading…
Cancel
Save