From 24fc54262b62a4f6835be68cd318c14e4d7327ef Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期六, 13 十二月 2025 17:39:31 +0800
Subject: [PATCH] *
---
src/main/webapp/views/taskWrkLog/taskWrkLog.html | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++-
src/main/java/com/zy/asrs/controller/TaskWrkLogController.java | 6 ++++++
2 files changed, 57 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java b/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
index 881cf90..54eb1e6 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
@@ -114,6 +114,12 @@
}
taskWrkLog1.setStartPoint(taskWrkLog.getStartPoint());
taskWrkLog1.setTargetPoint(taskWrkLog.getTargetPoint());
+ taskWrkLog1.setModiTime(taskWrkLog.getModiTime());//淇敼鏃堕棿
+// taskWrkLog1.setCancelTime(taskWrkLog.getCancelTime());//鍙栨秷鏃堕棿
+ taskWrkLog1.setAssignTime(taskWrkLog.getAssignTime());//娲惧彂鏃堕棿
+ taskWrkLog1.setCompleteTime(taskWrkLog.getCompleteTime());//瀹岀粨鏃堕棿
+ taskWrkLog1.setExecuteTime(taskWrkLog.getExecuteTime());//鎵ц鏃堕棿
+ taskWrkLog1.setCreateTime(taskWrkLog.getCreateTime());//鎵ц鏃堕棿
taskWrkLogService.update(taskWrkLog1,new EntityWrapper<TaskWrkLog>().eq("TASK_NO", taskWrkLog.getTaskNo()).eq("WRK_NO", taskWrkLog.getWrkNo()).eq("MODI_TIME",taskWrkLog1.getModiTime()));
return R.ok();
}
diff --git a/src/main/webapp/views/taskWrkLog/taskWrkLog.html b/src/main/webapp/views/taskWrkLog/taskWrkLog.html
index a4a739f..9c7e47a 100644
--- a/src/main/webapp/views/taskWrkLog/taskWrkLog.html
+++ b/src/main/webapp/views/taskWrkLog/taskWrkLog.html
@@ -39,7 +39,7 @@
<el-date-picker
v-model="tableSearchParam.datetime"
value-format="yyyy-MM-dd HH:mm:ss"
- type="datetimerange"
+ type="datetime"
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡">
@@ -117,6 +117,51 @@
</el-form-item>
<el-form-item label="缁堢偣浣嶇疆" :label-width="taskWrkFormLabelWidth">
<el-input v-model="taskWrkForm.targetPoint" autocomplete="off"></el-input>
+ </el-form-item>
+ <el-form-item label="淇敼鏃堕棿" :label-width="taskWrkFormLabelWidth">
+ <!-- 灏� el-input 鏇挎崲涓� el-date-picker -->
+ <el-date-picker
+ v-model="taskWrkForm.modiTime"
+ type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="閫夋嫨鏃ユ湡鏃堕棿">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="娲惧彂鏃堕棿" :label-width="taskWrkFormLabelWidth">
+ <!-- 灏� el-input 鏇挎崲涓� el-date-picker -->
+ <el-date-picker
+ v-model="taskWrkForm.assignTime"
+ type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="閫夋嫨鏃ユ湡鏃堕棿">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="瀹岀粨鏃堕棿" :label-width="taskWrkFormLabelWidth">
+ <!-- 灏� el-input 鏇挎崲涓� el-date-picker -->
+ <el-date-picker
+ v-model="taskWrkForm.completeTime"
+ type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="閫夋嫨鏃ユ湡鏃堕棿">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="鎵ц鏃堕棿" :label-width="taskWrkFormLabelWidth">
+ <!-- 灏� el-input 鏇挎崲涓� el-date-picker -->
+ <el-date-picker
+ v-model="taskWrkForm.executeTime"
+ type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="閫夋嫨鏃ユ湡鏃堕棿">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="鎺ユ敹鏃堕棿" :label-width="taskWrkFormLabelWidth">
+ <!-- 灏� el-input 鏇挎崲涓� el-date-picker -->
+ <el-date-picker
+ v-model="taskWrkForm.createTime"
+ type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="閫夋嫨鏃ユ湡鏃堕棿">
+ </el-date-picker>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -430,6 +475,11 @@
wrkNo: this.taskWrkForm.wrkNo,
startPoint: this.taskWrkForm.startPoint,
targetPoint: this.taskWrkForm.targetPoint,
+ modiTime: this.taskWrkForm.modiTime,
+ assignTime: this.taskWrkForm.assignTime,
+ completeTime: this.taskWrkForm.completeTime,
+ executeTime: this.taskWrkForm.executeTime,
+ createTime: this.taskWrkForm.createTime,
},
method: 'POST',
success: function (res) {
--
Gitblit v1.9.1