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/taskWrkLog/taskWrkLog.html |   30 ++++++++++++++++--------------
 1 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/main/webapp/views/taskWrkLog/taskWrkLog.html b/src/main/webapp/views/taskWrkLog/taskWrkLog.html
index e9c8892..12757f6 100644
--- a/src/main/webapp/views/taskWrkLog/taskWrkLog.html
+++ b/src/main/webapp/views/taskWrkLog/taskWrkLog.html
@@ -24,7 +24,7 @@
 							<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-input v-model="tableSearchParam.barcode" placeholder="鏉$爜"></el-input>
 						</el-form-item>
 						<el-form-item label="">
 							<el-input v-model="tableSearchParam.start_point" placeholder="璧峰浣�"></el-input>
@@ -38,26 +38,26 @@
 						</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="resubmitTheTask">閲嶆柊涓婃姤浠诲姟瀹岀粨</el-dropdown-item>
-										<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="resubmitTheTask">閲嶆柊涓婃姤浠诲姟瀹岀粨</el-dropdown-item>-->
+<!--										<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="浠诲姟鐘舵��">
 						</el-table-column>
 						<el-table-column property="wrkNo" label="宸ヤ綔鍙�">
 						</el-table-column>
-						<el-table-column property="createTime$" label="浠诲姟鏃堕棿">
+						<el-table-column property="createTime$" label="鍒涘缓鏃堕棿" width="150">
 						</el-table-column>
-						<el-table-column property="durationTime" label="鎸佺画鏃堕暱">
+						<el-table-column property="completeTime$" label="瀹屾垚鏃堕棿" width="150">
 						</el-table-column>
 						<el-table-column property="ioType$" label="浠诲姟绫诲瀷">
 						</el-table-column>
@@ -71,6 +71,8 @@
 						</el-table-column>
 						<el-table-column property="barcode" label="鏉$爜">
 						</el-table-column>
+						<el-table-column property="type" label="涓嬮檷楂樺害">
+						</el-table-column>
 					</el-table>
 
 					<div style="margin-top: 10px;">

--
Gitblit v1.9.1