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 | 222 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 189 insertions(+), 33 deletions(-)
diff --git a/src/main/webapp/views/taskWrk/taskWrk.html b/src/main/webapp/views/taskWrk/taskWrk.html
index 6f0e967..aaabdef 100644
--- a/src/main/webapp/views/taskWrk/taskWrk.html
+++ b/src/main/webapp/views/taskWrk/taskWrk.html
@@ -17,58 +17,79 @@
<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
+ v-model="tableSearchParam.datetime"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ type="datetimerange"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡">
+ </el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="getTableData">鏌ヨ</el-button>
<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>
<el-dropdown-item command="cancel">鍙栨秷</el-dropdown-item>
</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="crnNo" label="鍫嗗灈鏈哄彿">
</el-table-column>
</el-table>
@@ -80,6 +101,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({
@@ -97,8 +134,14 @@
tableSearchParam: {
task_no: null,
status: null,
- wrk_no: null
- }
+ wrk_no: null,
+ datetime: null,
+ barcode:null
+ },
+ taskWrkFormVisible: false,
+ taskWrkForm: {},
+ taskWrkFormLabelWidth: '80px',
+ taskWrkFormTitle: ''
},
created() {
this.init()
@@ -118,9 +161,13 @@
},
getTableData() {
let that = this;
- let data = this.tableSearchParam
+ let data = JSON.parse(JSON.stringify(this.tableSearchParam))
data.curr = this.currentPage
data.limit = this.pageSize
+ if (this.tableSearchParam.datetime != null) {
+ data.datetime = null
+ data.create_time = this.tableSearchParam.datetime[0] + " - " + this.tableSearchParam.datetime[1]
+ }
$.ajax({
url: baseUrl + "/taskWrk/list/auth",
headers: {
@@ -169,9 +216,21 @@
//鏌ョ湅鎸囦护
this.showCommand(row)
break;
+ case "upIoPri":
+ //鏌ョ湅鎸囦护
+ this.upIoPri(row)
+ break;
+ case "downIoPri":
+ //鏌ョ湅鎸囦护
+ this.downIoPri(row)
+ break;
+ case "changeCommand":
+ //淇敼鎸囦护
+ this.changeCommand(row);
+ break
case "assign":
//娲惧彂浠诲姟
- this.assginWrk(row)
+ this.assignWrk(row)
break;
case "complete":
//瀹岀粨浠诲姟
@@ -192,11 +251,75 @@
maxmin: true,
area: [top.detailWidth, top.detailHeight],
shadeClose: true,
- content: '../commandManage/commandManage.html?taskNo=' + row.taskNo + "&wrkNo=" + wrkNo,
+ content: 'commandManage.html?taskNo=' + row.taskNo + "&wrkNo=" + wrkNo,
success: function(layero, index) {}
});
},
- assginWrk(row){
+ 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
+ this.taskWrkFormTitle = "浠诲姟锛�" + row.taskNo
+ this.taskWrkForm = row
+ },
+ assignWrk(row){
//娲惧彂浠诲姟
let that = this
$.ajax({
@@ -227,7 +350,7 @@
});
},
completeWrk(row){
- //娲惧彂浠诲姟
+ //瀹屾垚浠诲姟
let that = this
$.ajax({
url: baseUrl + "/taskWrk/complete/auth",
@@ -285,6 +408,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