From 1a3f0ed6b7f6d4112069a3c8679e7192365d5eef Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 31 三月 2026 12:38:44 +0800
Subject: [PATCH] #电视机退回时入库站点也显示信息
---
src/main/webapp/views/wrkMast/wrkMast.html | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/views/wrkMast/wrkMast.html b/src/main/webapp/views/wrkMast/wrkMast.html
index dcd8808..9a9eabb 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;
@@ -285,6 +296,15 @@
@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">
<el-button size="small" type="primary" icon="el-icon-search" @click="handleSearch">鎼滅储</el-button>
<el-button size="small" plain icon="el-icon-refresh-left" @click="handleReset">閲嶇疆</el-button>
@@ -377,8 +397,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 +414,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 +444,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=20260322_system_msg_wrap"></script>
</html>
--
Gitblit v1.9.1