From 592164b38f12dd2a605c20f6d1c84ec6b28b4f56 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期六, 09 十二月 2023 16:46:01 +0800
Subject: [PATCH] 报工报错的问题修改
---
src/views/dashboard/components/TaskControl.vue | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/views/dashboard/components/TaskControl.vue b/src/views/dashboard/components/TaskControl.vue
index 3731431..fc7f199 100644
--- a/src/views/dashboard/components/TaskControl.vue
+++ b/src/views/dashboard/components/TaskControl.vue
@@ -89,6 +89,20 @@
*/
function finishTaskProduce() {
if (task?.value && task.value?.Procedure?.ID) {
+ //鐐瑰嚮鐨勬椂鍊欎笉鑳芥瘮瀹為檯寮�濮嬫椂闂村ぇ浜�1鍒嗛挓
+ 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
+ }
+ }
finishTask({ id: task!.value.Procedure.ID }).then(
(res) => {
ElMessage({
@@ -135,14 +149,16 @@
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
+ }
+ if (workers.value[0].workerId) {
+ showReportModal.value = true
}
}
--
Gitblit v1.8.0