|
|
@@ -1536,7 +1536,6 @@
|
|
|
},
|
|
|
|
|
|
filterNode(value, data) {
|
|
|
- // console.log(value, data, '搜索')
|
|
|
if (!value) return true;
|
|
|
return data.label.indexOf(value) !== -1;
|
|
|
},
|
|
|
@@ -1589,7 +1588,6 @@
|
|
|
addUpload(data) {
|
|
|
// var zhi = data.fileName.split('.')[0]
|
|
|
// var sss = zhi + '.xlsx'
|
|
|
- // console.log(sss, data)
|
|
|
// return
|
|
|
var filePath = '/upload/' + data.serverName;
|
|
|
const a = document.createElement('a'); // 创建a标签
|
|
|
@@ -1815,7 +1813,6 @@
|
|
|
},
|
|
|
res => {
|
|
|
if (res.code == "ok") {
|
|
|
- // console.log("维度",res.data);
|
|
|
this.yonghuUser = res.data
|
|
|
}
|
|
|
},
|
|
|
@@ -1953,7 +1950,6 @@
|
|
|
}
|
|
|
|
|
|
}
|
|
|
- // console.log('domain',quanbu);
|
|
|
},
|
|
|
iptChang() {
|
|
|
var sl = this.workForm.domains
|
|
|
@@ -2062,7 +2058,6 @@
|
|
|
},
|
|
|
|
|
|
handleClick(t,e){
|
|
|
- // console.log("tabname",t.name);
|
|
|
if (t.name == "first") {
|
|
|
this.showMonthWorkTime()
|
|
|
}else{
|
|
|
@@ -2071,7 +2066,6 @@
|
|
|
},
|
|
|
//导出员工每日填报工时数
|
|
|
exportMembWorkHours() {
|
|
|
- // console.log("exportMembWorkHours",this.WorktimeDatepickValue);
|
|
|
this.http.post(
|
|
|
"/report/exportUserDailyWorkTime",
|
|
|
{
|
|
|
@@ -2082,7 +2076,6 @@
|
|
|
(res) => {
|
|
|
if (res.code == "ok") {
|
|
|
let url = res.data;
|
|
|
- // console.log(res);
|
|
|
this.downloadByA("人员每日工时统计.xls", url);
|
|
|
}
|
|
|
},
|
|
|
@@ -2106,9 +2099,7 @@
|
|
|
(res) => {
|
|
|
if (res.code == "ok") {
|
|
|
let url = res.data;
|
|
|
- // console.log(res.data);
|
|
|
this.downloadByA("人员每日工时统计.xls", url);
|
|
|
- // console.log(url);
|
|
|
}
|
|
|
},
|
|
|
(error) => {
|
|
|
@@ -2121,7 +2112,6 @@
|
|
|
},
|
|
|
|
|
|
downloadByA(name, url) {
|
|
|
- // console.log(name,url);
|
|
|
const a = document.createElement("a"); // 创建a标签
|
|
|
a.setAttribute("download", name); // download属性
|
|
|
a.setAttribute("href", url); // href链接
|
|
|
@@ -2612,7 +2602,7 @@
|
|
|
if(!domain.projectId){
|
|
|
return;
|
|
|
}
|
|
|
- console.log('projectId===',domain.projectId);
|
|
|
+ // console.log('projectId===',domain.projectId);
|
|
|
domain.projectName = this.fillProjectList.filter(p=>p.id == domain.projectId)[0].projectName;
|
|
|
this.http.post('/sub-project/list',{
|
|
|
projectId: domain.projectId
|
|
|
@@ -2750,7 +2740,7 @@
|
|
|
},
|
|
|
|
|
|
getGroupStages(domain, index) {
|
|
|
- console.log(domain);
|
|
|
+ // console.log(domain);
|
|
|
if(!domain.groupId){
|
|
|
domain.projectAuditorId = ''
|
|
|
domain.stages = []
|
|
|
@@ -3068,9 +3058,6 @@
|
|
|
this.unFillList = this.getUserMembListFromDeptList(list, 0);
|
|
|
this.fillList = this.getUserMembListFromDeptList(list, 1)
|
|
|
}
|
|
|
- // console.log(this.depData.isUser)
|
|
|
- // console.log(this.depData.membCount)
|
|
|
- // console.log(this.depData)
|
|
|
},
|
|
|
theValues(id, item) {
|
|
|
for(var i in item) {
|
|
|
@@ -3139,7 +3126,7 @@
|
|
|
//设置员工到部门下面
|
|
|
this.setUserToDept(list);
|
|
|
this.data = list;
|
|
|
- console.log('data',this.data);
|
|
|
+ // console.log('data',this.data);
|
|
|
this.expandDate = [this.data[1].id]
|
|
|
this.allData = list;
|
|
|
|
|
|
@@ -3451,8 +3438,9 @@
|
|
|
this.listLoading = false;
|
|
|
if (res.code == "ok") {
|
|
|
this.reportList = res.data;
|
|
|
- document.querySelector("#day"+this.choseDay).scrollIntoView(true);
|
|
|
- // this.dealWith()
|
|
|
+ if(document.querySelector("#day"+this.choseDay)){
|
|
|
+ document.querySelector("#day"+this.choseDay).scrollIntoView(true);
|
|
|
+ }
|
|
|
} else {
|
|
|
this.$message({
|
|
|
message: res.msg,
|
|
|
@@ -3483,20 +3471,15 @@
|
|
|
// }
|
|
|
// },
|
|
|
// getDealWith(item, tx, wtx, arr) {
|
|
|
- // // console.log(item,12345)
|
|
|
// for(var i in item) {
|
|
|
// if(item[i].children) {
|
|
|
// this.getDealWith(item[i].children, tx, wtx, arr)
|
|
|
// } else {
|
|
|
- // console.log(arr.indexOf(item[i].id))
|
|
|
- // console.log(arr)
|
|
|
- // console.log(item[i].id)
|
|
|
// if(arr.indexOf(item[i].id) != '-1') {
|
|
|
// tx = +tx + 1
|
|
|
// }
|
|
|
// }
|
|
|
// }
|
|
|
- // console.log(tx, '看看值')
|
|
|
// },
|
|
|
//导出员工工时统计
|
|
|
exportUserTime() {
|
|
|
@@ -3936,7 +3919,7 @@
|
|
|
}
|
|
|
|
|
|
this.zhoRqi = [stat, end]
|
|
|
- console.log('date',currentDate,this.zhoRqi);
|
|
|
+ // console.log('date',currentDate,this.zhoRqi);
|
|
|
this.zhoRqis()
|
|
|
// this.jiazai()
|
|
|
},
|
|
|
@@ -4028,8 +4011,7 @@
|
|
|
}
|
|
|
this.zhoRqi[1] = this.dateChange(1, this.zhoRqi[1])
|
|
|
|
|
|
- // console.log(this.zhoRqi[1]);
|
|
|
- // console.log(this.zhoRqi[1])
|
|
|
+
|
|
|
var obj = {}
|
|
|
obj.zhoDataTime = this.zhoRqi[1]
|
|
|
obj.he = 0
|
|
|
@@ -4251,8 +4233,6 @@
|
|
|
zhoAdd() {
|
|
|
var zhi = this.zhoData
|
|
|
var ll = 0
|
|
|
- // console.log(this.reportTimeType.type)
|
|
|
- // console.log(this.reportTimeType.multiWorktime)
|
|
|
if(this.reportTimeType.type == 2) {
|
|
|
for(var i in zhi) {
|
|
|
this.dateAr = []
|
|
|
@@ -4962,7 +4942,7 @@
|
|
|
type: "error"
|
|
|
});
|
|
|
} else if (this.workForm.domains[i].taskGroups.length > 0 && !this.workForm.domains[i].groupId) {
|
|
|
- console.log(this.workForm.domains[i]);
|
|
|
+ // console.log(this.workForm.domains[i]);
|
|
|
this.$message({
|
|
|
message: "请选择["+this.workForm.domains[i].projectName+"]项目的任务分组",
|
|
|
type: "error"
|
ggooalice