Эх сурвалжийг харах

对账单创建页面,增加一个客户订单号stockNo的过滤条件

klzhangweiya 9 сар өмнө
parent
commit
31b8fa5092

+ 4 - 0
src_0nline/ShwasherSys/ShwasherSys.Application/Invoice/StatementBillsApplicationService.cs

@@ -336,6 +336,10 @@ namespace ShwasherSys.Invoice
             {
             {
                 queryAllList = queryAllList.Where(i => i.SendActionDate <= input.SendDateEnd);
                 queryAllList = queryAllList.Where(i => i.SendActionDate <= input.SendDateEnd);
             }
             }
+            if (!string.IsNullOrEmpty(input.StockNo))
+            {
+                queryAllList = queryAllList.Where(i => i.StockNo.Contains(input.StockNo));
+            }
             //queryAllList = queryAllList.OrderByDescending(i => i.SendActionDate).ThenBy(i => i.ProductName);
             //queryAllList = queryAllList.OrderByDescending(i => i.SendActionDate).ThenBy(i => i.ProductName);
             queryAllList = queryAllList.OrderBy(i => i.SendActionDate).ThenBy(i => i.ProductName);
             queryAllList = queryAllList.OrderBy(i => i.SendActionDate).ThenBy(i => i.ProductName);
             //queryAllList = queryAllList.OrderByDescending(i => i.CustomerId).ThenBy(i => i.SendBillSort);
             //queryAllList = queryAllList.OrderByDescending(i => i.CustomerId).ThenBy(i => i.SendBillSort);

+ 2 - 0
src_0nline/ShwasherSys/ShwasherSys.Application/OrderSendInfo/Dto/QuerySendDto.cs

@@ -13,5 +13,7 @@ namespace ShwasherSys.OrderSendInfo.Dto
 
 
         public DateTime? SendDateStart  { get; set; }
         public DateTime? SendDateStart  { get; set; }
         public DateTime? SendDateEnd  { get; set; }
         public DateTime? SendDateEnd  { get; set; }
+
+        public String StockNo { get; set; }
     }
     }
 }
 }

+ 20 - 8
src_0nline/ShwasherSys/ShwasherSys.Web/Views/InvoiceInfo/StatementBill.cshtml

@@ -73,8 +73,8 @@
 
 
             .form-box .form-box-column {
             .form-box .form-box-column {
                 float: left;
                 float: left;
-                min-width: 250px;
-                width: 18%;
+                min-width: 180px;
+                width: 15%;
                 margin: 0 5px;
                 margin: 0 5px;
             }
             }
 
 
@@ -151,7 +151,7 @@
                                     </div>
                                     </div>
                                 </div>
                                 </div>
                             </div>
                             </div>
-                            <div class="form-box-column">
+                            <div class="form-box-column" style="width: 17%">
                                 <div class="form-group-sm input-group">
                                 <div class="form-group-sm input-group">
                                     <div class="input-group-addon">
                                     <div class="input-group-addon">
                                         <span>发货日期</span>
                                         <span>发货日期</span>
@@ -162,6 +162,17 @@
                                     </div>
                                     </div>
                                 </div>
                                 </div>
                             </div>
                             </div>
+                            <div class="form-box-column" style="width: 18%">
+                                <div class="form-group-sm input-group">
+                                    <div class="input-group-addon">
+                                        <span>客户订单号</span>
+                                    </div>
+                                    <input type="text" class="form-control iwb-date-range" style="border-radius: 0 0 0 0 !important;" id="stockNo" name="stockNo" data-keyField="stockNo" data-fieldType="0" data-expType="0" />
+                                    <div class="input-group-addon" style="cursor: pointer;" onclick="RefreshCustomer(this)">
+                                        <i class="iconfont icon-search"></i>
+                                    </div>
+                                </div>
+                            </div>
                           
                           
                             <div class="form-box-column">
                             <div class="form-box-column">
                                 <div class="form-group-sm input-group">
                                 <div class="form-group-sm input-group">
@@ -182,7 +193,7 @@
                                 </div>
                                 </div>
                             </div>
                             </div>
                             <div class="form-box-column">
                             <div class="form-box-column">
-                                <button type="button" class="btn btn-block btn-info btn-sm" id="createStickBillBtn" style="width: 360px;" onclick="CreateBill()"><i class="iconfont icon-fapiao"></i><span style="font-size: 1.3rem;"><strong>生成对账单</strong></span></button>
+                                <button type="button" class="btn btn-block btn-info btn-sm" id="createStickBillBtn" style="width: 100px;" onclick="CreateBill()"><i class="iconfont icon-fapiao"></i><span style="font-size: 1.3rem;"><strong>生成对账单</strong></span></button>
                             </div>
                             </div>
                         </form>
                         </form>
 
 
@@ -363,11 +374,11 @@
                 startDate = dArr[0];
                 startDate = dArr[0];
                 endDate = dArr[1];
                 endDate = dArr[1];
             }
             }
-          
-            QueryOrderSend(cId, startDate, endDate);
+			let stockNo = $("#stockNo").val()
+			QueryOrderSend(cId, startDate, endDate, stockNo);
         }
         }
 
 
-        function QueryOrderSend(customerId, startDate, endDate) {
+		function QueryOrderSend(customerId, startDate, endDate, stockNo) {
             if (customerId) {
             if (customerId) {
                 $("#tableSendItem").show();
                 $("#tableSendItem").show();
             } else {
             } else {
@@ -379,7 +390,8 @@
                 data: {
                 data: {
                     CustomerId: customerId,
                     CustomerId: customerId,
                     SendDateStart: startDate,
                     SendDateStart: startDate,
-                    SendDateEnd: endDate
+                    SendDateEnd: endDate,
+					StockNo: stockNo
                 },
                 },
                 dataType: "json",
                 dataType: "json",
                 isValidate: false,
                 isValidate: false,