Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/baosight/hggp/common/DdynamicEnum.java

@@ -92,7 +92,7 @@ public enum DdynamicEnum {
      * 用途：存货档案下拉框 (不默认状态)
      * 编写：
      */
-    INVENT_RECORD_BOX_BLOCK_ID("invent_record_box_block_id","inventCode","inventName","inventTypeDetail","id","inventType","spec","material","unit", "length", "width", "thick","COEFFICIENT","HGPZ005.queryInventCodeBox"),
+    INVENT_RECORD_BOX_BLOCK_ID("invent_record_box_block_id","inventCode","inventName","inventTypeDetail","id","inventType","spec","material","unit", "length", "width", "thick","coefficient","HGPZ005.queryInventCodeBox"),
 
     /**
      * 模块：存货档案

src/main/java/com/baosight/hggp/hg/cw/domain/HGCW051.java

@@ -35,7 +35,7 @@ public class HGCW051 extends DaoEPBase {
 	public static final String FIELD_YEAR = "year";    		/* 年份*/
 	public static final String FIELD_MONTH = "month";    		/* 月份*/
 	public static final String FIELD_AMOUNT = "amount";    		/* 费用金额*/
-	public static final String FIELD_ACCOUNT = "account";    		/* 企业编码*/
+	public static final String FIELD_ACCOUNT_CODE = "accountCode";    		/* 企业编码*/
 	public static final String FIELD_DEP_CODE = "depCode";    		/* 部门编码*/
 
 	public static final String COL_ID = "ID";    		
@@ -51,7 +51,7 @@ public class HGCW051 extends DaoEPBase {
 	public static final String COL_YEAR = "YEAR";    		/* 年份*/
 	public static final String COL_MONTH = "MONTH";    		/* 月份*/
 	public static final String COL_AMOUNT = "AMOUNT";    		/* 费用金额*/
-	public static final String COL_ACCOUNT = "ACCOUNT";    		/* 企业编码*/
+	public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE";    		/* 企业编码*/
 	public static final String COL_DEP_CODE = "DEP_CODE";    		/* 部门编码*/
 
 	public static final String QUERY = "HGCW051.query";
@@ -73,7 +73,7 @@ public class HGCW051 extends DaoEPBase {
 	private String year = " ";		/* 年份*/
 	private String month = " ";		/* 月份*/
 	private BigDecimal amount = new BigDecimal("0");		/* 费用金额*/
-	private String account = " ";		/* 企业编码*/
+	private String accountCode = " ";		/* 企业编码*/
 	private String depCode = " ";		/* 部门编码*/
 
 	/**
@@ -138,7 +138,7 @@ public class HGCW051 extends DaoEPBase {
 		eiColumn.setDescName("费用金额");
 		eiMetadata.addMeta(eiColumn);
 
-		eiColumn = new EiColumn(FIELD_ACCOUNT);
+		eiColumn = new EiColumn(FIELD_ACCOUNT_CODE);
 		eiColumn.setDescName("企业编码");
 		eiMetadata.addMeta(eiColumn);
 
@@ -368,17 +368,17 @@ public class HGCW051 extends DaoEPBase {
 	 * get the account - 企业编码.
 	 * @return the account
 	 */
-	public String getAccount() {
-		return this.account;
+	public String getAccountCode() {
+		return this.accountCode;
 	}
 
 	/**
-	 * set the account - 企业编码.
+	 * set the accountCode - 企业编码.
 	 *
-	 * @param account - 企业编码
+	 * @param accountCode - 企业编码
 	 */
-	public void setAccount(String account) {
-		this.account = account;
+	public void setAccountCode(String accountCode) {
+		this.accountCode = accountCode;
 	}
 	/**
 	 * get the depCode - 部门编码.
@@ -417,7 +417,7 @@ public class HGCW051 extends DaoEPBase {
 		setYear(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_YEAR)), year));
 		setMonth(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_MONTH)), month));
 		setAmount(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_AMOUNT)), amount));
-		setAccount(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_ACCOUNT)), account));
+		setAccountCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_ACCOUNT_CODE)), accountCode));
 		setDepCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEP_CODE)), depCode));
 	}
 
@@ -441,7 +441,7 @@ public class HGCW051 extends DaoEPBase {
 		map.put(FIELD_YEAR, StringUtils.toString(year, eiMetadata.getMeta(FIELD_YEAR)));
 		map.put(FIELD_MONTH, StringUtils.toString(month, eiMetadata.getMeta(FIELD_MONTH)));
 		map.put(FIELD_AMOUNT, StringUtils.toString(amount, eiMetadata.getMeta(FIELD_AMOUNT)));
-		map.put(FIELD_ACCOUNT, StringUtils.toString(account, eiMetadata.getMeta(FIELD_ACCOUNT)));
+		map.put(FIELD_ACCOUNT_CODE, StringUtils.toString(accountCode, eiMetadata.getMeta(FIELD_ACCOUNT_CODE)));
 		map.put(FIELD_DEP_CODE, StringUtils.toString(depCode, eiMetadata.getMeta(FIELD_DEP_CODE)));
 
 		return map;

src/main/java/com/baosight/hggp/hg/cw/domain/HGCW052.java

@@ -41,7 +41,7 @@ public class HGCW052 extends DaoEPBase {
 	public static final String FIELD_ITEM_NAME = "itemName";    		/* 项目名称*/
 	public static final String FIELD_ITEM_CODE = "itemCode";    		/* 项目编号*/
 	public static final String FIELD_IS_SHARE = "isShare";    		/* 是否分摊费用*/
-	public static final String FIELD_ACCOUNT = "account";    		/* 企业编码*/
+	public static final String FIELD_ACCOUNT_CODE = "accountCode";    		/* 企业编码*/
 	public static final String FIELD_DEP_CODE = "depCode";    		/* 部门编码*/
 
 	public static final String COL_ID = "ID";    		
@@ -63,7 +63,7 @@ public class HGCW052 extends DaoEPBase {
 	public static final String COL_ITEM_NAME = "ITEM_NAME";    		/* 项目名称*/
 	public static final String COL_ITEM_CODE = "ITEM_CODE";    		/* 项目编号*/
 	public static final String COL_IS_SHARE = "IS_SHARE";    		/* 是否分摊费用*/
-	public static final String COL_ACCOUNT = "ACCOUNT";    		/* 企业编码*/
+	public static final String COL_ACCOUNT_CODE = "ACCOUNT_CODE";    		/* 企业编码*/
 	public static final String COL_DEP_CODE = "DEP_CODE";    		/* 部门编码*/
 
 	public static final String QUERY = "HGCW052.query";
@@ -91,7 +91,7 @@ public class HGCW052 extends DaoEPBase {
 	private String itemName = " ";		/* 项目名称*/
 	private String itemCode = " ";		/* 项目编号*/
 	private String isShare = " ";		/* 是否分摊费用*/
-	private String account = " ";		/* 企业编码*/
+	private String accountCode = " ";		/* 企业编码*/
 	private String depCode = " ";		/* 部门编码*/
 
 	/**
@@ -180,7 +180,7 @@ public class HGCW052 extends DaoEPBase {
 		eiColumn.setDescName("是否分摊费用");
 		eiMetadata.addMeta(eiColumn);
 
-		eiColumn = new EiColumn(FIELD_ACCOUNT);
+		eiColumn = new EiColumn(FIELD_ACCOUNT_CODE);
 		eiColumn.setDescName("企业编码");
 		eiMetadata.addMeta(eiColumn);
 
@@ -506,8 +506,8 @@ public class HGCW052 extends DaoEPBase {
 	 * get the account - 企业编码.
 	 * @return the account
 	 */
-	public String getAccount() {
-		return this.account;
+	public String getAccountCode() {
+		return this.accountCode;
 	}
 
 	/**
@@ -515,8 +515,8 @@ public class HGCW052 extends DaoEPBase {
 	 *
 	 * @param account - 企业编码
 	 */
-	public void setAccount(String account) {
-		this.account = account;
+	public void setAccountCode(String account) {
+		this.accountCode = account;
 	}
 	/**
 	 * get the depCode - 部门编码.
@@ -561,7 +561,7 @@ public class HGCW052 extends DaoEPBase {
 		setItemName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_ITEM_NAME)), itemName));
 		setItemCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_ITEM_CODE)), itemCode));
 		setIsShare(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_IS_SHARE)), isShare));
-		setAccount(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_ACCOUNT)), account));
+		setAccountCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_ACCOUNT_CODE)), accountCode));
 		setDepCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEP_CODE)), depCode));
 	}
 
@@ -591,7 +591,7 @@ public class HGCW052 extends DaoEPBase {
 		map.put(FIELD_ITEM_NAME, StringUtils.toString(itemName, eiMetadata.getMeta(FIELD_ITEM_NAME)));
 		map.put(FIELD_ITEM_CODE, StringUtils.toString(itemCode, eiMetadata.getMeta(FIELD_ITEM_CODE)));
 		map.put(FIELD_IS_SHARE, StringUtils.toString(isShare, eiMetadata.getMeta(FIELD_IS_SHARE)));
-		map.put(FIELD_ACCOUNT, StringUtils.toString(account, eiMetadata.getMeta(FIELD_ACCOUNT)));
+		map.put(FIELD_ACCOUNT_CODE, StringUtils.toString(accountCode, eiMetadata.getMeta(FIELD_ACCOUNT_CODE)));
 		map.put(FIELD_DEP_CODE, StringUtils.toString(depCode, eiMetadata.getMeta(FIELD_DEP_CODE)));
 
 		return map;

src/main/java/com/baosight/hggp/hg/cw/sql/HGCW051.xml

@@ -62,8 +62,8 @@
 		<isNotEmpty prepend=" AND " property="amount">
 			AMOUNT = #amount#
 		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="account">
-			ACCOUNT = #account#
+		<isNotEmpty prepend=" AND " property="accountCode">
+			ACCOUNT_CODE = #accountCode#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="depCode">
 			DEP_CODE = #depCode#
@@ -159,10 +159,10 @@
 										YEAR,  <!-- 年份 -->
 										MONTH,  <!-- 月份 -->
 										AMOUNT,  <!-- 费用金额 -->
-										ACCOUNT,  <!-- 企业编码 -->
+										ACCOUNT_CODE,  <!-- 企业编码 -->
 										DEP_CODE  <!-- 部门编码 -->
 										)
-	    VALUES (#id#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #companyCode#, #companyName#, #year#, #month#, #amount#, #account#, #depCode#)
+	    VALUES (#id#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #companyCode#, #companyName#, #year#, #month#, #amount#, #accountCode#, #depCode#)
 	</insert>
 
 	<delete id="delete">
@@ -185,7 +185,7 @@
 					YEAR	= #year#,   <!-- 年份 -->
 					MONTH	= #month#,   <!-- 月份 -->
 					AMOUNT	= #amount#,   <!-- 费用金额 -->
-					ACCOUNT	= #account#,   <!-- 企业编码 -->
+					ACCOUNT_CODE	= #accountCode#,   <!-- 企业编码 -->
 					DEP_CODE	= #depCode#  <!-- 部门编码 -->
 			WHERE
 			ID = #id#

src/main/java/com/baosight/hggp/hg/cw/sql/HGCW052.xml

@@ -86,8 +86,8 @@
 		<isNotEmpty prepend=" AND " property="isShare">
 			IS_SHARE = #isShare#
 		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="account">
-			ACCOUNT = #account#
+		<isNotEmpty prepend=" AND " property="accountCode">
+			ACCOUNT_CODE = #accountCode#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="depCode">
 			DEP_CODE = #depCode#
@@ -116,7 +116,7 @@
 				ITEM_NAME	as "itemName",  <!-- 项目名称 -->
 				ITEM_CODE	as "itemCode",  <!-- 项目编号 -->
 				IS_SHARE	as "isShare",  <!-- 是否分摊费用 -->
-				ACCOUNT	as "account",  <!-- 企业编码 -->
+				ACCOUNT_CODE	as "accountCode",  <!-- 企业编码 -->
 				DEP_CODE	as "depCode" <!-- 部门编码 -->
 		FROM ${hggpSchema}.HGCW052 WHERE 1=1
         <include refid="condition" />
@@ -239,10 +239,10 @@
 										ITEM_NAME,  <!-- 项目名称 -->
 										ITEM_CODE,  <!-- 项目编号 -->
 										IS_SHARE,  <!-- 是否分摊费用 -->
-										ACCOUNT,  <!-- 企业编码 -->
+										ACCOUNT_CODE,  <!-- 企业编码 -->
 										DEP_CODE  <!-- 部门编码 -->
 										)
-	    VALUES (#id#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #companyCode#, #companyName#, #year#, #month#, #amount#, #hgcw051Id#, #costType#, #costItem#, #itemName#, #itemCode#, #isShare#, #account#, #depCode#)
+	    VALUES (#id#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #deleteFlag#, #companyCode#, #companyName#, #year#, #month#, #amount#, #hgcw051Id#, #costType#, #costItem#, #itemName#, #itemCode#, #isShare#, #accountCode#, #depCode#)
 	</insert>
 
 	<delete id="delete">
@@ -271,7 +271,7 @@
 					ITEM_NAME	= #itemName#,   <!-- 项目名称 -->
 					ITEM_CODE	= #itemCode#,   <!-- 项目编号 -->
 					IS_SHARE	= #isShare#,   <!-- 是否分摊费用 -->
-					ACCOUNT	= #account#,   <!-- 企业编码 -->
+					ACCOUNT_CODE	= #accountCode#,   <!-- 企业编码 -->
 					DEP_CODE	= #depCode#  <!-- 部门编码 -->
 			WHERE
 			ID = #id#

src/main/java/com/baosight/hggp/hg/sc/sql/HGSC009.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sqlMap  PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN" "http://ibatis.apache.org/dtd/sql-map-2.dtd">	<!--      table information
-		Generate time : 2024-05-28 11:47:21
-   		Version :  1.0
-		schema : hggp
-		tableName : HGSC009
-		 ID  BIGINT   NOT NULL   primarykey,
-		 ACCOUNT_CODE  VARCHAR,
-		 DEP_CODE  VARCHAR,
-		 COMPANY_CODE  VARCHAR,
-		 COMPANY_NAME  VARCHAR,
-		 PROJ_CODE  VARCHAR,
-		 PROJ_NAME  VARCHAR,
-		 PLAN_MATERIAL_CODE  VARCHAR,
-		 PLAN_MATERIAL_NAME  VARCHAR,
-		 STATUS  TINYINT,
-		 CREATED_BY  VARCHAR,
-		 CREATED_NAME  VARCHAR,
-		 CREATED_TIME  VARCHAR,
-		 UPDATED_BY  VARCHAR,
-		 UPDATED_NAME  VARCHAR,
-		 UPDATED_TIME  VARCHAR
-	-->
+<!DOCTYPE sqlMap  PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN" "http://ibatis.apache.org/dtd/sql-map-2.dtd">
 <sqlMap namespace="HGSC009">
 
 	<sql id="condition">
+		<include refid="HGXSDataAuth.authCondition"/>
 		<isNotEmpty prepend=" AND " property="id">
 			ID = #id#
 		</isNotEmpty>

src/main/java/com/baosight/hggp/hg/sc/tools/HGSCTools.java

@@ -1074,9 +1074,9 @@ public class HGSCTools {
 
 
         private static void checkAddDate(HGSC008 hgsc008){
-            List<String> orgIdList = UserSessionUtils.getOrgId();
-            AssertUtils.isEmpty(hgsc008.getGroupCode(),"生产任务班组信息异常，请联系管理员！");
-            AssertUtils.isTrue(!orgIdList.contains(hgsc008.getGroupCode()),"非当前任务生产组用户，无法报工此任务！");
+//            List<String> orgIdList = UserSessionUtils.getOrgId();
+//            AssertUtils.isEmpty(hgsc008.getGroupCode(),"生产任务班组信息异常，请联系管理员！");
+//            AssertUtils.isTrue(!orgIdList.contains(hgsc008.getGroupCode()),"非当前任务生产组用户，无法报工此任务！");
             AssertUtils.isNull(hgsc008.getQuantity(),"报工数量不能为空！");
         }
 

src/main/java/com/baosight/hggp/hg/xs/tools/HGXSTools.java

@@ -312,7 +312,7 @@ public class HGXSTools {
 			queryMap.put("orgId", orgId);
 			queryMap.put("orgType", OrgTypeEnum.COMPANY.getCode());
 			List<Org> results = DaoBase.getInstance().query(HGSqlConstant.HgXsOrg.QUERY_PARENT, queryMap);
-			return CollectionUtils.isEmpty(results) ? null : results.get(results.size() - 1);
+			return CollectionUtils.isEmpty(results) ? null : results.get(0);
 		}
 
 		/**

src/main/java/com/baosight/xservices/xs/og/service/ServiceXSOG0801A.java

@@ -54,8 +54,8 @@ public class ServiceXSOG0801A extends ServiceEPBase {
 				// 查询组织
 				Org org = HGXSTools.XsOrg.get(parentOrgId);
 				if(CommonConstant.Field.ROOT.equals(org.getParentOrgId())) {
-					condition = String.format(" ITEM_CODE IN ('%s', '%s')", OrgTypeEnum.COMPANY.getCode(),
-							OrgTypeEnum.DEPT.getCode());
+					condition = String.format(" ITEM_CODE IN ('%s', '%s', '%s')", OrgTypeEnum.COMPANY.getCode(),
+							OrgTypeEnum.FACTORY.getCode(), OrgTypeEnum.DEPT.getCode());
 				}else if (OrgTypeEnum.COMPANY.getCode().equals(org.getOrgType())) {
 					condition = String.format(" ITEM_CODE IN ('%s', '%s', '%s')", OrgTypeEnum.COMPANY.getCode(),
 							OrgTypeEnum.FACTORY.getCode(), OrgTypeEnum.DEPT.getCode());

src/main/resources/resources/ibatis/sqlmap-config.xml

@@ -57,7 +57,7 @@
     <sqlMap resource="com/baosight/hggp/hg/sc/sql/HGSC006A.xml"/>
     <sqlMap resource="com/baosight/hggp/hg/sc/sql/HGSC007.xml"/>
     <sqlMap resource="com/baosight/hggp/hg/sc/sql/HGSC008.xml"/>
-
+    <sqlMap resource="com/baosight/hggp/hg/sc/sql/HGSC009.xml"/>
 
     <!-- 財務 -->
     <sqlMap resource="com/baosight/hggp/hg/cw/sql/HGCW001.xml"/>

src/main/webapp/HG/CW/HGCW010.js

@@ -239,6 +239,10 @@ function billFunc() {
                 message("勾选的数据中有已经开票的票据！");
                 flag = false;
             }
+        if (row.billNumber == " ") {
+            message("勾选的数据中发票号为空");
+            flag = false;
+        }
         }
     )
 

src/main/webapp/HG/CW/HGCW010.jsp

@@ -22,7 +22,11 @@
             <EF:EFInput cname="发票号" ename="billNumber" blockId="inqu_status" row="0" colWidth="3" />
             <EF:EFSelect cname="开票状态" ename="inqu_status-0-billState" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
-                <EF:EFCodeOption codeName="hggp.cw.reviewStatus"/>
+                <EF:EFCodeOption codeName="hggp.cw.billState"/>
+            </EF:EFSelect>
+            <EF:EFSelect cname="审批状态" ename="inqu_status-0-reviewStatus" colWidth="3" filter="contains">
+                <EF:EFOption label="全部" value=""/>
+                <EF:EFCodeOption codeName="hggp.cw.reviewStatus" condition = "ITEM_CODE IN ('0','1')"/>
             </EF:EFSelect>
         </div>
     </EF:EFRegion>
@@ -39,7 +43,7 @@
                 <EF:EFCodeOption codeName="hggp.cw.billTybe"/>
             </EF:EFComboColumn>
             <EF:EFColumn ename="signingDate" cname="开票日期" width="120" enable="false" readonly="true" align="center"/>
-            <EF:EFColumn ename="billNumber" cname="发票号" width="120" enable="false" readonly="true" align="center"/>
+            <EF:EFColumn ename="billNumber" cname="发票号" width="120" format="{0:N3}" align="center"/>
             <EF:EFComboColumn ename="taxPoints" cname="税点" width="120" align="center" required="true"
                               columnTemplate="#=textField#" itemTemplate="#=textField#" enable="true" >
                 <EF:EFCodeOption codeName="hggp.cw.taxPoints"/>

src/main/webapp/HG/CW/HGCW010A.jsp

@@ -31,7 +31,6 @@
             <EF:EFColumn ename="projName" cname="项目名称" width="120" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="settlementNumber" cname="结算编号" width="120" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="contractDate" cname="结算日期" width="120" enable="false" readonly="true" align="center"/>
-            <EF:EFColumn ename="billNumber" cname="发票号" width="120" enable="true"  align="center" required="true"/>
             <EF:EFColumn ename="taxPoints" cname="税率(%)" width="120" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="thisPriceTax" cname="结算价税合计金额" hidden="true"/>
             <EF:EFColumn ename="thisSettlementTax" cname="结算税金" width="120" enable="false" readonly="true" align="center"/>

src/main/webapp/HG/CW/HGCW010B.jsp

@@ -14,7 +14,7 @@
             <EF:EFColumn ename="projName" cname="项目名称" width="120" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="partyA" cname="客户名称" width="120" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="settlementNumber" cname="来源单号" width="120" enable="false" readonly="true" align="center"/>
-            <EF:EFColumn ename="totalContractPriceIncluding" cname="开款总额" width="120" format="{0:N3}" align="center"/>
+            <EF:EFColumn ename="totalContractPriceIncluding" cname="开票金额" width="120" format="{0:N3}" align="center"/>
         </EF:EFGrid>
     </EF:EFRegion>
 </EF:EFPage>

src/main/webapp/HG/SC/HGSC004A.js

@@ -644,7 +644,7 @@ function showDetail(id) {
 }
 
 function updateProductStatus(id,status) {
-    JSUtils.confirm("确定是否\"删除\"操作? ", {
+    JSUtils.confirm("确定是否\"提交\"操作? ", {
         ok: function () {
             let inEiInfo = new EiInfo();
             inEiInfo.set("result-0-id", id);

src/main/webapp/HG/SC/HGSC009.jsp

@@ -28,7 +28,7 @@
         <EF:EFGrid blockId="result" autoDraw="override" isFloat="true">
             <EF:EFColumn ename="id" primaryKey="true" cname="内码" hidden="true"/>
             <EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="150" align="center"/>
-            <EF:EFComboColumn ename="companyCode" cname="公司名称"
+            <EF:EFComboColumn ename="companyCode" cname="公司编码"
                               columnTemplate="#=companyName#" itemTemplate="#=companyName#"
                               textField="companyName" valueField="companyCode"
                               maxLength="16" readonly="false" width="100" required="true"