From 4d9e2ea59aa2e9fbdcacd3d8d8dfd543a2fccba5 Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期五, 23 一月 2026 13:53:06 +0800
Subject: [PATCH] *
---
src/main/webapp/views/taskWrkLog/taskWrkLog.html | 90 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 78 insertions(+), 12 deletions(-)
diff --git a/src/main/webapp/views/taskWrkLog/taskWrkLog.html b/src/main/webapp/views/taskWrkLog/taskWrkLog.html
index a4a739f..c29ea58 100644
--- a/src/main/webapp/views/taskWrkLog/taskWrkLog.html
+++ b/src/main/webapp/views/taskWrkLog/taskWrkLog.html
@@ -26,6 +26,15 @@
<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-input v-model="tableSearchParam.startPoint" placeholder="璧风偣"></el-input>
+ </el-form-item>
+ <el-form-item label="">
+ <el-input v-model="tableSearchParam.targetPoint" placeholder="缁堢偣"></el-input>
+ </el-form-item>
+ <el-form-item label="">
<el-select v-model="tableSearchParam.status" placeholder="浠诲姟鐘舵��">
<el-option label="鎺ユ敹" value="1"></el-option>
<el-option label="娲惧彂" value="2"></el-option>
@@ -36,10 +45,13 @@
</el-select>
</el-form-item>
<el-form-item label="">
+ <el-input v-model="tableSearchParam.allField" 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"
+ type="datetime"
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡">
@@ -53,17 +65,17 @@
</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-item command="changeCommand">淇敼</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-item command="changeCommand">淇敼</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="浠诲姟鐘舵��">
@@ -118,6 +130,51 @@
<el-form-item label="缁堢偣浣嶇疆" :label-width="taskWrkFormLabelWidth">
<el-input v-model="taskWrkForm.targetPoint" autocomplete="off"></el-input>
</el-form-item>
+ <el-form-item label="淇敼鏃堕棿" :label-width="taskWrkFormLabelWidth">
+ <!-- 灏� el-input 鏇挎崲涓� el-date-picker -->
+ <el-date-picker
+ v-model="taskWrkForm.modiTime"
+ type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="閫夋嫨鏃ユ湡鏃堕棿">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="娲惧彂鏃堕棿" :label-width="taskWrkFormLabelWidth">
+ <!-- 灏� el-input 鏇挎崲涓� el-date-picker -->
+ <el-date-picker
+ v-model="taskWrkForm.assignTime"
+ type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="閫夋嫨鏃ユ湡鏃堕棿">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="瀹岀粨鏃堕棿" :label-width="taskWrkFormLabelWidth">
+ <!-- 灏� el-input 鏇挎崲涓� el-date-picker -->
+ <el-date-picker
+ v-model="taskWrkForm.completeTime"
+ type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="閫夋嫨鏃ユ湡鏃堕棿">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="鎵ц鏃堕棿" :label-width="taskWrkFormLabelWidth">
+ <!-- 灏� el-input 鏇挎崲涓� el-date-picker -->
+ <el-date-picker
+ v-model="taskWrkForm.executeTime"
+ type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="閫夋嫨鏃ユ湡鏃堕棿">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="鎺ユ敹鏃堕棿" :label-width="taskWrkFormLabelWidth">
+ <!-- 灏� el-input 鏇挎崲涓� el-date-picker -->
+ <el-date-picker
+ v-model="taskWrkForm.createTime"
+ type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="閫夋嫨鏃ユ湡鏃堕棿">
+ </el-date-picker>
+ </el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="taskWrkFormVisible = false">鍙� 娑�</el-button>
@@ -143,6 +200,10 @@
task_no: null,
status: null,
wrk_no: null,
+ barcode: null,
+ startPoint: null,
+ targetPoint: null,
+ allField: null,
datetime: null
},
taskWrkFormVisible: false,
@@ -430,6 +491,11 @@
wrkNo: this.taskWrkForm.wrkNo,
startPoint: this.taskWrkForm.startPoint,
targetPoint: this.taskWrkForm.targetPoint,
+ modiTime: this.taskWrkForm.modiTime,
+ assignTime: this.taskWrkForm.assignTime,
+ completeTime: this.taskWrkForm.completeTime,
+ executeTime: this.taskWrkForm.executeTime,
+ createTime: this.taskWrkForm.createTime,
},
method: 'POST',
success: function (res) {
--
Gitblit v1.9.1