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

部门和全所周报的分页查询和条件查询bug的修改

Browse Source
This commit is contained in:
chen 2024-07-22 16:46:12 +08:00
parent 90fb84c177
commit 490dcf1302
2 changed files with 24 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
kehui-oa-front/src/pages/projectManagements/departmentWeekly/DepartmentWeeklyList.vue
View File

@ -228,38 +228,30 @@
changeSize (size) { changeSize (size) {
console.log(size) console.log(size)
this.pageSize = size this.pageSize = size
this.fetchData(1)
},
fetchData (pageNo = 1) {
console.log('翻页。。。' + pageNo)
// 异步获取远程数据（ajax）
this.pageNo = pageNo
let projectWeeklyFindReq = { let projectWeeklyFindReq = {
pageNo: this.pageNo, pageNo: this.pageNo,
pageSize: this.pageSize pageSize: this.pageSize
} }
// this.pageLoading = true; // this.pageLoading = true;
Api.ProjectManagements.getDepartmentWeekly(projectWeeklyFindReq).then(result=>{ Api.ProjectManagements.getDepartmentWeekly(projectWeeklyFindReq).then(result=>{
this.tableRowsData = [];
this.pageLoading = false;
console.log("周报填报列表",result)
if (result.status === 0) {
this.dataList = result.data.ls; this.dataList = result.data.ls;
this.total = result.data.total; this.total = result.data.total;
for (let i=0; i<this.dataList.length; i++) {
this.tableRowsData.push({
projectNo: this.dataList[i].projectNo,
projectName: this.dataList[i].projectName,
userName: this.dataList[i].userName,
workload: this.dataList[i].workload,
thisWeek: this.dataList[i].thisWeek,
nextWeek: this.dataList[i].nextWeek
})
}
console.log("tableRowsData",this.tableRowsData)
}
}) })
}, },
onSubmit (searchForm) { onSubmit (searchForm) {
let projectName = searchForm.projectName.trim() !== '' ? searchForm.projectName : null;
let week = searchForm.week.trim() !== '' ? searchForm.week : null;
let projectWeeklyFindReq = { let projectWeeklyFindReq = {
pageNo: this.pageNo, pageNo: this.pageNo,
pageSize: this.pageSize, pageSize: this.pageSize,
projectName: searchForm.projectName, projectName: projectName,
week: searchForm.week week: week
} }
Api.ProjectManagements.getDepartmentWeekly(projectWeeklyFindReq).then(result => { Api.ProjectManagements.getDepartmentWeekly(projectWeeklyFindReq).then(result => {
this.tableRowsData = []; this.tableRowsData = [];

31
kehui-oa-front/src/pages/projectManagements/wholeFirmWeekly/WholeFirmWeeklyList.vue
View File

@ -237,39 +237,32 @@ export default {
changeSize (size) { changeSize (size) {
console.log(size) console.log(size)
this.pageSize = size this.pageSize = size
this.fetchData(1)
},
fetchData (pageNo = 1) {
console.log('翻页。。。' + pageNo)
// 异步获取远程数据（ajax）
this.pageNo = pageNo
let projectWeeklyFindReq = { let projectWeeklyFindReq = {
pageNo: this.pageNo, pageNo: this.pageNo,
pageSize: this.pageSize pageSize: this.pageSize
} }
// this.pageLoading = true; // this.pageLoading = true;
Api.ProjectManagements.getDepartmentWeekly(projectWeeklyFindReq).then(result=>{ Api.ProjectManagements.getDepartmentWeekly(projectWeeklyFindReq).then(result=>{
this.tableRowsData = [];
this.pageLoading = false;
console.log("周报填报列表",result)
if (result.status === 0) {
this.dataList = result.data.ls; this.dataList = result.data.ls;
this.total = result.data.total; this.total = result.data.total;
for (let i=0; i<this.dataList.length; i++) {
this.tableRowsData.push({
projectNo: this.dataList[i].projectNo,
projectName: this.dataList[i].projectName,
userName: this.dataList[i].userName,
workload: this.dataList[i].workload,
thisWeek: this.dataList[i].thisWeek,
nextWeek: this.dataList[i].nextWeek
})
}
console.log("tableRowsData",this.tableRowsData)
}
}) })
}, },
onSubmit (searchForm) { onSubmit (searchForm) {
let projectName = searchForm.projectName.trim() !== '' ? searchForm.projectName : null;
let week = searchForm.week.trim() !== '' ? searchForm.week : null;
let deptName = searchForm.deptName.trim() !== '' ? searchForm.deptName : null;
let projectWeeklyFindReq = { let projectWeeklyFindReq = {
pageNo: this.pageNo, pageNo: this.pageNo,
pageSize: this.pageSize, pageSize: this.pageSize,
projectName: searchForm.projectName, projectName: projectName,
week: searchForm.week, week: week,
deptName: searchForm.deptName deptName: deptName
} }
Api.ProjectManagements.getWholeFirmWeekly(projectWeeklyFindReq).then(result => { Api.ProjectManagements.getWholeFirmWeekly(projectWeeklyFindReq).then(result => {
this.tableRowsData = []; this.tableRowsData = [];