1.供应商和客户页面BUG修复

src/main/java/com/baosight/hpjx/common/CompanyTypeEnum.java

@@ -15,6 +15,27 @@ public enum CompanyTypeEnum {
 
     private String value;
 
+	CompanyTypeEnum(Integer code, String value) {
+		this.code = code;
+		this.value = value;
+	}
+	
+	public static EiBlock generatorEiBlock() {
+		EiBlock block = new EiBlock("company_type_block_id");
+		List<Map<String, Object>> rows = new ArrayList<Map<String, Object>>() {{
+			add(new HashMap<String, Object>() {{
+				put(HPConstants.TEXT_FIELD, GQ.code + "-" + GQ.value);
+				put(HPConstants.VALUE_FIELD, GQ.code);
+			}});
+			add(new HashMap<String, Object>() {{
+				put(HPConstants.TEXT_FIELD, MY.code + "-" + MY.value);
+				put(HPConstants.VALUE_FIELD, MY.code);
+			}});
+		}};
+		block.setRows(rows);
+		return block;
+	}
+	
     public Integer getCode() {
 	    return code;
     }
@@ -30,25 +51,4 @@ public enum CompanyTypeEnum {
 	public void setValue(String value) {
 		this.value = value;
 	}
-
-    CompanyTypeEnum(Integer code, String value) {
-        this.code = code;
-        this.value = value;
-    }
-
-    public static EiBlock generatorEiBlock(){
-        EiBlock block = new EiBlock("company_type_block_id");
-        List<Map<String,Object>> rows = new ArrayList<Map<String,Object>>(){{
-           add(new HashMap<String,Object>(){{
-               put(HPConstants.TEXT_FIELD,GQ.value);
-               put(HPConstants.VALUE_FIELD,GQ.code);
-           }});
-           add(new HashMap<String,Object>(){{
-               put(HPConstants.TEXT_FIELD,MY.value);
-               put(HPConstants.VALUE_FIELD,MY.code);
-           }});
-        }};
-        block.setRows(rows);
-        return block;
-    }
 }

src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ002.java

@@ -56,7 +56,7 @@ public class ServiceHPPZ002 extends ServiceBase {
 	@Override
 	public EiInfo query(EiInfo inInfo) {
 		try {
-			inInfo = super.query(inInfo, "HPPZ002.query", new HPPZ002());
+			inInfo = super.query(inInfo, HPPZ002.QUERY, new HPPZ002());
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "查询失败");
 		}

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

@@ -10,7 +10,7 @@
 		<div class="row">
 			<EF:EFSelect ename="inqu_status-0-custType" cname="供应商类型" colWidth="3">
 				<EF:EFOption label="全部" value=""/>
-				<EF:EFOptions blockId="company_type_block_id" textField="valueField" valueField="textField"/>
+				<EF:EFOptions blockId="company_type_block_id" textField="textField" valueField="valueField"/>
 			</EF:EFSelect>
 			<EF:EFInput ename="inqu_status-0-custName" cname="供应商名称" colWidth="3" readonly="false"/>
 			<EF:EFSelect ename="inqu_status-0-status" cname="状态" colWidth="3">
@@ -25,11 +25,10 @@
 			<EF:EFColumn ename="id" cname="内码" hidden="true"/>
 			<EF:EFColumn ename="custCode" cname="供应商编码" enable="false" width="100" align="center"/>
 			<EF:EFColumn ename="custName" cname="供应商名称" width="100" required="true"/>
-			<EF:EFComboColumn ename="custType" cname="供应商类型" align="center"
-			                  blockName="company_type_block_id"
-			                  columnTemplate="#=textField#-#=valueField#" optionLabel=" "
-			                  itemTemplate="#=textField#-#=valueField#" textField="valueField"
-			                  valueField="textField" width="100" required="true">
+			<EF:EFComboColumn ename="custType" cname="供应商类型" width="100" align="center"
+			                  blockName="company_type_block_id" textField="textField" valueField="valueField"
+			                  columnTemplate="#=textField#" itemTemplate="#=textField#"
+			                  optionLabel=" " required="true">
 			</EF:EFComboColumn>
 			<EF:EFColumn ename="address" cname="地址" width="120" required="true"/>
 			<EF:EFComboColumn ename="status" cname="状态" align="center" width="100" required="true">

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

@@ -11,7 +11,7 @@
 			<EF:EFInput cname="客户名称" ename="custName" blockId="inqu_status" row="0" colWidth="3"/>
 			<EF:EFSelect ename="inqu_status-0-custType" cname="客户类型" colWidth="3">
 				<EF:EFOption label="全部" value=""/>
-				<EF:EFOptions blockId="company_type_block_id" textField="valueField" valueField="textField"/>
+				<EF:EFOptions blockId="company_type_block_id" textField="textField" valueField="valueField"/>
 			</EF:EFSelect>
 			<EF:EFSelect ename="inqu_status-0-status" cname="状态" colWidth="3">
 				<EF:EFOption label="全部" value=""/>