销售开票bug调整

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

@@ -239,6 +239,10 @@ function billFunc() {
                 message("勾选的数据中有已经开票的票据！");
                 flag = false;
             }
+        if (row.billNumber == " ") {
+            message("勾选的数据中发票号为空");
+            flag = false;
+        }
         }
     )
 

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

@@ -22,7 +22,11 @@
             <EF:EFInput cname="发票号" ename="billNumber" blockId="inqu_status" row="0" colWidth="3" />
             <EF:EFSelect cname="开票状态" ename="inqu_status-0-billState" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
-                <EF:EFCodeOption codeName="hggp.cw.reviewStatus"/>
+                <EF:EFCodeOption codeName="hggp.cw.billState"/>
+            </EF:EFSelect>
+            <EF:EFSelect cname="审批状态" ename="inqu_status-0-reviewStatus" colWidth="3" filter="contains">
+                <EF:EFOption label="全部" value=""/>
+                <EF:EFCodeOption codeName="hggp.cw.reviewStatus" condition = "ITEM_CODE IN ('0','1')"/>
             </EF:EFSelect>
         </div>
     </EF:EFRegion>
@@ -39,7 +43,7 @@
                 <EF:EFCodeOption codeName="hggp.cw.billTybe"/>
             </EF:EFComboColumn>
             <EF:EFColumn ename="signingDate" cname="开票日期" width="120" enable="false" readonly="true" align="center"/>
-            <EF:EFColumn ename="billNumber" cname="发票号" width="120" enable="false" readonly="true" align="center"/>
+            <EF:EFColumn ename="billNumber" cname="发票号" width="120" format="{0:N3}" align="center"/>
             <EF:EFComboColumn ename="taxPoints" cname="税点" width="120" align="center" required="true"
                               columnTemplate="#=textField#" itemTemplate="#=textField#" enable="true" >
                 <EF:EFCodeOption codeName="hggp.cw.taxPoints"/>

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

@@ -31,7 +31,6 @@
             <EF:EFColumn ename="projName" cname="项目名称" width="120" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="settlementNumber" cname="结算编号" width="120" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="contractDate" cname="结算日期" width="120" enable="false" readonly="true" align="center"/>
-            <EF:EFColumn ename="billNumber" cname="发票号" width="120" enable="true"  align="center" required="true"/>
             <EF:EFColumn ename="taxPoints" cname="税率(%)" width="120" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="thisPriceTax" cname="结算价税合计金额" hidden="true"/>
             <EF:EFColumn ename="thisSettlementTax" cname="结算税金" width="120" enable="false" readonly="true" align="center"/>

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

@@ -14,7 +14,7 @@
             <EF:EFColumn ename="projName" cname="项目名称" width="120" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="partyA" cname="客户名称" width="120" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="settlementNumber" cname="来源单号" width="120" enable="false" readonly="true" align="center"/>
-            <EF:EFColumn ename="totalContractPriceIncluding" cname="开款总额" width="120" format="{0:N3}" align="center"/>
+            <EF:EFColumn ename="totalContractPriceIncluding" cname="开票金额" width="120" format="{0:N3}" align="center"/>
         </EF:EFGrid>
     </EF:EFRegion>
 </EF:EFPage>