From a0f44792c6ba7978c0e3c9a09ebc06a94ffc11e2 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 03 一月 2024 09:54:20 +0800
Subject: [PATCH] #任务管理增减优先级、排序、搜索
---
src/main/webapp/views/taskWrk/taskWrk.html | 111 ++++++++++++++++++++++++++++++------
src/main/java/com/zy/asrs/entity/TaskWrk.java | 15 +++++
src/main/java/com/zy/asrs/controller/TaskWrkController.java | 30 ++++++++++
3 files changed, 137 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
index 1fad82c..dba67fe 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -295,6 +295,36 @@
taskWrkService.updateById(taskWrk);
return R.ok();
}
+ @PostMapping(value = "/taskWrk/upIoPri")
+ public R upIoPri(@RequestParam String taskNo){
+ TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
+ if (taskWrk.getIoPri() > 300){
+ return R.error("浼樺厛绾у凡鏈�楂�");
+ }
+ Map<Integer,Integer> map = new HashMap<>();
+ map.put(100,200);map.put(200,300);map.put(300,400);
+ Integer pri = map.get(taskWrk.getIoPri());
+ taskWrk.setIoPri(pri);
+ if (!taskWrkService.updateById(taskWrk)){
+ return R.error("澧炲姞浼樺厛绾уけ璐�");
+ }
+ return R.ok();
+ }
+ @PostMapping(value = "/taskWrk/downIoPri")
+ public R downIoPri(@RequestParam String taskNo){
+ TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
+ if (taskWrk.getIoPri() <200){
+ return R.error("浼樺厛绾у凡鏈�浣�");
+ }
+ Map<Integer,Integer> map = new HashMap<>();
+ map.put(200,100);map.put(300,200);map.put(400,300);
+ Integer pri = map.get(taskWrk.getIoPri());
+ taskWrk.setIoPri(pri);
+ if (!taskWrkService.updateById(taskWrk)){
+ return R.error("闄嶄綆浼樺厛绾уけ璐�");
+ }
+ return R.ok();
+ }
public static String getTaskType(Integer paramIoType){
switch (paramIoType){
diff --git a/src/main/java/com/zy/asrs/entity/TaskWrk.java b/src/main/java/com/zy/asrs/entity/TaskWrk.java
index 677c090..b384567 100644
--- a/src/main/java/com/zy/asrs/entity/TaskWrk.java
+++ b/src/main/java/com/zy/asrs/entity/TaskWrk.java
@@ -247,6 +247,21 @@
return String.valueOf(this.status);
}
}
+ public String getIoPri$(){
+ if (null == this.ioPri){ return null; }
+ switch (this.ioPri){
+ case 100:
+ return "浣�";
+ case 200:
+ return "涓�";
+ case 300:
+ return "楂�";
+ case 400:
+ return "绱ф��";
+ default:
+ return String.valueOf(this.ioPri);
+ }
+ }
public String getCreateTime$(){
if (Cools.isEmpty(this.createTime)){
diff --git a/src/main/webapp/views/taskWrk/taskWrk.html b/src/main/webapp/views/taskWrk/taskWrk.html
index c53cd8f..aaabdef 100644
--- a/src/main/webapp/views/taskWrk/taskWrk.html
+++ b/src/main/webapp/views/taskWrk/taskWrk.html
@@ -17,19 +17,22 @@
<div style="width: 100%;">
<el-card class="box-card">
<el-form :inline="true" :model="tableSearchParam" class="demo-form-inline">
- <el-form-item label="">
+ <el-form-item style="width: 100px;" label="">
<el-input v-model="tableSearchParam.task_no" placeholder="浠诲姟鍙�"></el-input>
</el-form-item>
- <el-form-item label="">
- <el-select v-model="tableSearchParam.status" placeholder="浠诲姟鐘舵��">
+ <el-form-item style="width: 100px;" label="">
+ <el-select v-model="tableSearchParam.status" placeholder="鐘舵��">
<el-option label="鎺ユ敹" value="1"></el-option>
<el-option label="娲惧彂" value="2"></el-option>
<el-option label="瀹岀粨" value="3"></el-option>
<el-option label="鍙栨秷" value="4"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="">
+ <el-form-item style="width: 100px;" label="">
<el-input v-model="tableSearchParam.wrk_no" placeholder="宸ヤ綔鍙�"></el-input>
+ </el-form-item>
+ <el-form-item label="">
+ <el-input v-model="tableSearchParam.barcode" placeholder="鎵樼洏鐮�"></el-input>
</el-form-item>
<el-form-item label="">
<el-date-picker
@@ -47,20 +50,7 @@
</el-form-item>
</el-form>
<el-table border ref="singleTable" :data="tableData" style="width: 100%;">
- <el-table-column label="鎿嶄綔" width="100" align="center">
- <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-item command="assign">娲惧彂</el-dropdown-item>
- <el-dropdown-item command="complete">瀹岀粨</el-dropdown-item>
- <el-dropdown-item command="cancel">鍙栨秷</el-dropdown-item>
- </el-dropdown-menu>
- </el-dropdown>
- </template>
- </el-table-column>
+
<el-table-column sortable align="center" property="taskNo" label="浠诲姟鍙�" width="90">
</el-table-column>
<el-table-column sortable align="center" property="status$" label="浠诲姟鐘舵��" width="110">
@@ -83,7 +73,23 @@
</el-table-column>
<el-table-column sortable align="center" property="crnNo" label="鍫嗗灈鏈哄彿">
</el-table-column>
- <el-table-column sortable align="center" property="ioPri" label="浼樺厛绾�">
+ <el-table-column sortable align="center" property="ioPri$" label="浼樺厛绾�">
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" width="100" align="center">
+ <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="upIoPri">澧炲姞浼樺厛绾�</el-dropdown-item>
+ <el-dropdown-item command="downIoPri">闄嶄綆浼樺厛绾�</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>
+ </el-dropdown-menu>
+ </el-dropdown>
+ </template>
</el-table-column>
</el-table>
@@ -130,6 +136,7 @@
status: null,
wrk_no: null,
datetime: null,
+ barcode:null
},
taskWrkFormVisible: false,
taskWrkForm: {},
@@ -209,6 +216,14 @@
//鏌ョ湅鎸囦护
this.showCommand(row)
break;
+ case "upIoPri":
+ //鏌ョ湅鎸囦护
+ this.upIoPri(row)
+ break;
+ case "downIoPri":
+ //鏌ョ湅鎸囦护
+ this.downIoPri(row)
+ break;
case "changeCommand":
//淇敼鎸囦护
this.changeCommand(row);
@@ -240,6 +255,64 @@
success: function(layero, index) {}
});
},
+ upIoPri(row) {
+ let that = this
+ $.ajax({
+ url: baseUrl + "/taskWrk/upIoPri",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data: {
+ taskNo: row.taskNo
+ },
+ method: 'POST',
+ success: function(res) {
+ if (res.code == 200) {
+ that.$message({
+ message: "澧炲姞鎴愬姛",
+ type: 'success'
+ });
+ that.getTableData()
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ that.$message({
+ message: res.msg,
+ type: 'error'
+ });
+ }
+ }
+ });
+ },
+ downIoPri(row) {
+ let that = this
+ $.ajax({
+ url: baseUrl + "/taskWrk/downIoPri",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data: {
+ taskNo: row.taskNo
+ },
+ method: 'POST',
+ success: function(res) {
+ if (res.code == 200) {
+ that.$message({
+ message: "闄嶄綆鎴愬姛",
+ type: 'success'
+ });
+ that.getTableData()
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ that.$message({
+ message: res.msg,
+ type: 'error'
+ });
+ }
+ }
+ });
+ },
changeCommand(row) {
//淇敼鎸囦护
this.taskWrkFormVisible = true
--
Gitblit v1.9.1