Merge branch 'dev-sx' of http://129.211.46.84:8800/platform/hg-smart into dev

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

@@ -57,7 +57,7 @@
             <EF:EFColumn ename="contractContent" cname="签证事由及内容" width="120" enable="true"  align="center" required="true"/>
             <EF:EFColumn ename="totalContractPriceIncluding" cname="含税金额" width="120" enable="true" format="{0:N2}" align="right" required="true"/>
             <EF:EFColumn ename="signingDate" cname="签订日期" width="120" enable="true"  align="center" editType="date"
-                         dateFormat="yyyy-MM-dd" parseFormats="['yyyy-MM-dd', 'yyyyMMdd']" required="true"/>
+                         dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
             <EF:EFComboColumn ename="reviewStatus" cname="审批状态" width="100" align="center" required="true"
                               columnTemplate="#=textField#" itemTemplate="#=textField#" enable="false" >
                 <EF:EFCodeOption codeName="hggp.cw.reviewStatus"/>

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

@@ -53,7 +53,7 @@
             <EF:EFColumn ename="contractContent" cname="扣款事由" width="120" enable="true"  align="center" required="true"/>
             <EF:EFColumn ename="totalContractPriceIncluding" cname="扣款金额" width="120" enable="true"  format="{0:N2}" align="right" required="true"/>
             <EF:EFColumn ename="signingDate" cname="扣款日期" width="120" enable="true"  align="center" editType="date"
-                         dateFormat="yyyy-MM-dd" parseFormats="['yyyy-MM-dd', 'yyyyMMdd']" required="true"/>
+                         dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd', 'yyyy-MM-dd']" required="true"/>
             <EF:EFColumn ename="deliveryCode" cname="发货单号" enable="false" width="130" align="center"/>
             <EF:EFComboColumn ename="reviewStatus" cname="审批状态" width="100" align="center"
                               columnTemplate="#=textField#" itemTemplate="#=textField#" enable="false" >