|
|
@@ -665,6 +665,7 @@ |
|
|
|
import { getUserInfo,roleOptions,fetchDeptList,getUserListByNode,roleMap,stateOptions} from '@/services/user.js';
|
|
|
|
import { fetchApi } from '@/utils/request';
|
|
|
|
import { firstCharToLowerCase, firstCharToUpperCase } from '@/utils/tool';
|
|
|
|
import { AssignedWork } from '@/services/project.js';
|
|
|
|
|
|
|
|
export default {
|
|
|
|
data() {
|
|
|
@@ -1524,43 +1525,110 @@ export default { |
|
|
|
/**
|
|
|
|
* 分配工作完成
|
|
|
|
*/
|
|
|
|
createFolders: function () {
|
|
|
|
var thisApp = this;
|
|
|
|
var sendMethod = "put";
|
|
|
|
var param = {
|
|
|
|
superFolderId: "",
|
|
|
|
userId: sessionStorage.userId,
|
|
|
|
projId: sessionStorage.projId,
|
|
|
|
listFolder: thisApp.listNewFolder,
|
|
|
|
listManageUser:thisApp.listManagerUser
|
|
|
|
async createFolders() {
|
|
|
|
console.log(this.listNewFolder)
|
|
|
|
let params = {
|
|
|
|
UserId: sessionStorage.userId,
|
|
|
|
ProjId: sessionStorage.projId,
|
|
|
|
Work: [],
|
|
|
|
};
|
|
|
|
this.$axios({
|
|
|
|
method: sendMethod,
|
|
|
|
url: encodeURI(process.env.API_HOST + "folders/set"),
|
|
|
|
data: param
|
|
|
|
for(let i = 0; i < this.listNewFolder.length; i++) {
|
|
|
|
let folder = this.listNewFolder[i];
|
|
|
|
let tempFolder = folder;
|
|
|
|
let WorkNode = {
|
|
|
|
FolderId:'',
|
|
|
|
ManagerUserId: '',
|
|
|
|
GeneralId:'',
|
|
|
|
OldManager:'',
|
|
|
|
OldGeneralId:''
|
|
|
|
};
|
|
|
|
WorkNode['FolderId'] = tempFolder.id;
|
|
|
|
tempFolder.manageUser.forEach(manager => {
|
|
|
|
WorkNode['ManagerUserId'] += manager.id + ',';
|
|
|
|
})
|
|
|
|
.then(response => {
|
|
|
|
if (response.data.state == 1) {
|
|
|
|
thisApp.$notify({
|
|
|
|
title: "恭喜您",
|
|
|
|
message: response.data.message,
|
|
|
|
type: "success",
|
|
|
|
offset: 100,
|
|
|
|
duration: 2500
|
|
|
|
});
|
|
|
|
thisApp.offDialog();
|
|
|
|
} else {
|
|
|
|
thisApp.$notify.error({
|
|
|
|
title: "温馨提示",
|
|
|
|
message: response.data.message,
|
|
|
|
offset: 100,
|
|
|
|
duration: 5000
|
|
|
|
});
|
|
|
|
}
|
|
|
|
tempFolder.listUser.forEach(user => {
|
|
|
|
WorkNode['GeneralId'] += user.id + ',';
|
|
|
|
})
|
|
|
|
.catch(error => {
|
|
|
|
console.log(error);
|
|
|
|
});
|
|
|
|
WorkNode['ManagerUserId'] = WorkNode['ManagerUserId'].substr(0, WorkNode['ManagerUserId'].length-1);
|
|
|
|
WorkNode['GeneralId'] = WorkNode['GeneralId'].length >0 ?WorkNode['GeneralId'].substr(0, WorkNode['GeneralId'].length-1) : WorkNode['GeneralId'];
|
|
|
|
WorkNode['OldManager'] = tempFolder.oldManager;
|
|
|
|
WorkNode['OldGeneralId'] = tempFolder.oldGeneralId;
|
|
|
|
|
|
|
|
params.Work.push(WorkNode);
|
|
|
|
tempFolder = tempFolder.listChildren;//也具有同样的结构
|
|
|
|
|
|
|
|
for(let j = 0; j < tempFolder.length; j++) {
|
|
|
|
let childTempFolder = tempFolder[i];
|
|
|
|
let WorkNode = {
|
|
|
|
FolderId:'',
|
|
|
|
ManagerUserId: '',
|
|
|
|
GeneralId:'',
|
|
|
|
OldManager:'',
|
|
|
|
OldGeneralId:''
|
|
|
|
};
|
|
|
|
WorkNode['FolderId'] = childTempFolder.id;
|
|
|
|
childTempFolder.manageUser.forEach(manager => {
|
|
|
|
WorkNode['ManagerUserId'] += manager.id + ',';
|
|
|
|
})
|
|
|
|
childTempFolder.listUser.forEach(user => {
|
|
|
|
WorkNode['GeneralId'] += user.id + ',';
|
|
|
|
})
|
|
|
|
WorkNode['ManagerUserId'] = WorkNode['ManagerUserId'].substr(0, WorkNode['ManagerUserId'].length-1);
|
|
|
|
WorkNode['GeneralId'] = WorkNode['GeneralId'].length >0 ?WorkNode['GeneralId'].substr(0, WorkNode['GeneralId'].length-1) : WorkNode['GeneralId'];
|
|
|
|
WorkNode['OldManager'] = childTempFolder.oldManager;
|
|
|
|
WorkNode['OldGeneralId'] = childTempFolder.oldGeneralId;
|
|
|
|
|
|
|
|
params.Work.push(WorkNode);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
console.log('要提交的参数是:',params);
|
|
|
|
const res = await AssignedWork(params);
|
|
|
|
console.log(res);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// var thisApp = this;
|
|
|
|
// var sendMethod = "put";
|
|
|
|
// var param = {
|
|
|
|
// superFolderId: "",
|
|
|
|
// userId: sessionStorage.userId,
|
|
|
|
// projId: sessionStorage.projId,
|
|
|
|
// listFolder: thisApp.listNewFolder,
|
|
|
|
// listManageUser:thisApp.listManagerUser
|
|
|
|
// };
|
|
|
|
// this.$axios({
|
|
|
|
// method: sendMethod,
|
|
|
|
// url: encodeURI(process.env.API_HOST + "folders/set"),
|
|
|
|
// data: param
|
|
|
|
// })
|
|
|
|
// .then(response => {
|
|
|
|
// if (response.data.state == 1) {
|
|
|
|
// thisApp.$notify({
|
|
|
|
// title: "恭喜您",
|
|
|
|
// message: response.data.message,
|
|
|
|
// type: "success",
|
|
|
|
// offset: 100,
|
|
|
|
// duration: 2500
|
|
|
|
// });
|
|
|
|
// thisApp.offDialog();
|
|
|
|
// } else {
|
|
|
|
// thisApp.$notify.error({
|
|
|
|
// title: "温馨提示",
|
|
|
|
// message: response.data.message,
|
|
|
|
// offset: 100,
|
|
|
|
// duration: 5000
|
|
|
|
// });
|
|
|
|
// }
|
|
|
|
// })
|
|
|
|
// .catch(error => {
|
|
|
|
// console.log(error);
|
|
|
|
// });
|
|
|
|
},
|
|
|
|
/**
|
|
|
|
* 加载需要分配的文件夹
|
|
|
|