xh/kehui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

个人周报填报页面查询修改

Browse Source
This commit is contained in:
zty 2024-07-05 09:28:53 +08:00
parent d05ccc6a0a
commit f4121f89b2
1 changed files with 38 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
kehui-oa-front/src/pages/projectManagements/weekly/ExpenseClaimApply.vue
View File

@ -85,37 +85,53 @@
if (userId === '0') { if (userId === '0') {
this.isSuper = true; this.isSuper = true;
} }
this.pageLoading = true; // this.pageLoading = true;
Api.ProjectManagements.getWeekly().then(result=>{ Api.ProjectManagements.getWeekly().then(result=>{
console.log("周报填报列表",result)
})
Api.FinanceManagement.getReimburseList(this.pageNo, this.pageSize).then(result => {
this.pageLoading = false;
this.tableRowsData = []; this.tableRowsData = [];
this.pageLoading = false;
console.log("周报填报列表",result)
if (result.status === 0) { if (result.status === 0) {
this.isEdit = result.data.isEdit;
this.tableTotalPage = result.data.total
let dataList = result.data.ls; let dataList = result.data.ls;
for (let i=0; i<dataList.length; i++) { for (let i=0; i<dataList.length; i++) {
let deptName = '';
for (let j=0; j<dataList[i].userInfo.dept.length; j++) {
deptName += dataList[i].userInfo.dept[j].orgName;
if (j < dataList[i].userInfo.dept.length - 1) {
deptName += '>';
}
}
this.tableRowsData.push({ this.tableRowsData.push({
status: dataList[i].status, projectNo: dataList[i].projectNo,
id: dataList[i].id, projectName: dataList[i].projectName,
userInfoName: dataList[i].userInfo.userInfoName, userName: dataList[i].userName,
category: '报销', workload: dataList[i].workload,
deptName: deptName thisWeek: dataList[i].thisWeek,
nextWeek: dataList[i].nextWeek
}) })
} }
} else { console.log("tableRowsData",this.tableRowsData)
this.$message.error(`${result.msg}`);
} }
}) })
// Api.FinanceManagement.getReimburseList(this.pageNo, this.pageSize).then(result => {
// this.pageLoading = false;
// this.tableRowsData = [];
// if (result.status === 0) {
// this.isEdit = result.data.isEdit;
// this.tableTotalPage = result.data.total
// let dataList = result.data.ls;
// for (let i=0; i<dataList.length; i++) {
// let deptName = '';
// for (let j=0; j<dataList[i].userInfo.dept.length; j++) {
// deptName += dataList[i].userInfo.dept[j].orgName;
// if (j < dataList[i].userInfo.dept.length - 1) {
// deptName += '>';
// }
// }
// this.tableRowsData.push({
// status: dataList[i].status,
// id: dataList[i].id,
// userInfoName: dataList[i].userInfo.userInfoName,
// category: '报销',
// deptName: deptName
// })
// }
// } else {
// this.$message.error(`${result.msg}`);
// }
// })
}, },
//初始化tableColumns //初始化tableColumns
initTableColumns () { initTableColumns () {
@ -132,7 +148,7 @@
}, },
{ {
label: '员工姓名', label: '员工姓名',
prop: 'userNam', prop: 'userName',
show: true show: true
}, },
{ {