Merge branch 'DuGuYang' into develop

Areas/Admin/Controllers/MainServer/OrdersController.cs

@@ -55,7 +55,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 创客订单列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(Orders data, string OrderNo, string TradeNo, string RealName, string Mobile, string StoreContact, string ErpCode, string SnNos, string CreateDateData, string SendDateData, string UserIdMakerCode, string UserIdRealName, string PayModeSelect, string StoreIdStoreNo, string StoreIdStoreName, string RefundStatusSelect, string DeliveryTypeSelect, string SendStatusSelect, string ProductIdSelect, string StoreTypeSelect, string StoreUserIdMakerCode, string StoreUserIdRealName, string PayStatusSelect, int page = 1, int limit = 30)
+        public JsonResult IndexData(Orders data, string OrderNo, string TradeNo, string RealName, string Mobile, string StoreContact, string ErpCode, string SnNos, string PayDateData, string CreateDateData, string SendDateData, string UserIdMakerCode, string UserIdRealName, string PayModeSelect, string StoreIdStoreNo, string StoreIdStoreName, string RefundStatusSelect, string DeliveryTypeSelect, string SendStatusSelect, string ProductIdSelect, string StoreTypeSelect, string StoreUserIdMakerCode, string StoreUserIdRealName, string PayStatusSelect, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -143,6 +143,14 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and SnNos=" + SnNos;
             }
+            //支付时间
+            if (!string.IsNullOrEmpty(PayDateData))
+            {
+                string[] datelist = PayDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                condition += " and PayDate>='" + start + " 00:00:00' and PayDate<='" + end + " 23:59:59'";
+            }
             //下单时间
             if (!string.IsNullOrEmpty(CreateDateData))
             {

Areas/Admin/Controllers/MainServer/StoreHouseController.cs

@@ -193,8 +193,8 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["FixedAmount"] = FixedAmount.ToString();//固定额度
                 dic["TempAmount"] = TempAmount.ToString();//临时额度
                 dic["PromissAmount"] = PromissAmount.ToString();//担保金额
-                dic["ThisMonthPreAmount"] = PromissAmount.ToString();//本月小分仓额度
-                dic["ValidPreAmount"] = PromissAmount.ToString();//可用小分仓额度
+                dic["ThisMonthPreAmount"] = ThisMonthPreAmount.ToString();//本月小分仓额度
+                dic["ValidPreAmount"] = ValidPreAmount.ToString();//可用小分仓额度
             }
             return Json(obj);
         }

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -1620,7 +1620,7 @@ namespace MySystem.Areas.Admin.Controllers
                         return "您输入的新机SN不存在";
                     }
                     StoreHouse storeFrom = db.StoreHouse.FirstOrDefault(m => m.Id == storeForCodeFrom.StoreId);
-                    if (Convert.ToInt32(storeFrom.BrandId) != Convert.ToInt32(oldpos.BrandId))
+                    if (Convert.ToInt32(storeFrom.BrandId) != Convert.ToInt32(newpos.BrandId))
                     {
                         return "您输入的新机发货仓库不符新机机具对应品牌";
                     }
@@ -1633,6 +1633,10 @@ namespace MySystem.Areas.Admin.Controllers
                     {
                         return "您输入的坏机退回仓库不符坏机机具对应品牌";
                     }
+                    if (Convert.ToInt32(storeBack.BrandId) != Convert.ToInt32(storeFrom.BrandId))
+                    {
+                        return "您输入的新机发货仓库和坏机退回仓库品牌类型不同";
+                    }
                     var brandInfo = db.KqProducts.FirstOrDefault(m => m.Id == oldpos.BrandId) ?? new KqProducts();
                     if (brandInfo.Name.Contains("大POS"))
                     {
@@ -1825,6 +1829,7 @@ namespace MySystem.Areas.Admin.Controllers
                     oldpos.StoreId = storeBack.Id;
                     oldpos.BuyUserId = 0;
                     oldpos.UserId = 0;
+                    oldpos.Status = -1;
                     db.SaveChanges();
 
                     BrokenMachineChange add = db.BrokenMachineChange.Add(new BrokenMachineChange()

Areas/Admin/Views/MainServer/Orders/Index.cshtml

@@ -120,7 +120,13 @@
                         </div>
                     </div>
 
-                    
+                    <div class="layui-inline">
+                        <label class="layui-form-label">支付时间</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" readonly name="PayDateData" id="PayDate"
+                                placeholder="" autocomplete="off">
+                        </div>
+                    </div>
                     <div class="layui-inline">
                         <label class="layui-form-label">下单时间</label>
                         <div class="layui-input-inline">

Areas/Admin/Views/MainServer/SysTools/ChangeBadPos.cshtml

@@ -126,6 +126,7 @@
                     layer.close(index); //关闭弹层
                     if (data == "success") {
                         layer.msg("更换成功");
+                        window.location.reload();
                     } else {
                         layer.msg(data);
                     }

wwwroot/layuiadmin/modules_main/Orders_Admin.js

@@ -30,6 +30,33 @@ layui.config({
 
     //- 筛选条件-日期
     var laydate = layui.laydate;
+    var layPayeDate = laydate.render({
+        elem: '#PayDate',
+        type: 'date',
+        range: true,
+        trigger: 'click',
+        change: function (value, date, endDate) {
+            var op = true;
+            if (date.year == endDate.year && endDate.month - date.month <= 1) {
+                if (endDate.month - date.month == 1 && endDate.date > date.date) {
+                    op = false;
+                    layPayeDate.hint('日期范围请不要超过1个月');
+                    setTimeout(function () {
+                        $(".laydate-btns-confirm").addClass("laydate-disabled");
+                    }, 1);
+                }
+            } else {
+                op = false;
+                layPayeDate.hint('日期范围请不要超过1个月');
+                setTimeout(function () {
+                    $(".laydate-btns-confirm").addClass("laydate-disabled");
+                }, 1);
+            }
+            if (op) {
+                $('#PayDate').val(value);
+            }
+        }
+    });
     var layCreateDate = laydate.render({
         elem: '#CreateDate',
         type: 'date',