From 1c1000a93a88b5af5eabbf410aa264b0911dbee4 Mon Sep 17 00:00:00 2001
From: cuikaidong <ckd2942379034@163.com>
Date: 星期二, 29 七月 2025 14:18:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/dnc/base/modules/TerminalIndex/EquipmentStartWork.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/dnc/base/modules/TerminalIndex/EquipmentStartWork.vue b/src/views/dnc/base/modules/TerminalIndex/EquipmentStartWork.vue
index 18b4f97..2cb2e45 100644
--- a/src/views/dnc/base/modules/TerminalIndex/EquipmentStartWork.vue
+++ b/src/views/dnc/base/modules/TerminalIndex/EquipmentStartWork.vue
@@ -73,7 +73,7 @@
{
title: '鐢ㄦ埛缂栧彿',
align: 'center',
- dataIndex: 'punchUser',
+ dataIndex: 'punchUserUserName',
width: 250
},
{
@@ -146,7 +146,7 @@
that['clock' + clockInOrOut + 'Loading' + shiftSchedule] = true
that.queryParam = {}
that.queryParam['shiftSchedule'] = shiftSchedule
- that.queryParam['check' + clockInOrOut + 'Time'] = moment('2025-06-11 08:30:00').format('YYYY-MM-DD HH:mm:ss')
+ that.queryParam['check' + clockInOrOut + 'Time'] = moment().format('YYYY-MM-DD HH:mm:ss')
that.queryParam.equipmentId = that.model.equipmentIdList.join()
console.log('queryParam', that.queryParam)
--
Gitblit v1.9.3