前端显示优化

src/main/java/com/baosight/hpjx/hp/xs/sql/HPXSOrg.xml

@@ -118,7 +118,7 @@
     <!-- 查询子集组信息，包括生产组和下料组(递归) -->
     <select id="queryGroupComboBox" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">
         SELECT
-        T2.LEVEL AS "level", T3.ORG_ID AS "orgId", T3.ORG_CNAME AS "orgCname",
+        T2.LEVEL AS "level", T3.ORG_ID AS "orgId", CONCAT('[',T5.FACTORY_NAME,']',T3.ORG_CNAME) AS "orgCname",
         T3.FACTORY_CODE AS "factoryCode", T5.FACTORY_NAME AS "factoryName"
         FROM (
             SELECT

src/main/webapp/HP/PZ/HPPZ013.jsp

@@ -39,7 +39,8 @@
 	<EF:EFRegion id="result" title="记录集">
 		<EF:EFGrid blockId="result" autoDraw="override" checkMode="row">
 			<EF:EFColumn ename="id" cname="主键" hidden="true"/>
-			<EF:EFComboColumn ename="factoryCode" cname="厂区" width="110" align="center" defaultValue="" required="true"
+			<EF:EFColumn ename="userId" cname="工号" enable="false" width="120" align="center"/>
+			<EF:EFComboColumn ename="factoryCode" cname="工厂" width="110" align="center" defaultValue="" required="true"
 			                  filter="contains" readonly="true">
 				<EF:EFOptions blockId="factory_record_block_id" valueField="valueField" textField="textField"/>
 			</EF:EFComboColumn>
@@ -48,7 +49,6 @@
 				<EF:EFCodeOption codeName="xs.og.orgType" condition="ITEM_CODE IN ('prodGroup', 'cutGroup')"/>
 			</EF:EFComboColumn>
 			<EF:EFColumn ename="groupCode" cname="生产部门" width="120" align="center" required="true" readonly="true"/>
-			<EF:EFColumn ename="userId" cname="工号" enable="false" width="120" align="center"/>
 			<EF:EFColumn ename="userName" cname="姓名" width="120" align="center" required="true" readonly="true"/>
 			<EF:EFComboColumn ename="gender" cname="性别" width="80" align="center" required="true" readonly="true"
 			                  valueField="valueField" textField="textField">