结算单，开票，采购bug调整

src/main/java/com/baosight/hggp/hg/cw/domain/HGCW012.java

@@ -648,7 +648,7 @@ public class HGCW012 extends DaoEPBase {
 		this.remainingAmount = remainingAmount;
 	}
 	/**
-	 * get the receiveDate - 收票日期.
+	 * get the SIGNING_DATE - 收票日期.
 	 * @return the receiveDate
 	 */
 	public String getReceiveDate() {

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

@@ -34,10 +34,10 @@
                               columnTemplate="#=textField#" itemTemplate="#=textField#" enable="true" >
                 <EF:EFCodeOption codeName="hggp.cw.billTybe"/>
             </EF:EFComboColumn>
-            <EF:EFColumn ename="receiveDate" cname="签订日期" width="120" enable="true"  align="center" editType="date"
-                         dateFormat="yyyy-MM-dd" parseFormats="['yyyy-MM-dd']" required="true"/>
-            <EF:EFColumn ename="signingDate" cname="签订日期" width="120" enable="true"  align="center" editType="date"
-                         dateFormat="yyyy-MM-dd" parseFormats="['yyyy-MM-dd']" required="true"/>
+            <EF:EFColumn ename="receiveDate" cname="收票日期" width="120" enable="true"  align="center" editType="date"
+                         dateFormat="yyyy-MM-dd" parseFormats="['yyyy-MM-dd']" required="true" />
+            <EF:EFColumn ename="signingDate" cname="开票日期" width="120" enable="true"  align="center" editType="date"
+                         dateFormat="yyyy-MM-dd" parseFormats="['yyyy-MM-dd']" required="true" />
             <EF:EFColumn ename="billNumber" cname="发票号" width="120" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="taxPoints" cname="税率" width="120" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="thisSettlementAmount" cname="不含税金额" width="120" enable="false" readonly="true" align="center"/>

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

@@ -138,28 +138,57 @@ $(function () {
             columns: [
                 {
                     field: "receiveNo",
-                    title: "结算编号",
-                    headerTemplate: "<span style='color: '>结算编号 </span>",
+                    title: "收货编号",
+                    headerTemplate: "<span style='color: '>收货编号 </span>",
                     enable: false,
                     locked: true
                 },
                 {
-                    field: "receiveDate",
-                    title: "结算日期",
-                    headerTemplate: "<span style='color: '>结算日期 </span>",
+                    field: "supName",
+                    title: "供应商",
+                    headerTemplate: "<span style='color: '>供应商 </span>",
                     enable: false,
                     locked: true
                 },
                 {
-                    field: "billNumber",
-                    title: "发票号",
-                    headerTemplate: "<span style='color: '>发票号 </span>",
-                    locked: false
+                    field: "inventName",
+                    title: "存货名称",
+                    headerTemplate: "<span style='color: '>存货名称 </span>",
+                    enable: false,
+                    locked: true
+                },
+                {
+                    field: "spec",
+                    title: "规格",
+                    headerTemplate: "<span style='color: '>规格 </span>",
+                    enable: false,
+                    locked: true
+                },
+                {
+                    field: "depositQty",
+                    title: "数量",
+                    headerTemplate: "<span style='color: '>数量 </span>",
+                    enable: false,
+                    locked: true
+                },
+                {
+                    field: "receiveWeight",
+                    title: "重量",
+                    headerTemplate: "<span style='color: '>重量 </span>",
+                    enable: false,
+                    locked: true
+                },
+                {
+                    field: "receiveDate",
+                    title: "收货日期",
+                    headerTemplate: "<span style='color: '>收货日期 </span>",
+                    enable: false,
+                    locked: true
                 },
                 {
                     field: "amount",
-                    title: "结算金额",
-                    headerTemplate: "<span style='color: '>结算金额 </span>",
+                    title: "收货金额",
+                    headerTemplate: "<span style='color: '>收货金额 </span>",
                     enable: false,
                     locked: false
                 },
@@ -219,12 +248,6 @@ $(function () {
                     locked: false
                 },
                 {
-                    field: "billNumber",
-                    title: "发票号",
-                    headerTemplate: "<span style='color: '>发票号 </span>",
-                    locked: false
-                },
-                {
                     field: "taxPoints",
                     title: "税率(%)",
                     headerTemplate: "<span style='color: '>税率(%) </span>",
@@ -243,14 +266,27 @@ $(function () {
                     locked: false
                 },
                 {
-                    field: "thisSettlementAmount",
-                    title: "结算金额",
-                    headerTemplate: "<span style='color: '>结算金额 </span>",
+                    field: "thisSettlementTax",
+                    title: "结算税金",
+                    headerTemplate: "<span style='color: '>结算税金 </span>",
                     locked: false
-                },{
+                },
+                {
+                    field: "thisPriceTax",
+                    title: "结算价税合计金额",
+                    headerTemplate: "<span style='color: '>结算税金 </span>",
+                    locked: false
+                },
+                {
+                    field: "thisSettlementTax",
+                    title: "结算税金",
+                    headerTemplate: "<span style='color: '>结算税金 </span>",
+                    locked: false
+                },
+                {
                     field: "thisSettlementAmount",
-                    title: "结算金额",
-                    headerTemplate: "<span style='color: '>结算金额 </span>",
+                    title: "收票总额",
+                    headerTemplate: "<span style='color: '>收票总额 </span>",
                     locked: false
                 }],
             loadComplete: function(grid) {

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

@@ -6,7 +6,7 @@
 <c:set var="ctx" value="${pageContext.request.contextPath}"/>
 <head>
 </head>
-    <EF:EFPage title="结算单">
+    <EF:EFPage title="采购收货选择">
         <EF:EFRegion id="inqu">
             <div class="row">
                 <EF:EFInput cname="隐藏条件" ename="mainId" blockId="inqu_status" row="0" type="hidden" />
@@ -15,8 +15,7 @@
                                format="yyyy-MM-dd" ratio="3:3" satrtRatio="4:8" endRatio="4:8" readonly="true">
                 </EF:EFDateSpan>
                 <EF:EFInput cname="项目名称" ename="projName" blockId="inqu_status" row="0" colWidth="3" />
-                <EF:EFInput cname="项目编号" ename="projCode" blockId="inqu_status" row="0" colWidth="3" />
-                <EF:EFInput cname="结算编号" ename="settlementNumber" blockId="inqu_status" row="0" colWidth="3" />
+                <EF:EFInput cname="供应商" ename="supName" blockId="inqu_status" row="0" colWidth="3" />
             </div>
         </EF:EFRegion>
         <EF:EFTab id="info">
@@ -33,6 +32,7 @@
                 </EF:EFGrid>
             </div>
         </EF:EFTab>
+
     </EF:EFPage>
 <script>
     var ctx = "${ctx}";