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

src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW010.java

@@ -4,6 +4,7 @@ import com.baosight.eplat.utils.StringUtils;
 import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
 import com.baosight.hggp.common.DdynamicEnum;
 import com.baosight.hggp.core.dao.DaoUtils;
+import com.baosight.hggp.core.security.UserSessionUtils;
 import com.baosight.hggp.hg.constant.HGConstant;
 import com.baosight.hggp.hg.cw.domain.*;
 import com.baosight.hggp.hg.cw.domain.HGCW010;
@@ -11,10 +12,8 @@ import com.baosight.hggp.hg.cw.tools.HGCWTools;
 import com.baosight.hggp.hg.cw.vo.UserVO;
 import com.baosight.hggp.hg.sc.domain.HGSC001;
 import com.baosight.hggp.hg.sc.tools.HGSCTools;
-import com.baosight.hggp.util.AssertUtils;
-import com.baosight.hggp.util.CommonMethod;
-import com.baosight.hggp.util.DateUtils;
-import com.baosight.hggp.util.LogUtils;
+import com.baosight.hggp.hg.xs.domain.Company;
+import com.baosight.hggp.util.*;
 import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;
 import com.baosight.iplat4j.core.exception.PlatException;
@@ -48,8 +47,9 @@ public class ServiceHGCW010 extends ServiceBase {
         try {
             CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SUP_RECORD_BLOCK_ID,
                     DdynamicEnum.PROJ_RECORD_BLOCK_ID), null, false);
+            EiInfoUtils.addBlock(inInfo,"roleCompany", UserSessionUtils.getRoleCompany(), Company.class);
             inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGCW010().eiMetadata);
-        } catch (PlatException e) {
+        } catch (Exception e) {
             LogUtils.setDetailMsg(inInfo, e, "初始化失败");
         }
         return inInfo;

src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW010A.java

@@ -3,11 +3,14 @@ package com.baosight.hggp.hg.cw.service;
 import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
 import com.baosight.hggp.common.DdynamicEnum;
 import com.baosight.hggp.core.dao.DaoUtils;
+import com.baosight.hggp.core.security.UserSessionUtils;
 import com.baosight.hggp.hg.cw.domain.HGCW010;
 import com.baosight.hggp.hg.cw.domain.HGCW010A;
 import com.baosight.hggp.hg.cw.tools.HGCWTools;
 import com.baosight.hggp.hg.cw.vo.UserVO;
+import com.baosight.hggp.hg.xs.domain.Company;
 import com.baosight.hggp.util.CommonMethod;
+import com.baosight.hggp.util.EiInfoUtils;
 import com.baosight.hggp.util.ErrorCodeUtils;
 import com.baosight.hggp.util.LogUtils;
 import com.baosight.iplat4j.core.ei.EiBlock;
@@ -37,8 +40,9 @@ public class ServiceHGCW010A extends ServiceBase {
 	@OperationLogAnnotation(operModul = "账期维护",operType = "查询",operDesc = "初始化")
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {
+			EiInfoUtils.addBlock(inInfo,"roleCompany", UserSessionUtils.getRoleCompany(), Company.class);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGCW010A().eiMetadata);
-		} catch (PlatException e) {
+		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
 		}
 		return inInfo;

src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW012.java

@@ -4,10 +4,12 @@ import com.baosight.eplat.utils.StringUtils;
 import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
 import com.baosight.hggp.common.DdynamicEnum;
 import com.baosight.hggp.core.dao.DaoUtils;
+import com.baosight.hggp.core.security.UserSessionUtils;
 import com.baosight.hggp.hg.cw.domain.HGCW012;
 import com.baosight.hggp.hg.cw.domain.HGCW013;
 import com.baosight.hggp.hg.cw.tools.HGCWTools;
 import com.baosight.hggp.hg.cw.vo.UserVO;
+import com.baosight.hggp.hg.xs.domain.Company;
 import com.baosight.hggp.util.CommonMethod;
 import com.baosight.hggp.util.DateUtils;
 import com.baosight.hggp.util.EiInfoUtils;
