From acacdfa1b6b5dc0ac0c444c53fcbd05f8552ff3c Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 23 四月 2024 08:44:39 +0800
Subject: [PATCH] #演示
---
src/main/webapp/views/taskWrk/taskWrk.html | 133 ++++++++++++++++++++++++++++++++++---------
1 files changed, 104 insertions(+), 29 deletions(-)
diff --git a/src/main/webapp/views/taskWrk/taskWrk.html b/src/main/webapp/views/taskWrk/taskWrk.html
index 9005125..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
@@ -46,13 +49,40 @@
<el-button type="primary" @click="resetParam">閲嶇疆</el-button>
</el-form-item>
</el-form>
- <el-table ref="singleTable" :data="tableData" style="width: 100%;">
- <el-table-column label="鎿嶄綔" width="100">
+ <el-table border ref="singleTable" :data="tableData" style="width: 100%;">
+
+ <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">
+ </el-table-column>
+ <el-table-column sortable align="center" property="wrkNo" label="宸ヤ綔鍙�" width="90">
+ </el-table-column>
+ <el-table-column sortable align="center" property="createTime$" label="浠诲姟鏃堕棿" width="170">
+ </el-table-column>
+<!-- <el-table-column sortable align="center" property="durationTime" label="鎸佺画鏃堕暱">-->
+<!-- </el-table-column>-->
+ <el-table-column sortable align="center" property="ioType$" label="浠诲姟绫诲瀷">
+ </el-table-column>
+ <el-table-column sortable align="center" property="startPoint" label="璧风偣浣嶇疆">
+ </el-table-column>
+ <el-table-column sortable align="center" property="targetPoint" label="缁堢偣浣嶇疆">
+ </el-table-column>
+ <el-table-column sortable align="center" property="wrkSts$" label="宸ヤ綔鐘舵��">
+ </el-table-column>
+ <el-table-column sortable align="center" property="barcode" label="鎵樼洏鐮�">
+ </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>
+ <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>
@@ -60,28 +90,6 @@
</el-dropdown-menu>
</el-dropdown>
</template>
- </el-table-column>
- <el-table-column property="taskNo" label="浠诲姟鍙�">
- </el-table-column>
- <el-table-column property="status$" label="浠诲姟鐘舵��">
- </el-table-column>
- <el-table-column property="wrkNo" label="宸ヤ綔鍙�">
- </el-table-column>
- <el-table-column property="createTime$" label="浠诲姟鏃堕棿">
- </el-table-column>
- <el-table-column property="durationTime" label="鎸佺画鏃堕暱">
- </el-table-column>
- <el-table-column property="ioType$" label="浠诲姟绫诲瀷">
- </el-table-column>
- <el-table-column property="startPoint" label="璧风偣浣嶇疆">
- </el-table-column>
- <el-table-column property="targetPoint" label="缁堢偣浣嶇疆">
- </el-table-column>
- <el-table-column property="wrkSts$" label="宸ヤ綔鐘舵��">
- </el-table-column>
- <el-table-column property="barcode" label="鎵樼洏鐮�">
- </el-table-column>
- <el-table-column property="crnNo" label="鍫嗗灈鏈哄彿">
</el-table-column>
</el-table>
@@ -128,6 +136,7 @@
status: null,
wrk_no: null,
datetime: null,
+ barcode:null
},
taskWrkFormVisible: false,
taskWrkForm: {},
@@ -207,6 +216,14 @@
//鏌ョ湅鎸囦护
this.showCommand(row)
break;
+ case "upIoPri":
+ //鏌ョ湅鎸囦护
+ this.upIoPri(row)
+ break;
+ case "downIoPri":
+ //鏌ョ湅鎸囦护
+ this.downIoPri(row)
+ break;
case "changeCommand":
//淇敼鎸囦护
this.changeCommand(row);
@@ -236,6 +253,64 @@
shadeClose: true,
content: 'commandManage.html?taskNo=' + row.taskNo + "&wrkNo=" + wrkNo,
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) {
@@ -275,7 +350,7 @@
});
},
completeWrk(row){
- //娲惧彂浠诲姟
+ //瀹屾垚浠诲姟
let that = this
$.ajax({
url: baseUrl + "/taskWrk/complete/auth",
--
Gitblit v1.9.1