采购订单增加查询条件

topsun-xt/src/main/webapp/biz/topsun/sap/purchaseOrder/sapPurchaseOrderList.js

@@ -44,10 +44,10 @@ function loadGrid() {
     purchaseOrderGridManager = UICtrl.grid('#purchaseOrderGrid', {
             columns: [
                 {display: "状态", name: "statusTextView", width: "100", align: "left", type: "string"},
-                {display: "外发状态", name: "sendOut", width: "100", align: "left", type: "string",
-                    render: function (item) {
-                        return item.sendOut == 1 ? "已外发": "";
-                    }
+                {display: "外发状态", name: "sendOutTextView", width: "100", align: "left", type: "string",
+                    // render: function (item) {
+                    //     return item.sendOut == 1 ? "已外发": "";
+                    // }
                 }
                 , {display: "id", name: "id", width: "140", align: "left", type: "string", hide: true}
                 , {display: "需求跟踪编号", name: "billCode", width: 150, minWidth: 60, type: "string", align: "center"}
@@ -55,6 +55,7 @@ function loadGrid() {
                 , {display: "采购订单类型", name: "bsart", width: 150, minWidth: 60, type: "string", align: "center"}
                 , {display: "采购订单类型描述", name: "batxt", width: 150, minWidth: 60, type: "string", align: "center"}
                 , {display: "供应商", name: "namel", width: 200, minWidth: 60, type: "string", align: "center"}
+                , {display: "项目类别描述", name: "knttp", width: "100", align: "left", type: "string"}
                 , {display: "sap回执", name: "message", width: 200, minWidth: 60, type: "string", align: "center"}
                 , {display: "创建日期", name: "fillinDate", width: 140, minWidth: 60, type: "string", align: "center"}
 

topsun-xt/src/main/webapp/biz/topsun/sap/purchaseOrder/sapPurchaseOrderList.jsp

@@ -18,19 +18,22 @@
                 <div class="hg-form-row">
                     <x:inputC name="billCode" label="需求跟踪编号" labelCol="1"/>
                     <x:inputC name="ebeln" label="采购订单号码" labelCol="1"/>
+                    <x:inputC name="batxt" label="采购订单类型描述" labelCol="1" fieldCol="2" />
+                    <x:inputC name="namel" label="供应商" labelCol="1" fieldCol="2" />
                 </div>
                 <div class="hg-form-row">
+                    <x:selectC name="sendOut" label="订单发送状态" labelCol="1" fieldCol="2" dictionary="sendOut"/>
                     <div class="col-xs-4 col-sm-1">
                         <label class="hg-form-label">申请日期起&nbsp;:</label>
                     </div>
                     <div class="col-xs-4 col-sm-2 col-white-bg">
-                        <x:input name="fillinBeginDate" required="false" wrapper="date" />
+                        <x:input name="fillinBeginDate" required="false" wrapper="dateTime" />
                     </div>
                     <div class="col-xs-4 col-sm-1">
                         <label class="hg-form-label">申请日期止&nbsp;:</label>
                     </div>
                     <div class="col-xs-4 col-sm-2 col-white-bg">
-                        <x:input name="fillinEndDate" label="至" required="false" wrapper="date" />
+                        <x:input name="fillinEndDate" label="至" required="false" wrapper="dateTime" />
                     </div>
                 </div>
                 <div class="hg-form-row">

topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/domain/query/SapPurchaseOrderQueryRequest.java

@@ -35,4 +35,8 @@ public class SapPurchaseOrderQueryRequest extends QueryAbstractRequest {
     protected Date fillinEndDate;
 
     private String statusKind;
+
+    private String namel;
+
+    private String sendOut;
 }

topsun/src/main/resources/config/topsun/sap/sapPurchaseOrder/sapPurchaseOrder.xml

@@ -11,6 +11,9 @@
         <condition column="status" name="statusKind" type="java.lang.Integer" symbol="in" alias="t"/>
         <condition column="fillin_date" name="fillinBeginDate" type="java.util.Date" symbol="&gt;=" alias="t"/>
         <condition column="fillin_date" name="fillinEndDate" type="java.util.Date" symbol="&lt;=" alias="t"/>
+        <condition column="batxt" name="batxt" type="java.lang.String" symbol="like" alias="t"/>
+        <condition column="namel" name="namel" type="java.lang.String" symbol="like" alias="t"/>
+        <condition column="send_out" name="sendOut" type="java.lang.String" symbol="=" alias="t"/>
     </query>
 
 </query-mappings>
\ No newline at end of file