费率调整新版初始化

Areas/Admin/Controllers/MainServer/PosMachinesTwoChangeController.cs

@@ -51,7 +51,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 机具库列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(PosMachinesTwo data, string BindingStateSelect, string ActivationStateSelect, string UserIdMakerCode, string UserIdRealName, string StoreIdCode, string StoreIdName, string ActivationDateData, string BindingDateData, string BrandSelect = "1", string UpFeeFlagSelect = "0", int page = 1, int limit = 30)
+        public JsonResult IndexData(PosMachinesTwo data, string BindingStateSelect, string ActivationStateSelect, string UserIdMakerCode, string UserIdRealName, string StoreIdCode, string StoreIdName, string ActivationDateData, string BindingDateData, string BrandSelect = "1", int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -59,7 +59,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("PosSn", "1"); //SN编号
             Fields.Add("BrandId", "0"); //品牌
 
-            string condition = " and Status>-1 AND BindingState = 1 AND DATE_SUB(CURDATE(), INTERVAL 180 DAY) >= date(BindingTime) and DownFeeFlag =0";
+            string condition = " and Status>-1 AND BindingState = 1 AND DATE_SUB(CURDATE(), INTERVAL 180 DAY) >= date(BindingTime) and UpFeeFlag =1 and DownFeeFlag =0";
             //绑定状态
             if (!string.IsNullOrEmpty(BindingStateSelect))
             {
@@ -103,10 +103,10 @@ namespace MySystem.Areas.Admin.Controllers
             // {
             //     condition += " and BrandId = 1";
             // }
-            if (!string.IsNullOrEmpty(UpFeeFlagSelect))
-            {
-                condition += " and UpFeeFlag = " + UpFeeFlagSelect;
-            }
+            // if (!string.IsNullOrEmpty(UpFeeFlagSelect))
+            // {
+            //     condition += " and UpFeeFlag = " + UpFeeFlagSelect;
+            // }
 
             if (!string.IsNullOrEmpty(ActivationDateData))
             {

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

@@ -74,7 +74,7 @@
                             <input class="layui-input" type="text" name="PosSn" placeholder="" autocomplete="off">
                         </div>
                     </div>
-                    <div class="layui-inline">
+                    @* <div class="layui-inline">
                         <label class="layui-form-label">是否调升费率</label>
                         <div class="layui-input-inline">
                             <select id="UpFeeFlagSelect" name="UpFeeFlagSelect" lay-search="">
@@ -83,7 +83,7 @@
                                 <option value="1">已调升</option>
                             </select>
                         </div>
-                    </div>
+                    </div> *@
                     <div class="layui-inline">
                         <label class="layui-form-label">绑定状态</label>
                         <div class="layui-input-inline">