From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 01 七月 2024 10:58:35 +0800
Subject: [PATCH] change

---
 src/main/webapp/reagent_user_flow_info.xhtml |   36 ++++++++++++++++++++++++------------
 1 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/main/webapp/reagent_user_flow_info.xhtml b/src/main/webapp/reagent_user_flow_info.xhtml
index 835ed83..fc4907a 100644
--- a/src/main/webapp/reagent_user_flow_info.xhtml
+++ b/src/main/webapp/reagent_user_flow_info.xhtml
@@ -45,8 +45,8 @@
 					<p:outputLabel value="操作状态:"></p:outputLabel>
 					<p:selectOneMenu value="#{opeUseFlowInfoController.operatestate}" style="width: 60px;">
 						<f:selectItem itemLabel="全部" itemValue="#{null}" noSelectionOption="true"></f:selectItem>
-						<f:selectItems value="#{baseMetaService.getBaseMetaList(constants.OPERATE_STATUS)}"
-									   var="item" itemLabel="#{item.metaValue}" itemValue="#{item.id}"></f:selectItems>
+						<f:selectItems value="#{opeUseFlowInfoController.getOperatestateList()}"
+									   var="item" itemLabel="#{item.value}" itemValue="#{item.key}"></f:selectItems>
 					</p:selectOneMenu>
 
 
@@ -204,19 +204,31 @@
 						</p:column>
 					</p:dataTable>
 
-					<div style="margin-top: 20px;">
-						<div style="display: flex;flex-direction: row;justify-content: flex-end;">
-							<div style="width: 100px">签收人:</div>
-							<div style="width: 300px"></div>
+					<div style="display: flex;flex-direction: row;justify-content: space-between;margin-top:20px; ">
+						<div style="margin-left: 94px;">
+							<div style="display: flex;flex-direction: row;justify-content: flex-end;">
+								<div style="width: 100px">出库人:</div>
+								<div style="width: 100px"></div>
+							</div>
+							<div style="display: flex;flex-direction: row;justify-content: flex-end;margin-top:10px; ">
+								<div style="width: 100px">日期:</div>
+								<div style="width: 100px"></div>
+							</div>
+
+						</div>
+						<div style="margin-right: 94px;">
+							<div style="display: flex;flex-direction: row;justify-content: flex-end;">
+								<div style="width: 100px">签收人:</div>
+								<div style="width: 100px"></div>
+							</div>
+							<div style="display: flex;flex-direction: row;justify-content: flex-end;margin-top:10px;">
+								<div style="width: 100px">日期:</div>
+								<div style="width: 100px"></div>
+							</div>
+
 						</div>
 					</div>
 
-					<div style="margin: 10px 0">
-						<div style="display: flex;flex-direction: row;justify-content: flex-end;">
-							<div style="width: 100px">日期:</div>
-							<div style="width: 300px"></div>
-						</div>
-					</div>
 
 					<p:panel styleClass="btn  no-print">
 						<div class="div-btn cancel" id="cancel">关闭</div>

--
Gitblit v1.9.2