From 2825b82e8a4eca618ab3c2306de2db74a2ecbd1d Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 06 四月 2026 15:54:58 +0800
Subject: [PATCH] #任务取消优化
---
src/main/webapp/views/wrkMast/wrkMast.html | 63 ++++++++++++++++++++++++++++++-
1 files changed, 60 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/views/wrkMast/wrkMast.html b/src/main/webapp/views/wrkMast/wrkMast.html
index dcd8808..bafcb4c 100644
--- a/src/main/webapp/views/wrkMast/wrkMast.html
+++ b/src/main/webapp/views/wrkMast/wrkMast.html
@@ -167,6 +167,17 @@
text-overflow: ellipsis;
}
+ .payload-cell--wrap {
+ display: block;
+ width: 100%;
+ max-width: none;
+ white-space: normal;
+ overflow: visible;
+ text-overflow: clip;
+ word-break: break-all;
+ line-height: 20px;
+ }
+
.pager-bar {
padding: 0 16px 16px;
display: flex;
@@ -277,12 +288,51 @@
</el-input>
</div>
<div class="toolbar-search-item">
+ <el-select
+ v-model="searchForm.io_type"
+ clearable
+ size="small"
+ placeholder="浠诲姟绫诲瀷"
+ style="width: 100%;">
+ <el-option
+ v-for="item in filterOptions.ioTypes"
+ :key="'io-type-' + item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </div>
+ <div class="toolbar-search-item">
+ <el-select
+ v-model="searchForm.wrk_sts"
+ clearable
+ size="small"
+ placeholder="宸ヤ綔鐘舵��"
+ style="width: 100%;">
+ <el-option
+ v-for="item in filterOptions.wrkStatuses"
+ :key="'wrk-sts-' + item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </div>
+ <div class="toolbar-search-item">
<el-input
v-model.trim="searchForm.loc_no"
clearable
size="small"
placeholder="鐩爣搴撲綅"
@keyup.enter.native="handleSearch">
+ </el-input>
+ </div>
+ <div class="toolbar-search-item">
+ <el-input
+ v-model.trim="searchForm.barcode"
+ clearable
+ size="small"
+ placeholder="鎵樼洏鐮�"
+ @keyup.enter.native="handleSearch">
</el-input>
</div>
<div class="toolbar-query-actions">
@@ -377,8 +427,14 @@
:sortable="column.sortable ? 'custom' : false"
:show-overflow-tooltip="column.showOverflow !== false"
:align="column.align || 'left'">
- <template v-if="column.key === 'systemMsg'" slot-scope="scope">
- <span class="payload-cell">{{ scope.row.systemMsg || '--' }}</span>
+ <template slot-scope="scope">
+ <span
+ :class="{
+ 'payload-cell': column.key === 'systemMsg' || column.key === 'errorMemo',
+ 'payload-cell--wrap': column.key === 'systemMsg'
+ }">
+ {{ displayCellValue(scope.row, column) }}
+ </span>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" fixed="right" width="100" align="center">
@@ -388,6 +444,7 @@
鎿嶄綔<i class="el-icon-arrow-down el-icon--right"></i>
</el-button>
<el-dropdown-menu slot="dropdown">
+ <el-dropdown-item v-if="canManualRollback(scope.row)" command="manualRollback">鎵嬪姩鍥炴粴</el-dropdown-item>
<el-dropdown-item command="complete">瀹屾垚浠诲姟</el-dropdown-item>
<el-dropdown-item command="cancel" divided>鍙栨秷浠诲姟</el-dropdown-item>
</el-dropdown-menu>
@@ -417,5 +474,5 @@
<script type="text/javascript" src="../../static/js/common.js?v=20260309_i18n_fix1"></script>
<script type="text/javascript" src="../../static/vue/js/vue.min.js"></script>
<script type="text/javascript" src="../../static/vue/element/element.js"></script>
-<script type="text/javascript" src="../../static/js/wrkMast/wrkMast.js?v=20260311_wrk_mast_vue"></script>
+<script type="text/javascript" src="../../static/js/wrkMast/wrkMast.js?v=20260401_filter_state_type"></script>
</html>
--
Gitblit v1.9.1