From c00af7e5bfa382528b3bef7ee2484d872fceda17 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期六, 17 一月 2026 17:05:25 +0800
Subject: [PATCH] 样式修改，出库通知单流程查询纠正
---
fzzy-igdss-web/src/main/resources/templates/work/flow-his.html | 172 ++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 103 insertions(+), 69 deletions(-)
diff --git a/fzzy-igdss-web/src/main/resources/templates/work/flow-his.html b/fzzy-igdss-web/src/main/resources/templates/work/flow-his.html
index 0a9fb72..647a4c5 100644
--- a/fzzy-igdss-web/src/main/resources/templates/work/flow-his.html
+++ b/fzzy-igdss-web/src/main/resources/templates/work/flow-his.html
@@ -23,8 +23,8 @@
scroll-behavior: smooth;
}
- html{
- overflow: hidden ;
+ html {
+ overflow: hidden;
}
/* 椤甸潰鍩虹鏍峰紡 */
@@ -121,12 +121,10 @@
color: #333;
margin-bottom: 5px;
}
-
.status-change {
color: #666;
margin-bottom: 5px;
}
-
.status-description {
color: #888;
font-size: 13px;
@@ -140,10 +138,21 @@
}
/* 涓嶅悓鐘舵�佺殑鍥炬爣棰滆壊 */
- .status-created { background-color: #FFB800; }
- .status-waiting { background-color: #FF5722; }
- .status-processing { background-color: #1E9FFF; }
- .status-completed { background-color: #009688; }
+ .status-created {
+ background-color: #FFB800;
+ }
+
+ .status-waiting {
+ background-color: #FF5722;
+ }
+
+ .status-processing {
+ background-color: #1E9FFF;
+ }
+
+ .status-completed {
+ background-color: #009688;
+ }
/* 鍙粴鍔ㄥ尯鍩熸牱寮� */
.scrollable-area {
@@ -167,37 +176,43 @@
.container {
margin: 10px;
}
+
.timeline-item {
padding-left: 40px;
}
+
.timeline-icon {
width: 32px;
height: 32px;
}
+
.scrollable-area {
max-height: 300px; /* 绉诲姩绔皟鏁撮珮搴� */
}
}
- /* 棰濆鐨勫伐鍗曡褰曠敤浜庢紨绀烘粴鍔� */
+
+ /* 棰濆鐨勫伐鍗曡褰曠敤浜庢紨绀烘粴鍔�
.extra-records {
display: none;
}
+ */
</style>
</head>
<body>
<div class="container">
-<!-- <div class="header">-->
-<!-- <i class="layui-icon layui-icon-form"></i> 宸ュ崟澶勭悊璁板綍-->
-<!-- </div>-->
+ <!-- <div class="header">-->
+ <!-- <i class="layui-icon layui-icon-form"></i> 宸ュ崟澶勭悊璁板綍-->
+ <!-- </div>-->
<div class="summary-box">
<i class="layui-icon layui-icon-tips"></i>
- 澶勭悊璁板綍锛氳宸ュ崟绱澶勭悊鏃堕暱 <span style="color:#1E9FFF; font-weight:bold;">1鍒嗛挓</span>锛岀疮璁″鐞嗘鏁� <span style="color:#1E9FFF; font-weight:bold;">3娆�</span>
+ 澶勭悊璁板綍锛氳宸ュ崟绱澶勭悊鏃堕暱 <span style="color:#1E9FFF; font-weight:bold;">1鍒嗛挓</span>锛岀疮璁″鐞嗘鏁� <span
+ style="color:#1E9FFF; font-weight:bold;">3娆�</span>
</div>
<div class="timeline-container">
<!-- 杩欓噷鏄彲婊氬姩鐨勬椂闂磋酱鍖哄煙 -->
<div class="custom-timeline scrollable-area method-1 smooth-scroll" id="timelineScroll">
- <!-- 宸插畬鎴� -->
+ <!-- 宸插畬鎴�
<div class="timeline-item">
<div class="timeline-icon status-completed">
<i class="layui-icon layui-icon-ok"></i>
@@ -208,8 +223,9 @@
<div class="time-info">2026-01-06 13:56:21</div>
</div>
</div>
+ -->
- <!-- 澶勭悊涓� -->
+ <!-- 澶勭悊涓�
<div class="timeline-item">
<div class="timeline-icon status-processing">
<i class="layui-icon layui-icon-loading"></i>
@@ -221,8 +237,9 @@
<div class="time-info">2026-01-06 13:56:01</div>
</div>
</div>
+ -->
- <!-- 寰呮帴鏀� -->
+ <!-- 寰呮帴鏀�
<div class="timeline-item">
<div class="timeline-icon status-waiting">
<i class="layui-icon layui-icon-user"></i>
@@ -233,8 +250,9 @@
<div class="time-info">2026-01-06 13:55:20</div>
</div>
</div>
+ -->
- <!-- 鏂板缓宸ュ崟 -->
+ <!-- 鏂板缓宸ュ崟
<div class="timeline-item">
<div class="timeline-icon status-created">
<i class="layui-icon layui-icon-add-circle"></i>
@@ -245,61 +263,77 @@
<div class="time-info">2026-01-06 13:55:00</div>
</div>
</div>
+ -->
- <!-- 浠ヤ笅涓洪澶栬褰曪紝鐢ㄤ簬婕旂ず婊氬姩鏁堟灉 -->
- <div class="extra-records">
- <!-- 棰濆璁板綍1 -->
- <div class="timeline-item">
- <div class="timeline-icon status-waiting">
- <i class="layui-icon layui-icon-user"></i>
- </div>
- <div class="timeline-content">
- <div class="operator-info">绯荤粺鑷姩</div>
- <div class="status-change">宸ュ崟宸插垱寤猴紝绛夊緟鍒嗛厤</div>
- <div class="time-info">2026-01-06 13:54:30</div>
- </div>
- </div>
-
- <!-- 棰濆璁板綍2 -->
- <div class="timeline-item">
- <div class="timeline-icon status-waiting">
- <i class="layui-icon layui-icon-notice"></i>
- </div>
- <div class="timeline-content">
- <div class="operator-info">绯荤粺鑷姩</div>
- <div class="status-change">鍙戦�佸伐鍗曞垱寤洪�氱煡</div>
- <div class="time-info">2026-01-06 13:54:15</div>
- </div>
- </div>
-
- <!-- 棰濆璁板綍3 -->
- <div class="timeline-item">
- <div class="timeline-icon status-completed">
- <i class="layui-icon layui-icon-ok"></i>
- </div>
- <div class="timeline-content">
- <div class="operator-info">鐢ㄦ埛鎻愪氦</div>
- <div class="status-change">宸ュ崟鎻愪氦鎴愬姛</div>
- <div class="status-description">鐢ㄦ埛閫氳繃Web绔彁浜ゅ伐鍗�</div>
- <div class="time-info">2026-01-06 13:54:00</div>
- </div>
- </div>
-
- <!-- 棰濆璁板綍4 -->
- <div class="timeline-item">
- <div class="timeline-icon status-created">
- <i class="layui-icon layui-icon-edit"></i>
- </div>
- <div class="timeline-content">
- <div class="operator-info">鐢ㄦ埛 寮犱笁</div>
- <div class="status-change">濉啓宸ュ崟淇℃伅</div>
- <div class="status-description">闂鎻忚堪锛氬叕浼楀彿鏃犳硶姝ｅ父鐧诲綍</div>
- <div class="time-info">2026-01-06 13:53:45</div>
- </div>
- </div>
- </div>
</div>
</div>
</div>
+
+<!-- 鍏ㄥ眬js -->
+<script th:src="@{/js/jquery.min.js}"></script>
+
+<script th:inline="javascript">
+ var list = [[${list}]];
+
+ $(function () {
+ if (list && list.length > 0) {
+ init();
+ }
+ function getNodeName(node) {
+ if (node.indexOf('start') > 0) {
+ return '鎻愪氦';
+ } else if (node.indexOf('end') > 0) {
+ return '瀹屾垚';
+ } else if ('node1' === node) {
+ return '搴撳尯瀹℃壒';
+ } else if ('node2' === node) {
+ return '鐩戠瀹℃壒';
+ } else if ('node3' === node) {
+ return '閾惰瀹℃壒';
+ } else {
+ return '瀹℃壒';
+ }
+ }
+
+ function init() {
+ var htm = '';
+ for (var i = 0; i < list.length; i++) {
+ var item = list[i];
+ var node = item.node;
+ htm += '<div class="timeline-item">';
+
+ if (node.indexOf('start') > 0) {
+ htm += '<div class="timeline-icon status-created">';
+ htm += '<i class="layui-icon layui-icon-add-circle"></i>'
+ } else if (node.indexOf('end') > 0) {
+ htm += '<div class="timeline-icon status-completed">';
+ htm += '<i class="layui-icon layui-icon-ok"></i>'
+ } else {
+ htm += '<div class="timeline-icon status-processing">';
+ htm += '<i class="layui-icon layui-icon-loading"></i>'
+ }
+ htm += '</div>';
+ htm += '<div class="timeline-content">';
+ //htm += '<div class="operator-info">' + item.assigneeName + '</div>';
+ htm += '<div class="operator-info">';
+ htm += '娴佺▼鑺傜偣锛�'+getNodeName(node);
+ htm += ' 瀹℃壒鍔ㄤ綔锛�'+item.action;
+ htm += ' 缁忓姙浜猴細'+item.assigneeName;
+ htm += '</div>';
+ if(item.remark){
+ htm += '<div class="status-change">' + item.remark + '</div>';
+ }else{
+ htm += '<div class="status-change">' + '' + '</div>';
+ }
+ htm += '<div class="time-info">' + item.createTime + '</div>';
+ htm += '</div></div>';
+ }
+ $('#timelineScroll').html(htm);
+ }
+
+ });
+
+</script>
+
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.3