From 5ee9c6c1de1359cdedc4f5dac5ab67aa57238825 Mon Sep 17 00:00:00 2001
From: mx <1289317512@qq.com>
Date: Wed, 9 Oct 2024 10:09:20 +0800
Subject: [PATCH] fix
---
pages/fundDetails.vue | 1 -
pages/index.vue | 22 ++++++++++++++++------
pages/taskDetails.vue | 19 +++++++++++++++----
pages/work/index.vue | 4 ++--
4 files changed, 33 insertions(+), 13 deletions(-)
diff --git a/pages/fundDetails.vue b/pages/fundDetails.vue
index 90a607a..33176bd 100644
--- a/pages/fundDetails.vue
+++ b/pages/fundDetails.vue
@@ -149,7 +149,6 @@
// this.listSign[i].employeeName = this.listSign[i].employeeName + " ";
}
this.checked = checked;
- console.log("123", checked)
},
allPay() {
let arr = [];
diff --git a/pages/index.vue b/pages/index.vue
index 0dd271e..6b2bf42 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -116,7 +116,7 @@
点名人数
- {{task.signNum}}
+ {{task.signNum + task.noSignNum}}
@@ -232,9 +232,19 @@
var strArray = str.split(" ");
var strDate = strArray[0].split("-");
// var strTime = strArray[1].split(":");
- var d = new Date(strDate[0],(strDate[1]-parseInt(1)),strDate[2]);
- return d > new Date() ? "进行中" : "已结束"
+ var taskFinishTime = new Date(strDate[0], (strDate[1]-parseInt(1)), (strDate[2]));//任务结束的晚上0点
+ taskFinishTime.setDate(taskFinishTime.getDate() + 1);
+
+ // console.log("date", taskFinishTime, this.getTomorrowZeroTime())
+ return new Date() > taskFinishTime ? "已结束" : "进行中"
},
+ getTomorrowZeroTime() {
+ const now = new Date(); // 获取当前时间
+ const tomorrow = new Date(now); // 复制当前时间对象
+ tomorrow.setDate(now.getDate() + 1); // 日期加1，得到明天
+ tomorrow.setHours(0, 0, 0, 0); // 将小时、分钟、秒和毫秒都设置为0
+ return tomorrow;
+ },
getList() {
if (this.showNoMore && this.queryParams.pageNum > 1){
return
@@ -557,7 +567,7 @@
.name-status{
display: flex;
- align-items: flex-start;
+ align-items: center;
.task-name{
font-size: 33rpx;
font-weight: 590;
@@ -569,8 +579,8 @@
.status-base{
margin-left: 5rpx;
- width: 50rpx;
- height: 20rpx;
+ width: 80rpx;
+ height: 30rpx;
background-size: 100% 100%;
}
diff --git a/pages/taskDetails.vue b/pages/taskDetails.vue
index 9e0ecfb..e6461d2 100644
--- a/pages/taskDetails.vue
+++ b/pages/taskDetails.vue
@@ -24,7 +24,7 @@
- {{task.baomingNum - task.signNum}}
+ {{task.noSignNum}}
未到人数
@@ -43,7 +43,7 @@
-
+
@@ -143,6 +143,7 @@
this.signInfo = item;
},
sign(status){
+ let oldStatus = this.signInfo.status;
let change = this.signInfo.status != status;
this.signInfo.status = status;
setSign(this.signInfo);
@@ -150,8 +151,14 @@
if (status == 1){
this.task.signNum ++;
}else{
+ this.task.noSignNum ++;
+ }
+ if (oldStatus == 0){
+ this.task.noSignNum --;
+ }else if (oldStatus == 1){
this.task.signNum --;
}
+
}
this.$refs.popup.close()
},
@@ -300,14 +307,18 @@
/*padding: 0rpx 10rpx 10rpx 10rpx;*/
margin-top: 30rpx;
place-items: center;
- .item-check{
+ .item-check1{
background-size: 100% 100%;
background-image: url("/static/images/sign/sign.png");
}
- .item-noCheck{
+ .item-check0{
background-size: 100% 100%;
background-image: url("/static/images/sign/noSign1.png");
}
+ .item-check-1{
+ background-size: 100% 100%;
+ background-image: url("/static/images/sign/noneSign.png");
+ }
.item{
position: relative;
width: 160rpx;
diff --git a/pages/work/index.vue b/pages/work/index.vue
index fb43c78..ccdf1c8 100644
--- a/pages/work/index.vue
+++ b/pages/work/index.vue
@@ -191,7 +191,7 @@
用工姓名
手机号码
发薪状态
- 实发金额
+
应发金额
身份证号
备注
@@ -201,7 +201,7 @@
{{ sign.phone }}
{{ sign.stEmployeeFundRecord == null ? 0 : sign.stEmployeeFundRecord.realPrice }}
- {{ task.dayPrice }}
+
{{ sign.idCard }}
{{ sign.remark == null ? "无" : sign.remark}}