From fe6e066b0970ed6c1dd23aa17fa65f16edbf513c Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 23 五月 2024 14:05:46 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/taskWrkLog/taskWrkLog.html |   38 +++++++++++++++++++++++++++++++++++---
 1 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/views/taskWrkLog/taskWrkLog.html b/src/main/webapp/views/taskWrkLog/taskWrkLog.html
index 2c57eb4..a20a4ce 100644
--- a/src/main/webapp/views/taskWrkLog/taskWrkLog.html
+++ b/src/main/webapp/views/taskWrkLog/taskWrkLog.html
@@ -17,11 +17,39 @@
 			<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-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-select v-model="tableSearchParam.io_type" placeholder="浠诲姟绫诲瀷">
+								<el-option label="鍏ュ簱" value="1"></el-option>
+								<el-option label="鍑哄簱" value="2"></el-option>
+								<el-option label="绉诲簱" value="3"></el-option>
+							</el-select>
+						</el-form-item>
+						<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>
@@ -109,9 +137,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 + "/taskWrkLog/list/auth",
 							headers: {

--
Gitblit v1.9.1