@@ -45,8 +47,9 @@ public class ServiceHGCW012 extends ServiceBase {
         try {
             CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SUP_RECORD_BLOCK_ID,
                     DdynamicEnum.PROJ_RECORD_BLOCK_ID), null, false);
+            EiInfoUtils.addBlock(inInfo,"roleCompany", UserSessionUtils.getRoleCompany(), Company.class);
             inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGCW012().eiMetadata);
-        } catch (PlatException e) {
+        } catch (Exception e) {
             LogUtils.setDetailMsg(inInfo, e, "初始化失败");
         }
         return inInfo;

src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW012A.java

@@ -2,9 +2,12 @@ package com.baosight.hggp.hg.cw.service;
 
 import com.baosight.bpm.util.StringUtil;
 import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
+import com.baosight.hggp.core.security.UserSessionUtils;
 import com.baosight.hggp.hg.cg.domain.HGCG003;
 import com.baosight.hggp.hg.cw.domain.*;
+import com.baosight.hggp.hg.xs.domain.Company;
 import com.baosight.hggp.util.DateUtils;
+import com.baosight.hggp.util.EiInfoUtils;
 import com.baosight.hggp.util.LogUtils;
 import com.baosight.hggp.util.StringUtils;
 import com.baosight.hggp.util.contants.ACConstants;
@@ -29,8 +32,9 @@ public class ServiceHGCW012A extends ServiceBase {
 	@OperationLogAnnotation(operModul = "采购开票",operType = "查询",operDesc = "初始化")
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {
+			EiInfoUtils.addBlock(inInfo,"roleCompany", UserSessionUtils.getRoleCompany(), Company.class);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGCW012A().eiMetadata);
-		} catch (PlatException e) {
+		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
 		}
 		return inInfo;

src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW014.java

@@ -4,6 +4,7 @@ import com.baosight.eplat.utils.StringUtils;
 import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
 import com.baosight.hggp.common.DdynamicEnum;
 import com.baosight.hggp.core.dao.DaoUtils;
+import com.baosight.hggp.core.security.UserSessionUtils;
 import com.baosight.hggp.hg.constant.HGConstant;
 import com.baosight.hggp.hg.cw.domain.HGCW005;
 import com.baosight.hggp.hg.cw.domain.HGCW006;
@@ -13,8 +14,10 @@ import com.baosight.hggp.hg.cw.tools.HGCWTools;
 import com.baosight.hggp.hg.cw.vo.UserVO;
 import com.baosight.hggp.hg.sc.domain.HGSC001;
 import com.baosight.hggp.hg.sc.tools.HGSCTools;
+import com.baosight.hggp.hg.xs.domain.Company;
 import com.baosight.hggp.util.CommonMethod;
 import com.baosight.hggp.util.DateUtils;
+import com.baosight.hggp.util.EiInfoUtils;
 import com.baosight.hggp.util.LogUtils;
 import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;
@@ -49,8 +52,9 @@ public class ServiceHGCW014 extends ServiceBase {
         try {
             CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.CUSTOMER_RECORD_BLOCK_ID,
                     DdynamicEnum.PROJ_RECORD_BLOCK_ID), null, false);
+            EiInfoUtils.addBlock(inInfo,"roleCompany", UserSessionUtils.getRoleCompany(), Company.class);
             inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGCW014().eiMetadata);
-        } catch (PlatException e) {
+        } catch (Exception e) {
             LogUtils.setDetailMsg(inInfo, e, "初始化失败");
         }
         return inInfo;

src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW014A.java

@@ -3,10 +3,13 @@ package com.baosight.hggp.hg.cw.service;
 import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
 import com.baosight.hggp.common.DdynamicEnum;
 import com.baosight.hggp.core.dao.DaoUtils;
+import com.baosight.hggp.core.security.UserSessionUtils;
 import com.baosight.hggp.hg.cw.domain.HGCW010;
 import com.baosight.hggp.hg.cw.tools.HGCWTools;
 import com.baosight.hggp.hg.cw.vo.UserVO;
