From 0f3d02b1797fab11e5a0cf59367d432d94c7ffd4 Mon Sep 17 00:00:00 2001 From: Rain_ <904416525@qq.com> Date: Fri, 27 Jun 2025 18:27:59 +0800 Subject: [PATCH] =?UTF-8?q?flx=EF=BC=9A=E6=8F=90=E4=BA=A4=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 2 +- .../laborManage/staffAttendance/staffAttendance.vue | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) 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) {