From 3812344a6a8cff41b80277f6bf7a52115fc6674c Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期一, 22 十二月 2025 12:54:52 +0800
Subject: [PATCH] *
---
src/main/webapp/views/taskWrkLog/taskWrkLog.html | 22 +++++++++++-----------
src/main/java/com/zy/asrs/controller/TaskWrkLogController.java | 3 ++-
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java b/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
index 54eb1e6..dc1c952 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
@@ -109,6 +109,7 @@
return R.error();
}
TaskWrkLog taskWrkLog1 = taskWrkLogService.selectOne(new EntityWrapper<TaskWrkLog>().eq("TASK_NO", taskWrkLog.getTaskNo()).eq("WRK_NO", taskWrkLog.getWrkNo()).orderBy("MODI_TIME",false));
+ Date modiTime = taskWrkLog1.getModiTime();
if (taskWrkLog1 == null) {
return R.error();
}
@@ -120,7 +121,7 @@
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()));
+ taskWrkLogService.update(taskWrkLog1,new EntityWrapper<TaskWrkLog>().eq("TASK_NO", taskWrkLog.getTaskNo()).eq("WRK_NO", taskWrkLog.getWrkNo()).eq("MODI_TIME",modiTime));
return R.ok();
}
diff --git a/src/main/webapp/views/taskWrkLog/taskWrkLog.html b/src/main/webapp/views/taskWrkLog/taskWrkLog.html
index 9c7e47a..f5d767a 100644
--- a/src/main/webapp/views/taskWrkLog/taskWrkLog.html
+++ b/src/main/webapp/views/taskWrkLog/taskWrkLog.html
@@ -53,17 +53,17 @@
</el-form-item>
</el-form>
<el-table ref="singleTable" :data="tableData" style="width: 100%;">
- <el-table-column label="鎿嶄綔" width="100">
- <template slot-scope="scope">
- <el-dropdown @command="(command)=>{handleCommand(command, scope.row)}">
- <el-button icon="el-icon-more" size="mini" type="primary"></el-button>
- <el-dropdown-menu slot="dropdown">
-<!-- <el-dropdown-item command="showCommand">鏌ョ湅鎸囦护</el-dropdown-item>-->
- <el-dropdown-item command="changeCommand">淇敼</el-dropdown-item>
- </el-dropdown-menu>
- </el-dropdown>
- </template>
- </el-table-column>
+<!-- <el-table-column label="鎿嶄綔" width="100">-->
+<!-- <template slot-scope="scope">-->
+<!-- <el-dropdown @command="(command)=>{handleCommand(command, scope.row)}">-->
+<!-- <el-button icon="el-icon-more" size="mini" type="primary"></el-button>-->
+<!-- <el-dropdown-menu slot="dropdown">-->
+<!--<!– <el-dropdown-item command="showCommand">鏌ョ湅鎸囦护</el-dropdown-item>–>-->
+<!-- <el-dropdown-item command="changeCommand">淇敼</el-dropdown-item>-->
+<!-- </el-dropdown-menu>-->
+<!-- </el-dropdown>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
<el-table-column property="taskNo" label="浠诲姟鍙�">
</el-table-column>
<el-table-column property="status$" label="浠诲姟鐘舵��">
--
Gitblit v1.9.1