From 2fddfc8a998c5861ef1c2084f4081d580dbc27d2 Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期二, 28 十一月 2023 09:33:14 +0800 Subject: [PATCH] #任务管理运行修改起点-终点数据 --- src/main/webapp/views/taskWrk/taskWrk.html | 66 ++++++++++++++++++++++++++++++++ src/main/java/com/zy/asrs/controller/TaskWrkController.java | 20 +++++++++ 2 files changed, 84 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java index 009f02c..f82660e 100644 --- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java +++ b/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){ diff --git a/src/main/webapp/views/taskWrk/taskWrk.html b/src/main/webapp/views/taskWrk/taskWrk.html index a88d2b0..d743ec2 100644 --- a/src/main/webapp/views/taskWrk/taskWrk.html +++ b/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' + }); + } + } + }); } } }) -- Gitblit v1.9.1