From 8d5c70aef9cbacbcc412d73c4b730e21f94e6514 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 30 六月 2025 09:04:10 +0800
Subject: [PATCH] 1
---
src/main/webapp/views/taskWrk/taskWrk.html | 66 +++++++++++++++++++++++++++++---
1 files changed, 59 insertions(+), 7 deletions(-)
diff --git a/src/main/webapp/views/taskWrk/taskWrk.html b/src/main/webapp/views/taskWrk/taskWrk.html
index cf0fece..ba46faa 100644
--- a/src/main/webapp/views/taskWrk/taskWrk.html
+++ b/src/main/webapp/views/taskWrk/taskWrk.html
@@ -31,6 +31,16 @@
<el-form-item label="">
<el-input v-model="tableSearchParam.wrk_no" 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>
@@ -42,7 +52,8 @@
<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="showCommand">鏌ョ湅鎸囦护</el-dropdown-item>-->
+ <el-dropdown-item command="returnWorkingCondition">閲嶆柊缁欏爢鍨涙満涓嬪彂浠诲姟</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>
@@ -72,6 +83,12 @@
<el-table-column property="barcode" label="鎵樼洏鐮�">
</el-table-column>
<el-table-column property="crnNo" label="鍫嗗灈鏈哄彿">
+ </el-table-column>
+ <el-table-column property="ioPri" label="浼樺厛绾�">
+ </el-table-column>
+ <el-table-column property="type" label="涓嬮檷楂樺害">
+ </el-table-column>
+ <el-table-column property="memo" label="澶囨敞">
</el-table-column>
</el-table>
@@ -116,7 +133,8 @@
tableSearchParam: {
task_no: null,
status: null,
- wrk_no: null
+ wrk_no: null,
+ datetime: null,
},
taskWrkFormVisible: false,
taskWrkForm: {},
@@ -141,9 +159,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: {
@@ -188,9 +210,9 @@
},
handleCommand(command, row) {
switch (command) {
- case "showCommand":
- //鏌ョ湅鎸囦护
- this.showCommand(row)
+ case "returnWorkingCondition":
+ //閲嶆柊缁欏爢鍨涙満涓嬪彂浠诲姟
+ this.returnWorkingConditionWrk(row)
break;
case "changeCommand":
//淇敼鎸囦护
@@ -260,7 +282,7 @@
});
},
completeWrk(row){
- //娲惧彂浠诲姟
+ //瀹屾垚浠诲姟
let that = this
$.ajax({
url: baseUrl + "/taskWrk/complete/auth",
@@ -289,6 +311,36 @@
}
});
},
+ returnWorkingConditionWrk(row){
+ //閲嶆柊缁欏爢鍨涙満涓嬪彂浠诲姟
+ let that = this
+ $.ajax({
+ url: baseUrl + "/taskWrk/returnWorkingCondition/auth",
+ 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'
+ });
+ }
+ }
+ });
+ },
cancelWrk(row){
//鍙栨秷浠诲姟
let that = this
--
Gitblit v1.9.1