From 1cbac7aa20a183a9a893651bf0cef24b1909eb5c Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 01 二月 2021 10:19:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master
---
src/main/webapp/approval_mng.xhtml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/approval_mng.xhtml b/src/main/webapp/approval_mng.xhtml
index e08bef5..fcc3af0 100644
--- a/src/main/webapp/approval_mng.xhtml
+++ b/src/main/webapp/approval_mng.xhtml
@@ -72,7 +72,7 @@
emptyMessage="无数据" selection="#{approvalMngController.selectedList}"
rows="20" pageLinks="5">
<p:column selectionMode="multiple" style="width: 30px;text-align: center;"/>
- <p:column headerText="订单状态" width="58px;" style="text-align: center">
+ <p:column headerText="订单状态" width="60px;" style="text-align: center">
<h:outputText value="#{row.status!=null?row.status.text:''}"></h:outputText>
</p:column>
<p:column headerText="申购编号" width="118px;">
@@ -100,7 +100,7 @@
<h:outputText value="#{row.reagent!=null?(''.concat(row.reagent.mainMetering).concat(baseMetaService.getBaseMetaValue(row.reagent.reagentUnit))):''}"></h:outputText>
</p:column>
- <p:column headerText="含税售价" width="56px;">
+ <p:column headerText="含税售价" width="60px;">
<h:outputText value="#{row.applyPrice}"></h:outputText>
</p:column>
@@ -124,7 +124,7 @@
<!--<h:outputText value="#{row.reagent!=null?row.reagent.supplierName:''}"></h:outputText>-->
<!--</p:column>-->
- <p:column headerText="试剂类型" width="29px;">
+ <p:column headerText="试剂类型" width="60px;">
<h:outputText value="#{baseMetaService.getBaseMetaValue(row.reagent.reagentType)}"></h:outputText>
</p:column>
--
Gitblit v1.9.2