*

L

3 天以前 24fc54262b62a4f6835be68cd318c14e4d7327ef

*

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

 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) {