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

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

@@ -14,8 +14,7 @@
             <EF:EFInput ename="inqu_status-0-companyCode" cname="公司编码" colWidth="3" type="hidden"/>
             <EF:EFInput ename="inqu_status-0-companyName" cname="公司名称" colWidth="3" readonly="true"/>
             <EF:EFInput ename="inqu_status-0-year" cname="year" colWidth="3" type="hidden"/>
-            <EF:EFDatePicker cname="月份" blockId="inqu_status" ename="month" row="0" colWidth="3"
-                             format="yyyyMM"  start="year" depth="year" readonly="true"/>
+            <EF:EFInput ename="inqu_status-0-month" cname="月份" colWidth="3" readonly="true"/>
             <EF:EFSelect cname="费用类型" ename="inqu_status-0-costType" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
                 <EF:EFCodeOption codeName="hggp.cw.costType" />
@@ -32,12 +31,12 @@
                 <EF:EFOptions blockId="projName" valueField="projCode" textField="projName"/>
             </EF:EFComboColumn>
             <EF:EFComboColumn ename="isShare" cname="是否分摊到工序" width="80" align="center" required="true"
-                              readonly="true">
+                              >
                 <EF:EFOption label="是" value="0"/>
                 <EF:EFOption label="否" value="1"/>
             </EF:EFComboColumn>
             <EF:EFComboColumn ename="costType" cname="费用类型" width="80" align="center" required="true"
-                              readonly="true">
+                              >
                 <EF:EFCodeOption codeName="hggp.cw.costType"/>
             </EF:EFComboColumn>
             <EF:EFColumn ename="costItem" cname="费用项" width="120" align="center" required="true"