+import com.baosight.hggp.hg.xs.domain.Company;
 import com.baosight.hggp.util.CommonMethod;
+import com.baosight.hggp.util.EiInfoUtils;
 import com.baosight.hggp.util.ErrorCodeUtils;
 import com.baosight.hggp.util.LogUtils;
 import com.baosight.iplat4j.core.ei.EiBlock;
@@ -36,8 +39,9 @@ public class ServiceHGCW014A extends ServiceBase {
     @OperationLogAnnotation(operModul = "账期维护",operType = "查询",operDesc = "初始化")
     public EiInfo initLoad(EiInfo inInfo) {
         try {
+            EiInfoUtils.addBlock(inInfo,"roleCompany", UserSessionUtils.getRoleCompany(), Company.class);
             inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGCW010().eiMetadata);
-        } catch (PlatException e) {
+        } catch (Exception e) {
             LogUtils.setDetailMsg(inInfo, e, "初始化失败");
         }
         return inInfo;

src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW016.java

@@ -4,14 +4,17 @@ import com.baosight.eplat.utils.StringUtils;
 import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
 import com.baosight.hggp.common.DdynamicEnum;
 import com.baosight.hggp.core.dao.DaoUtils;
+import com.baosight.hggp.core.security.UserSessionUtils;
 import com.baosight.hggp.hg.constant.HGConstant;
 import com.baosight.hggp.hg.cw.domain.HGCW016;
 import com.baosight.hggp.hg.cw.domain.HGCW015;
 import com.baosight.hggp.hg.cw.domain.HGCW017;
 import com.baosight.hggp.hg.cw.tools.HGCWTools;
 import com.baosight.hggp.hg.cw.vo.UserVO;
+import com.baosight.hggp.hg.xs.domain.Company;
 import com.baosight.hggp.util.CommonMethod;
 import com.baosight.hggp.util.DateUtils;
+import com.baosight.hggp.util.EiInfoUtils;
 import com.baosight.hggp.util.LogUtils;
 import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;
@@ -45,8 +48,9 @@ public class ServiceHGCW016 extends ServiceBase {
     public EiInfo initLoad(EiInfo inInfo) {
         try {
             CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SUP_RECORD_BLOCK_ID), null, false);
+            EiInfoUtils.addBlock(inInfo,"roleCompany", UserSessionUtils.getRoleCompany(), Company.class);
             inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGCW016().eiMetadata);
-        } catch (PlatException e) {
+        } catch (Exception e) {
             LogUtils.setDetailMsg(inInfo, e, "初始化失败");
         }
         return inInfo;

src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW016A.java

 package com.baosight.hggp.hg.cw.service;
 
 import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
+import com.baosight.hggp.core.security.UserSessionUtils;
 import com.baosight.hggp.hg.cw.domain.HGCW012;
 import com.baosight.hggp.hg.cw.domain.HGCW012;
+import com.baosight.hggp.hg.xs.domain.Company;
+import com.baosight.hggp.util.EiInfoUtils;
 import com.baosight.hggp.util.LogUtils;
 import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;
