*

L

昨天 3812344a6a8cff41b80277f6bf7a52115fc6674c

*

 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();
    }


 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">-->
<!--&lt;!&ndash;                                <el-dropdown-item command="showCommand">查看指令</el-dropdown-item>&ndash;&gt;-->
<!--                                <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="任务状态">