From 45a87642e46c746802af13bf47bcd70e3b69277a Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 14 十二月 2023 16:49:38 +0800
Subject: [PATCH] #
---
src/main/webapp/views/taskWrk/taskWrk.html | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/views/taskWrk/taskWrk.html b/src/main/webapp/views/taskWrk/taskWrk.html
index cf0fece..befd375 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>
@@ -72,6 +82,8 @@
<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>
@@ -116,7 +128,8 @@
tableSearchParam: {
task_no: null,
status: null,
- wrk_no: null
+ wrk_no: null,
+ datetime: null,
},
taskWrkFormVisible: false,
taskWrkForm: {},
@@ -141,9 +154,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: {
@@ -260,7 +277,7 @@
});
},
completeWrk(row){
- //娲惧彂浠诲姟
+ //瀹屾垚浠诲姟
let that = this
$.ajax({
url: baseUrl + "/taskWrk/complete/auth",
--
Gitblit v1.9.1