@@ -25,8 +28,9 @@ public class ServiceHGCW016A extends ServiceBase {
     @OperationLogAnnotation(operModul = "账期维护",operType = "查询",operDesc = "初始化")
     public EiInfo initLoad(EiInfo inInfo) {
         try {
+            EiInfoUtils.addBlock(inInfo,"roleCompany", UserSessionUtils.getRoleCompany(), Company.class);
             inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGCW012().eiMetadata);
-        } catch (PlatException e) {
+        } catch (Exception e) {
             LogUtils.setDetailMsg(inInfo, e, "初始化失败");
         }
         return inInfo;

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

@@ -10,6 +10,10 @@
 
     <EF:EFRegion id="inqu" title="查询条件">
         <div class="row">
+            <EF:EFSelect blockId="inqu_status" row="0" ename="companyCode" cname="公司名称" colWidth="3" filter="contains">
+                <EF:EFOption label="全部" value=""/>
+                <EF:EFOptions blockId="roleCompany" textField="companyName" valueField="companyCode"/>
+            </EF:EFSelect>
             <EF:EFDateSpan startCname="开票日期(从)" endCname="至" blockId="inqu_status"
                            startName="signingDateFrom" endName="signingDateTo" row="0" role="date"
                            format="yyyy-MM-dd" ratio="3:3" satrtRatio="4:8" endRatio="4:8" readonly="true">
@@ -35,6 +39,13 @@
         <EF:EFGrid blockId="result" autoDraw="no" isFloat="true" autoBind="false">
             <EF:EFColumn ename="id" cname="主键" hidden="true"/>
             <EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="140" align="center"/>
+            <EF:EFComboColumn ename="companyCode" cname="公司名称"
+                              columnTemplate="#=textField#" itemTemplate="#=textField#"
+                              textField="textField" valueField="valueField"
+                              maxLength="16" readonly="false" width="210" required="true"
+                              align="center" filter="contains" sort="true">
+                <EF:EFOptions blockId="roleCompany" textField="companyName" valueField="companyCode"/>
+            </EF:EFComboColumn>
             <EF:EFColumn ename="partyA" cname="客户名称" width="200" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="projName" cname="项目名称" width="200" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="settlementNumber" cname="来源单号" width="140" enable="false" readonly="true" align="center"/>

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

@@ -12,7 +12,10 @@
         <div class="row">
 
             <EF:EFInput cname="隐藏条件" ename="mainId" blockId="inqu_status" row="0" type="hidden"/>
-
+            <EF:EFSelect blockId="inqu_status" row="0" ename="companyCode" cname="公司名称" colWidth="3" filter="contains">
+                <EF:EFOption label="全部" value=""/>
+                <EF:EFOptions blockId="roleCompany" textField="companyName" valueField="companyCode"/>
+            </EF:EFSelect>
             <EF:EFDateSpan startCname="结算日期(从)" endCname="至" blockId="inqu_status"
                            startName="signingDateFrom" endName="signingDateTo" row="0" role="date"
                            format="yyyy-MM-dd" ratio="3:3" satrtRatio="4:8" endRatio="4:8" readonly="true">
@@ -26,6 +29,13 @@
     <EF:EFRegion id="result" title="记录集">
         <EF:EFGrid blockId="result" autoDraw="no" isFloat="true" autoBind="false" checkMode="row">
             <EF:EFColumn ename="id" cname="主键" hidden="true"/>
+            <EF:EFComboColumn ename="companyCode" cname="公司名称"
+                              columnTemplate="#=textField#" itemTemplate="#=textField#"
+                              textField="textField" valueField="valueField"
+                              maxLength="16" readonly="false" width="210" required="true"
+                              align="center" filter="contains" sort="true">
+                <EF:EFOptions blockId="roleCompany" textField="companyName" valueField="companyCode"/>
+            </EF:EFComboColumn>
             <EF:EFColumn ename="partyA" cname="客户名称"  width="120" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="projCode" cname="项目编号"  width="120" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="projName" cname="项目名称" width="120" enable="false" readonly="true" align="center"/>

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

@@ -10,6 +10,10 @@
 
     <EF:EFRegion id="inqu" title="查询条件">
         <div class="row">
+            <EF:EFSelect blockId="inqu_status" row="0" ename="companyCode" cname="公司名称" colWidth="3" filter="contains">
+                <EF:EFOption label="全部" value=""/>
+                <EF:EFOptions blockId="roleCompany" textField="companyName" valueField="companyCode"/>
+            </EF:EFSelect>
             <EF:EFDateSpan startCname="收票日期(从)" endCname="至" blockId="inqu_status"
                            startName="signingDateFrom" endName="signingDateTo" row="0" role="date"
                            format="yyyy-MM-dd" ratio="3:3" satrtRatio="4:8" endRatio="4:8" readonly="true">
@@ -32,6 +36,13 @@
         <EF:EFGrid blockId="result" autoDraw="no" isFloat="true" autoBind="false">
             <EF:EFColumn ename="id" cname="主键" hidden="true"/>
             <EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="140" align="center"/>
+            <EF:EFComboColumn ename="companyCode" cname="公司名称"
+                              columnTemplate="#=textField#" itemTemplate="#=textField#"
+                              textField="textField" valueField="valueField"
+                              maxLength="16" readonly="false" width="210" required="true"
+                              align="center" filter="contains" sort="true">
+                <EF:EFOptions blockId="roleCompany" textField="companyName" valueField="companyCode"/>
+            </EF:EFComboColumn>
             <EF:EFColumn ename="partyA" cname="供应商名称" width="220" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="settlementNumber" cname="来源单号" width="200" enable="false" readonly="true" align="center"/>
             <EF:EFComboColumn ename="billTybe" cname="票据类型" width="120" align="center" required="true"

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

@@ -156,53 +156,60 @@ $(function () {
         "result": {
             columns: [
                 {
+                    field: "companyName",
+                    title: "公司名称",
+                    headerTemplate: "<span style='color: '>公司名称 </span>",
+                    width: 200,
+                    locked: false
+                },
+                {
                     field: "receiveNo",
                     title: "收货编号",
                     headerTemplate: "<span style='color: '>收货编号 </span>",
                     enable: false,
-                    locked: true
+                    locked: false
                 },
                 {
                     field: "supName",
                     title: "供应商",
                     headerTemplate: "<span style='color: '>供应商 </span>",
                     enable: false,
-                    locked: true
+                    locked: false
                 },
                 {
                     field: "inventName",
                     title: "存货名称",
                     headerTemplate: "<span style='color: '>存货名称 </span>",
                     enable: false,
-                    locked: true
+                    locked: false
                 },
                 {
                     field: "spec",
                     title: "规格",
                     headerTemplate: "<span style='color: '>规格 </span>",
                     enable: false,
-                    locked: true
+                    locked: false
                 },
                 {
                     field: "depositQty",
                     title: "数量",
                     headerTemplate: "<span style='color: '>数量 </span>",
                     enable: false,
-                    locked: true
+                    locked: false
                 },
                 {
                     field: "receiveWeight",
                     title: "重量",
                     headerTemplate: "<span style='color: '>重量 </span>",
                     enable: false,
-                    locked: true
+                    locked: false
                 },
                 {
                     field: "receiveDate",
                     title: "收货日期",
                     headerTemplate: "<span style='color: '>收货日期 </span>",
                     enable: false,
-                    locked: true
+                    locked: false
                 },
                 {
                     field: "amount",
@@ -242,11 +249,18 @@ $(function () {
         "resultA": {
             columns: [
                 {
+                    field: "companyName",
+                    title: "公司名称",
+                    headerTemplate: "<span style='color: '>公司名称 </span>",
+                    width: 200,
+                    locked: false
+                },
+                {
                     field: "projCode",
                     title: "项目编号",
                     headerTemplate: "<span style='color: '>项目编号 </span>",
                     width: 200,
-                    locked: true
+                    locked: false
                 },
                 {
                     field: "projName",
@@ -337,12 +351,19 @@ $(function () {
         "resultB": {
             columns: [
                 {
+                    field: "companyName",
+                    title: "公司名称",
+                    headerTemplate: "<span style='color: '>公司名称 </span>",
+                    width: 200,
+                    locked: false
+                },
+                {
                     field: "projCode",
                     title: "项目编号",
                     headerTemplate: "<span style='color: '>项目编号 </span>",
                     enable:"true",
                     width: 200,
-                    locked: true
+                    locked: false
                 },
                 {
                     field: "projName",

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

@@ -9,6 +9,10 @@
     <EF:EFPage title="采购收货选择">
         <EF:EFRegion id="inqu">
             <div class="row">
+                <EF:EFSelect blockId="inqu_status" row="0" ename="companyCode" cname="公司名称" colWidth="3" filter="contains">
+                    <EF:EFOption label="全部" value=""/>
+                    <EF:EFOptions blockId="roleCompany" textField="companyName" valueField="companyCode"/>
+                </EF:EFSelect>
                 <EF:EFInput cname="隐藏条件" ename="mainId" blockId="inqu_status" row="0" type="hidden" />
                 <EF:EFDateSpan startCname="结算日期(从)" endCname="至" blockId="inqu_status"
                                startName="signingDateFrom" endName="signingDateTo" row="0" role="date"

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

@@ -10,6 +10,10 @@
 
     <EF:EFRegion id="inqu" title="查询条件">
         <div class="row">
+            <EF:EFSelect blockId="inqu_status" row="0" ename="companyCode" cname="公司名称" colWidth="3" filter="contains">
+                <EF:EFOption label="全部" value=""/>
+                <EF:EFOptions blockId="roleCompany" textField="companyName" valueField="companyCode"/>
+            </EF:EFSelect>
             <EF:EFDateSpan startCname="收款日期(从)" endCname="至" blockId="inqu_status"
                            startName="signingDateFrom" endName="signingDateTo" row="0" role="date"
                            format="yyyy-MM-dd" ratio="3:3" satrtRatio="4:8" endRatio="4:8" readonly="true">
@@ -26,6 +30,13 @@
         <EF:EFGrid blockId="result" autoDraw="no" isFloat="true" autoBind="false">
             <EF:EFColumn ename="id" cname="主键" hidden="true"/>
             <EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="100" align="center"/>
+            <EF:EFComboColumn ename="companyCode" cname="公司名称"
+                              columnTemplate="#=textField#" itemTemplate="#=textField#"
+                              textField="textField" valueField="valueField"
+                              maxLength="16" readonly="false" width="210" required="true"
+                              align="center" filter="contains" sort="true">
+                <EF:EFOptions blockId="roleCompany" textField="companyName" valueField="companyCode"/>
+            </EF:EFComboColumn>
             <EF:EFComboColumn ename="partyA" cname="客户名称" width="120" align="left" defaultValue=""
                               filter="contains" readonly="true">
                 <EF:EFOptions blockId="customer_record_block_id"

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

@@ -13,6 +13,10 @@
             <EF:EFInput cname="隐藏条件" ename="mainId" blockId="inqu_status" row="0" type="hidden"/>
             <EF:EFInput cname="隐藏条件" ename="reviewStatus" blockId="inqu_status" row="0" type="hidden"/>
             <EF:EFInput cname="隐藏条件" ename="billState" blockId="inqu_status" row="0" type="hidden"/>
+            <EF:EFSelect blockId="inqu_status" row="0" ename="companyCode" cname="公司名称" colWidth="3" filter="contains">
+                <EF:EFOption label="全部" value=""/>
+                <EF:EFOptions blockId="roleCompany" textField="companyName" valueField="companyCode"/>
+            </EF:EFSelect>
             <EF:EFDateSpan startCname="开票日期(从)" endCname="至" blockId="inqu_status"
                            startName="signingDateFrom" endName="signingDateTo" row="0" role="date"
                            format="yyyy-MM-dd" ratio="3:3" satrtRatio="4:8" endRatio="4:8" readonly="true">
@@ -29,6 +33,13 @@
     <EF:EFRegion id="result" title="记录集">
         <EF:EFGrid blockId="result" autoDraw="no" isFloat="true" autoBind="false" checkMode="row">
             <EF:EFColumn ename="id" cname="主键" hidden="true"/>
+            <EF:EFComboColumn ename="companyCode" cname="公司名称"
+                              columnTemplate="#=textField#" itemTemplate="#=textField#"
+                              textField="textField" valueField="valueField"
+                              maxLength="16" readonly="false" width="210" required="true"
+                              align="center" filter="contains" sort="true">
+                <EF:EFOptions blockId="roleCompany" textField="companyName" valueField="companyCode"/>
+            </EF:EFComboColumn>
             <EF:EFColumn ename="thisAmount" cname="本次收款金额" width="120" align="center"/>
             <EF:EFColumn ename="remainingAmount" cname="剩余开票金额" width="120" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="partyA" cname="客户名称" width="200" enable="false" readonly="true" align="center"/>

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

@@ -10,6 +10,10 @@
 
     <EF:EFRegion id="inqu" title="查询条件">
         <div class="row">
+            <EF:EFSelect blockId="inqu_status" row="0" ename="companyCode" cname="公司名称" colWidth="3" filter="contains">
+                <EF:EFOption label="全部" value=""/>
+                <EF:EFOptions blockId="roleCompany" textField="companyName" valueField="companyCode"/>
+            </EF:EFSelect>
             <EF:EFDateSpan startCname="付款日期(从)" endCname="至" blockId="inqu_status"
                            startName="signingDateFrom" endName="signingDateTo" row="0" role="date"
                            format="yyyy-MM-dd" ratio="3:3" satrtRatio="4:8" endRatio="4:8" readonly="true">
@@ -26,6 +30,13 @@
         <EF:EFGrid blockId="result" autoDraw="no" isFloat="true" autoBind="false">
             <EF:EFColumn ename="id" cname="主键" hidden="true"/>
             <EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="100" align="center"/>
+            <EF:EFComboColumn ename="companyCode" cname="公司名称"
+                              columnTemplate="#=textField#" itemTemplate="#=textField#"
+                              textField="textField" valueField="valueField"
+                              maxLength="16" readonly="false" width="210" required="true"
+                              align="center" filter="contains" sort="true">
+                <EF:EFOptions blockId="roleCompany" textField="companyName" valueField="companyCode"/>
+            </EF:EFComboColumn>
             <EF:EFComboColumn ename="partyA" cname="供应商名称" width="120" align="left" defaultValue=""
                               filter="contains" readonly="true">
                 <EF:EFOptions blockId="sup_record_block_id"

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

@@ -13,7 +13,10 @@
             <EF:EFInput cname="隐藏条件" ename="hiddenConditions" blockId="inqu_status" row="0" type="hidden"/>
             <EF:EFInput cname="隐藏条件" ename="billState" blockId="inqu_status" row="0" type="hidden"/>
             <EF:EFInput cname="隐藏条件" ename="mainId" blockId="inqu_status" row="0" type="hidden"/>
-
+            <EF:EFSelect blockId="inqu_status" row="0" ename="companyCode" cname="公司名称" colWidth="3" filter="contains">
+                <EF:EFOption label="全部" value=""/>
+                <EF:EFOptions blockId="roleCompany" textField="companyName" valueField="companyCode"/>
+            </EF:EFSelect>
             <EF:EFDateSpan startCname="付款日期(从)" endCname="至" blockId="inqu_status"
                            startName="signingDateFrom" endName="signingDateTo" row="0" role="date"
                            format="yyyy-MM-dd" ratio="3:3" satrtRatio="4:8" endRatio="4:8" readonly="true">
@@ -30,6 +33,13 @@
     <EF:EFRegion id="result" title="记录集">
         <EF:EFGrid blockId="result" autoDraw="no" isFloat="true" autoBind="false" checkMode="row">
             <EF:EFColumn ename="id" cname="主键" hidden="true"/>
+            <EF:EFComboColumn ename="companyCode" cname="公司名称"
+                              columnTemplate="#=textField#" itemTemplate="#=textField#"
+                              textField="textField" valueField="valueField"
+                              maxLength="16" readonly="false" width="210" required="true"
+                              align="center" filter="contains" sort="true">
+                <EF:EFOptions blockId="roleCompany" textField="companyName" valueField="companyCode"/>
+            </EF:EFComboColumn>
             <EF:EFColumn ename="thisAmount" cname="本次付款金额" width="120" align="center"/>
             <EF:EFColumn ename="remainingAmount" cname="剩余付款金额" width="120" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="partyA" cname="供应商名称" width="120" enable="false" readonly="true" align="center"/>