Junjie
2023-11-28 2fddfc8a998c5861ef1c2084f4081d580dbc27d2
#任务管理运行修改起点-终点数据
2个文件已修改
86 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/TaskWrkController.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/taskWrk/taskWrk.html 66 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -67,13 +67,31 @@
    @RequestMapping(value = "/taskWrk/update/auth")
    @ManagerAuth
    public R update(TaskWrk taskWrk){
        if (Cools.isEmpty(taskWrk) || null==taskWrk.getTaskNo()){
        if (Cools.isEmpty(taskWrk) || null == taskWrk.getTaskNo()) {
            return R.error();
        }
        taskWrkService.updateById(taskWrk);
        return R.ok();
    }
    @RequestMapping(value = "/taskWrk/updatePoint/auth")
    @ManagerAuth
    public R updatePoint(TaskWrk taskWrk){
        if (Cools.isEmpty(taskWrk) || null == taskWrk.getTaskNo()) {
            return R.error();
        }
        TaskWrk taskWrk1 = taskWrkService.selectByTaskNo(taskWrk.getTaskNo());
        if (taskWrk1 == null) {
            return R.error();
        }
        taskWrk1.setStartPoint(taskWrk.getStartPoint());
        taskWrk1.setTargetPoint(taskWrk.getTargetPoint());
        taskWrk1.setModiTime(new Date());
        taskWrk1.setModiUser(getUserId());
        taskWrkService.updateById(taskWrk1);
        return R.ok();
    }
    @RequestMapping(value = "/taskWrk/delete/auth")
    @ManagerAuth
    public R delete(@RequestParam(value="ids[]") Long[] ids){
src/main/webapp/views/taskWrk/taskWrk.html
@@ -43,6 +43,7 @@
                                    <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-item command="assign">派发</el-dropdown-item>
                                        <el-dropdown-item command="complete">完结</el-dropdown-item>
                                        <el-dropdown-item command="cancel">取消</el-dropdown-item>
@@ -80,6 +81,22 @@
                    </div>
                </el-card>
            </div>
            <el-dialog :title="taskWrkFormTitle" :visible.sync="taskWrkFormVisible">
                <el-form :model="taskWrkForm">
                    <el-form-item label="起点位置" :label-width="taskWrkFormLabelWidth">
                        <el-input v-model="taskWrkForm.startPoint" autocomplete="off"></el-input>
                    </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>
                <div slot="footer" class="dialog-footer">
                    <el-button @click="taskWrkFormVisible = false">取 消</el-button>
                    <el-button type="primary" @click="taskWrkFormConfirm">确 定</el-button>
                </div>
            </el-dialog>
        </div>
        <script>
            var $layui = layui.config({
@@ -98,7 +115,11 @@
                        task_no: null,
                        status: null,
                        wrk_no: null
                    }
                    },
                    taskWrkFormVisible: false,
                    taskWrkForm: {},
                    taskWrkFormLabelWidth: '80px',
                    taskWrkFormTitle: ''
                },
                created() {
                    this.init()
@@ -169,6 +190,10 @@
                                //查看指令
                                this.showCommand(row)
                                break;
                            case "changeCommand":
                                //修改指令
                                this.changeCommand(row);
                                break
                            case "assign":
                                //派发任务
                                this.assignWrk(row)
@@ -195,6 +220,12 @@
                            content: 'commandManage.html?taskNo=' + row.taskNo + "&wrkNo=" + wrkNo,
                            success: function(layero, index) {}
                        });
                    },
                    changeCommand(row) {
                        //修改指令
                        this.taskWrkFormVisible = true
                        this.taskWrkFormTitle = "任务:" + row.taskNo
                        this.taskWrkForm = row
                    },
                    assignWrk(row){
                        //派发任务
@@ -285,6 +316,39 @@
                                }
                            }
                        });
                    },
                    taskWrkFormConfirm() {
                        //修改指定任务数据
                        let that = this
                        $.ajax({
                            url: baseUrl + "/taskWrk/updatePoint/auth",
                            headers: {
                                'token': localStorage.getItem('token')
                            },
                            data: {
                                taskNo: this.taskWrkForm.taskNo,
                                startPoint: this.taskWrkForm.startPoint,
                                targetPoint: this.taskWrkForm.targetPoint,
                            },
                            method: 'POST',
                            success: function(res) {
                                if (res.code == 200) {
                                    that.taskWrkFormVisible = false
                                    that.$message({
                                        message: "更新成功",
                                        type: 'success'
                                    });
                                    that.getTableData()
                                } else if (res.code === 403) {
                                    top.location.href = baseUrl + "/";
                                } else {
                                    that.$message({
                                        message: res.msg,
                                        type: 'error'
                                    });
                                }
                            }
                        });
                    }
                }
            })