From 013c2ef0869f8599ac71444d256a70271bc5171d Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 06 十一月 2025 18:34:58 +0800
Subject: [PATCH] *
---
src/main/webapp/views/taskWrkLog/taskWrkLog.html | 43 ++++++++++++++++++++++++++++++-------------
1 files changed, 30 insertions(+), 13 deletions(-)
diff --git a/src/main/webapp/views/taskWrkLog/taskWrkLog.html b/src/main/webapp/views/taskWrkLog/taskWrkLog.html
index a1a20e5..55b94b1 100644
--- a/src/main/webapp/views/taskWrkLog/taskWrkLog.html
+++ b/src/main/webapp/views/taskWrkLog/taskWrkLog.html
@@ -29,9 +29,21 @@
<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="5"></el-option>
<el-option label="鍙栨秷" value="4"></el-option>
+ <el-option label="鎵嬪姩瀹岀粨" value="7"></el-option>
+ <el-option label="鍑哄簱鍒拌緭閫佺嚎" value="9"></el-option>
</el-select>
+ </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>
@@ -41,16 +53,16 @@
</el-form-item>
</el-form>
<el-table ref="singleTable" :data="tableData" style="width: 100%;">
- <el-table-column label="鎿嶄綔" width="100">
- <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-menu>
- </el-dropdown>
- </template>
- </el-table-column>
+<!-- <el-table-column label="鎿嶄綔" width="100">-->
+<!-- <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-menu>-->
+<!-- </el-dropdown>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
<el-table-column property="taskNo" label="浠诲姟鍙�">
</el-table-column>
<el-table-column property="status$" label="浠诲姟鐘舵��">
@@ -79,7 +91,7 @@
</el-table-column>
<el-table-column property="wrkSts$" label="宸ヤ綔鐘舵��">
</el-table-column>
- <el-table-column property="crnNo" label="鍫嗗灈鏈哄彿">
+ <el-table-column property="crnNo" label="宸烽亾鍙�">
</el-table-column>
<el-table-column property="barcode" label="鏉＄爜">
</el-table-column>
@@ -113,7 +125,8 @@
tableSearchParam: {
task_no: null,
status: null,
- wrk_no: null
+ wrk_no: null,
+ datetime: null
}
},
created() {
@@ -137,6 +150,10 @@
let data = 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