From 1519870c0e18171ced014a840e86a459dc6b00f1 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 12 十二月 2023 17:26:06 +0800
Subject: [PATCH] 报工记录列表增加人员姓名
---
src/views/dashboard/components/TaskControl.vue | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/src/views/dashboard/components/TaskControl.vue b/src/views/dashboard/components/TaskControl.vue
index 8887f59..cb9d2e2 100644
--- a/src/views/dashboard/components/TaskControl.vue
+++ b/src/views/dashboard/components/TaskControl.vue
@@ -95,7 +95,7 @@
realStartTime = realStartTime * 1000
let time = Date.now()
let differ = Math.abs(time - realStartTime) / 1000
- if (differ > 60) {
+ if (differ < 60) {
ElMessage({
message: '宸ュ簭鍒堕�犳椂闂村お鐭紝璇锋鏌ワ紒',
type: 'warning'
@@ -149,14 +149,33 @@
const showReportModal = ref(false)
function openReportModal() {
// 鏈変汉鍛樻墠鍙互鎶ュ伐
- if (workers.value[0].workerId) {
- showReportModal.value = true
- } else {
+ if (!workers.value || workers.value.length == 0) {
ElMessage({
message: '娌℃湁浜哄憳淇℃伅涓嶅厑璁告墜鍔ㄦ姤宸ワ紒',
type: 'error',
duration: 3000
})
+ return true
+ }
+ // 浠庡紑濮嬬敓浜у埌鎶ュ伐鐨勭偣鍑绘椂闂翠笉鑳藉皬浜�1鍒嗛挓
+ if (task?.value && task.value?.Procedure?.realStartTime) {
+ let realStartTime = task.value?.Procedure?.realStartTime
+ if (realStartTime) {
+ realStartTime = realStartTime * 1000
+ let time = Date.now()
+ let differ = Math.abs(time - realStartTime) / 1000
+ if (differ < 60) {
+ ElMessage({
+ message: '宸ュ簭鍒堕�犳椂闂村お鐭紝璇锋鏌ワ紒',
+ type: 'warning'
+ })
+ return true
+ }
+ }
+ }
+
+ if (workers.value[0].workerId) {
+ showReportModal.value = true
}
}
--
Gitblit v1.8.0