销售管理、项目档案opt；

src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC001.java

@@ -31,11 +31,11 @@ public class ServiceHPSC001 extends ServiceBase {
      */
     public EiInfo initLoad(EiInfo inInfo) {
         try {
+            inInfo = super.query(inInfo, "HPSC001.query", new HPSC001());
             Map map = new HashMap();
             map.put("companyCode", UserSessionUtils.getCompanyCode());
             CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.USER_BLOCK_ID), map,true);
             CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.CUSTOMER_RECORD_BLOCK_ID), null);
-            inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPSC001().eiMetadata);
         } catch (PlatException e) {
             LogUtils.setDetailMsg(inInfo, e, "初始化失败");
         }

src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC011.java

 package com.baosight.hpjx.hp.sc.service;
 
 import com.baosight.hpjx.common.DdynamicEnum;
+import com.baosight.hpjx.core.security.UserSessionUtils;
 import com.baosight.hpjx.hp.sc.domain.HPSC001;
 import com.baosight.hpjx.util.CommonMethod;
 import com.baosight.hpjx.util.LogUtils;
@@ -22,7 +23,11 @@ public class ServiceHPSC011 extends ServiceBase {
      */
     public EiInfo initLoad(EiInfo inInfo) {
         try {
-            CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.USER_BLOCK_ID), null);
+            inInfo.setCell(EiConstant.queryBlock, 0, "status", 1);
+            inInfo = super.query(inInfo, "HPSC001.query", new HPSC001());
+            Map map = new HashMap();
+            map.put("companyCode", UserSessionUtils.getCompanyCode());
+            CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.USER_BLOCK_ID), map,true);
             CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.CUSTOMER_RECORD_BLOCK_ID), null);
             inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPSC001().eiMetadata);
         } catch (PlatException e) {

src/main/webapp/HP/SC/HPSC001.jsp

@@ -12,13 +12,13 @@
     <EF:EFRegion id="inqu" title="查询条件">
 
         <div class="row">
+            <EF:EFInput ename="inqu_status-0-projCode" cname="项目编码" colWidth="3"/>
+            <EF:EFInput ename="inqu_status-0-projName" cname="项目名称" colWidth="3"/>
             <EF:EFSelect ename="inqu_status-0-projType" cname="项目类型" colWidth="3" filter="contains"
                          template="#=textField#" valueTemplate="#=textField#">
                 <EF:EFOption label="全部" value=""/>
                 <EF:EFCodeOption codeName="hpjx.hpsc.projType"/>
             </EF:EFSelect>
-            <EF:EFInput ename="inqu_status-0-projCode" cname="项目编码" colWidth="3"/>
-            <EF:EFInput ename="inqu_status-0-projName" cname="项目名称" colWidth="3"/>
             <EF:EFSelect cname="单据状态" optionLabel="全部" ename="inqu_status-0-status" colWidth="3">
                 <EF:EFOption label="未提交" value="0"/>
                 <EF:EFOption label="已提交" value="1"/>
@@ -44,12 +44,12 @@
             </EF:EFComboColumn>
             <EF:EFColumn ename="projCode" enable="false" cname="项目编码" readonly="true"/>
             <EF:EFColumn required="true"  ename="projName" cname="项目名称" readonly="true"/>
-            <EF:EFComboColumn ename="princ1" cname="本公司项目负责人" width="120" align="center" required="true"
+            <EF:EFComboColumn ename="princ1" cname="项目负责人" width="120" align="center" required="true"
                               blockName="user_block_id" textField="textField" valueField="valueField"
                               columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="true"
                               filter="contains">
             </EF:EFComboColumn>
-            <EF:EFComboColumn ename="princ2" cname="客户项目负责人" width="120" align="center" required="true"
+            <EF:EFComboColumn ename="princ2" cname="客户负责人" width="120" align="center" required="true"
                               blockName="customer_record_block_id" textField="textField" valueField="valueField"
                               columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="true"
                               filter="contains">

src/main/webapp/HP/SC/HPSC011.jsp

@@ -16,13 +16,13 @@
     <EF:EFRegion id="inqu" title="查询条件"><%-- type="query" efRegionShowClear="true" efRegionSave="true"--%>
 
         <div class="row"> <%--    blockId="inqu_status" row="0"   --%>
+            <EF:EFInput ename="inqu_status-0-projCode" cname="项目编码" colWidth="3"/>
+            <EF:EFInput ename="inqu_status-0-projName" cname="项目名称" colWidth="3"/>
             <EF:EFSelect ename="inqu_status-0-projType" cname="项目类型" colWidth="3" filter="contains"
                          template="#=textField#" valueTemplate="#=textField#">
                 <EF:EFOption label="全部" value=""/>
                 <EF:EFCodeOption codeName="hpjx.hpsc.projType"/>
             </EF:EFSelect>
-            <EF:EFInput ename="inqu_status-0-projCode" cname="项目编码" colWidth="3"/>
-            <EF:EFInput ename="inqu_status-0-projName" cname="项目名称" colWidth="3"/>
             <EF:EFSelect cname="物料提交状态" optionLabel="全部" ename="inqu_status-0-materialStatus" colWidth="3">
                 <EF:EFOption label="未提交" value="0"/>
                 <EF:EFOption label="部分提交" value="1"/>
@@ -43,18 +43,18 @@
     <EF:EFRegion id="result" title="记录集">
         <EF:EFGrid blockId="result" autoDraw="no">
             <EF:EFColumn ename="id" cname="主键" hidden="true"/>
+            <EF:EFColumn enable="false"  ename="projCode" cname="项目编码"/>
             <EF:EFComboColumn ename="projType" cname="项目类型" width="100" align="center" required="true"
                               columnTemplate="#=textField#" itemTemplate="#=textField#">
                 <EF:EFCodeOption codeName="hpjx.hpsc.projType"/>
             </EF:EFComboColumn>
-            <EF:EFColumn enable="false"  ename="projCode" cname="项目编码"/>
             <EF:EFColumn enable="false"  ename="projName" cname="项目名称"/>
-            <EF:EFComboColumn ename="princ1" cname="本公司项目负责人" width="120" align="center" required="true"
+            <EF:EFComboColumn ename="princ1" cname="项目负责人" width="120" align="center" required="true"
                               blockName="user_block_id" textField="textField" valueField="valueField"
                               columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="true"
                               filter="contains">
             </EF:EFComboColumn>
-            <EF:EFComboColumn ename="princ2" cname="客户项目负责人" width="120" align="center" required="true"
+            <EF:EFComboColumn ename="princ2" cname="客户负责人" width="120" align="center" required="true"
                               blockName="customer_record_block_id" textField="textField" valueField="valueField"
                               columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="true"
                               filter="contains">