diff --git a/manifest.json b/manifest.json index 9418ae47..87b3c535 100644 --- a/manifest.json +++ b/manifest.json @@ -214,7 +214,7 @@ }, "router" : { "mode" : "hash", - "base" : "/zjsjAPP/" + "base" : "/app/" }, "optimization" : { "treeShaking" : { diff --git a/pages/projectEnd/laborManage/staffAttendance/staffAttendance.vue b/pages/projectEnd/laborManage/staffAttendance/staffAttendance.vue index 4c04309e..835edeae 100644 --- a/pages/projectEnd/laborManage/staffAttendance/staffAttendance.vue +++ b/pages/projectEnd/laborManage/staffAttendance/staffAttendance.vue @@ -11,9 +11,9 @@ - - + 搜索 @@ -52,8 +52,8 @@ mode=""> - {{item.teamName}} - {{item.enterpriseName}} + {{item.teamName ? item.teamName : '--'}} + {{item.enterpriseName ? item.enterpriseName : '--'}} @@ -196,6 +196,7 @@ pageNo: this.pageNo, pageSize: this.pageSize, projectSn: this.projectDetail.projectSn, + workerName: this.searchName, ...this.searchInfo, } if (this.searchInfo.enterDate) {