Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly

src/main/webapp/HG/CB/HGCB005.js

 $(function (){
 
     var companyCodeBox = __eiInfo.getBlock("company_code_block_id").getMappedRows();
-    var whCodeBox = __eiInfo.getBlock("wh_record_block_id").getMappedRows();
 
     $(".row").children().attr("class", "col-md-3");
 

src/main/webapp/HG/CB/HGCB005.jsp

@@ -18,9 +18,11 @@
                 <EF:EFOptions blockId="company_code_block_id" textField="companyName" valueField="companyCode"/>
             </EF:EFSelect>
             <EF:EFDatePicker blockId="inqu_status" row="0" ename="accountYear" cname="会计期（年）" colWidth="3"
-                             format="yyyy" depth="year" start="year"/>
-            <EF:EFDatePicker blockId="inqu_status" row="0" ename="accountMonth" cname="会计期（月）" colWidth="3"
-                             format="MM" depth="month" start="month"/>
+                             format="yyyy" depth="decade" start="decade"/>
+            <EF:EFSelect blockId="inqu_status" row="0" ename="accountMonth" cname="会计期（月）" colWidth="3" filter="contains">
+                <EF:EFOption label="" value=""/>
+                <EF:EFCodeOption codeName="hggp.month" />
+            </EF:EFSelect>
         </div>
     </EF:EFRegion>