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

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

@@ -3,7 +3,6 @@ package com.baosight.hggp.hg.cw.service;
 import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
 import com.baosight.hggp.common.DdynamicEnum;
 import com.baosight.hggp.hg.cw.domain.HGCW012;
-import com.baosight.hggp.hg.cw.domain.HGCW015;
 import com.baosight.hggp.util.CommonMethod;
 import com.baosight.hggp.util.LogUtils;
 import com.baosight.iplat4j.core.ei.EiConstant;
@@ -26,12 +25,16 @@ public class ServiceHGCW012C extends ServiceBase {
 	 * @return
 	 */
 
-	@OperationLogAnnotation(operModul = "账期维护",operType = "查询",operDesc = "初始化")
+	@OperationLogAnnotation(operModul = "采购开票",operType = "查询",operDesc = "初始化")
+	@Override
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.FACTORY_RECORD_BLOCK_ID,
-					DdynamicEnum.COMPANY_BOX_BLOCK_ID,DdynamicEnum.PROJ_RECORD_BLOCK_ID), null, false);
-			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGCW015().eiMetadata);
+			CommonMethod.initBlock(inInfo,
+					Arrays.asList(
+							DdynamicEnum.FACTORY_RECORD_BLOCK_ID,
+							DdynamicEnum.COMPANY_BOX_BLOCK_ID,
+							DdynamicEnum.PROJ_RECORD_BLOCK_ID), null, false);
+			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGCW012().eiMetadata);
 		} catch (PlatException e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
 		}
@@ -44,7 +47,7 @@ public class ServiceHGCW012C extends ServiceBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "账期维护",operType = "查询",operDesc = "查询")
+	@OperationLogAnnotation(operModul = "采购开票",operType = "查询",operDesc = "查询")
 	@Override
 	public EiInfo query(EiInfo inInfo) {
 		try {

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

@@ -134,7 +134,7 @@ function windowCallback() {
 
 function contractDetailFunc(id) {
     JSColorbox.open({
-        href: "HGCW012C?methodName=initLoad&inqu_status-0-matId=" + id + "&efParentFormEname=HGCW012",
+        href: "HGCW012C?methodName=initLoad&inqu_status-0-id=" + id + "&efParentFormEname=HGCW012",
         title: "<div style='text-align: center;'>明细详情</div>",
         width: "90%",
         height: "90%",
@@ -144,7 +144,7 @@ function contractDetailFunc(id) {
 
 function fileDetailFunc(id) {
     JSColorbox.open({
-        href: "HGCW999?methodName=initLoad&inqu_status-0-bizType=HT&inqu_status-0-matId=" + id + "&efParentFormEname=HGCW010",
+        href: "HGCW999?methodName=initLoad&inqu_status-0-bizType=HT&inqu_status-0-matId=" + id + "&efParentFormEname=HGCW012",
         title: "<div style='text-align: center;'>附件清单</div>",
         width: "80%",
         height: "80%",

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

@@ -14,9 +14,13 @@
                            startName="signingDateFrom" endName="signingDateTo" row="0" role="date"
                            format="yyyy-MM-dd" ratio="3:3" satrtRatio="4:8" endRatio="4:8" readonly="true">
             </EF:EFDateSpan>
-            <EF:EFInput cname="供应商名称" ename="partyA" blockId="inqu_status" row="0" colWidth="3" />
-            <EF:EFInput cname="票据类型" ename="billTybe" blockId="inqu_status" row="0" colWidth="3" />
-            <EF:EFInput cname="发票号" ename="billNumber" blockId="inqu_status" row="0" colWidth="3" />
+            <EF:EFInput cname="供应商名称" ename="partyA" blockId="inqu_status" row="0" colWidth="3" placeholder="模糊供应商名称"/>
+            <%--<EF:EFInput cname="票据类型" ename="billTybe" blockId="inqu_status" row="0" colWidth="3" />--%>
+            <EF:EFSelect cname="票据类型" ename="inqu_status-0-billTybe" colWidth="3" filter="contains">
+                <EF:EFOption label="全部" value=""/>
+                <EF:EFCodeOption codeName="hggp.cw.billTybe"/>
+            </EF:EFSelect>
+            <EF:EFInput cname="发票号" ename="billNumber" blockId="inqu_status" row="0" colWidth="3" placeholder="模糊发票号"/>
             <EF:EFSelect cname="审核状态" ename="inqu_status-0-billState" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
                 <EF:EFCodeOption codeName="hggp.cw.reviewStatus"/>

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

@@ -7,7 +7,7 @@
 <head>
 </head>
 <EF:EFPage title="详情清单">
-    <EF:EFInput cname="隐藏条件" ename="mainId" blockId="inqu_status" row="0" type="hidden"/>
+    <EF:EFInput blockId="inqu_status" row="0" ename="id" cname="隐藏条件" type="hidden"/>
     <EF:EFRegion id="result" title="记录集">
         <EF:EFGrid blockId="result" autoDraw="no" isFloat="true" autoBind="false" checkMode="row">
             <EF:EFColumn ename="id" cname="主键" hidden="true"/>