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 | 6 +++++-
fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrder.view.xml | 4 ++--
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java
index cfe719f..664c282 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java
@@ -371,7 +371,7 @@
data.setCompleteStatus(Constant.COMPLETE_STATUS_NONE);
//鎵ц娴佺▼
- WorkOrderConf conf = workService.getConfByDeptId(data.getDeptId(), WorkBizType.TYPE_10);
+ WorkOrderConf conf = workService.getConfByDeptId(data.getDeptId(), WorkBizType.TYPE_20);
//娴佺▼涓嶅惎鐢�
if (null == conf || Constant.YN_N.equals(conf.getValTag())) {
data.setAuditStatus(AuditStatus.STATUS_20.getCode());
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrder.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrder.view.xml
index 08c7be5..e38f92b 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrder.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrder.view.xml
@@ -132,7 +132,7 @@
<Property name="label">鎴鏃堕棿</Property>
</PropertyDef>
<PropertyDef name="scope">
- <Property/>
+ <Property></Property>
</PropertyDef>
</DataType>
<DataType name="dtWordProcess">
@@ -478,7 +478,7 @@
<DataColumn>
<ClientEvent name="onRenderCell">renderCell1(arg,self);</ClientEvent>
<Property name="caption">鎿嶄綔</Property>
- <Property name="width">80</Property>
+ <Property name="width">160</Property>
<Property name="align">center</Property>
<Editor/>
</DataColumn>
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 d634785..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
@@ -320,7 +320,11 @@
htm += ' 瀹℃壒鍔ㄤ綔锛�'+item.action;
htm += ' 缁忓姙浜猴細'+item.assigneeName;
htm += '</div>';
- htm += '<div class="status-change">' + item.remark + '</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>';
}
--
Gitblit v1.9.3