分仓额度变动记录调整

Areas/Admin/Controllers/MainServer/StoreHouseAmountRecordController.cs

@@ -77,7 +77,15 @@ namespace MySystem.Areas.Admin.Controllers
             //额度类别
             if (!string.IsNullOrEmpty(AmountTypeSelect))
             {
-                condition += " and AmountType=" + AmountTypeSelect;
+                //临时额度
+                if (AmountTypeSelect == "1")
+                {
+                    condition += " and (Sort=1 or Sort=3)";
+                }
+                else
+                {
+                    condition += " and Sort!=1 and Sort!=3)";
+                }
             }
             //变动类别
             if (!string.IsNullOrEmpty(ChangeTypeSelect))
@@ -109,14 +117,14 @@ namespace MySystem.Areas.Admin.Controllers
                 //申请单
                 dic["ApplyId"] = RelationClass.GetStoreMachineApplyInfo(int.Parse(dic["ApplyId"].ToString()));
                 //额度类别
-                int AmountType = int.Parse(dic["AmountType"].ToString());
-                if (AmountType == 0) dic["AmountType"] = "固定额度";
-                if (AmountType == 1) dic["AmountType"] = "临时额度";
+                int Sort = int.Parse(dic["Sort"].ToString());
+                if (Sort == 1 || Sort == 3) dic["AmountType"] = "临时额度";
+                else dic["AmountType"] = "可用额度";
                 //变动类别
                 int ChangeType = int.Parse(dic["Sort"].ToString());
                 if (ChangeType == 1) dic["ChangeType"] = "购买临时额度";
-                if (ChangeType == 2) dic["ChangeType"] = "增减分仓临时额度";
-                if (ChangeType == 3) dic["ChangeType"] = "调低额度返回余额";
+                if (ChangeType == 2) dic["ChangeType"] = "增减分仓可用额度";
+                if (ChangeType == 3) dic["ChangeType"] = "调低额度";
                 if (ChangeType == 4) dic["ChangeType"] = "仓库发货｜预发机申请";
                 if (ChangeType == 5) dic["ChangeType"] = "后台仓库调拨";
                 //操作类别
@@ -474,7 +482,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and OperateType=" + OperateTypeSelect;
             }
-            //额度类别
+            //支付类别
             if (!string.IsNullOrEmpty(PayModeSelect))
             {
                 condition += " and PayMode=" + PayModeSelect;

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

@@ -68,7 +68,7 @@
                         <div class="layui-input-inline">
                             <select id="AmountTypeSelect" name="AmountTypeSelect" lay-search="">
                                 <option value="">全部...</option>
-                                <option value="0">固定额度</option>
+                                <option value="0">可用额度</option>
                                 <option value="1">临时额度</option>
                             </select>
                         </div>
@@ -79,8 +79,8 @@
                             <select id="ChangeTypeSelect" name="ChangeTypeSelect" lay-search="">
                                 <option value="">全部...</option>
                                 <option value="1">购买临时额度</option>
-                                <option value="2">增减分仓临时额度</option>
-                                <option value="3">调低额度返回余额</option>
+                                <option value="2">增减分仓可用额度</option>
+                                <option value="3">调低额度</option>
                                 <option value="4">仓库发货，预发机申请</option>
                                 <option value="5">后台仓库调拨</option>
                             </select>
@@ -97,7 +97,7 @@
                         </div>
                     </div>
                     <div class="layui-inline">
-                        <label class="layui-form-label">额度类别</label>
+                        <label class="layui-form-label">支付类别</label>
                         <div class="layui-input-inline">
                             <select id="PayModeSelect" name="PayModeSelect" lay-search="">
                                 <option value="">全部...</option>

wwwroot/layuiadmin/modules_main/StoreHouseAmountRecord_Admin.js

@@ -102,10 +102,10 @@ layui.config({
             , { field: 'AmountType', width: 200, title: '额度类别', sort: true }
             , { field: 'ChangeType', width: 200, title: '变动类别', sort: true }
             , { field: 'OperateType', width: 200, title: '操作类别', sort: true }
-            , { field: 'PayMode', width: 200, title: '额度类别', sort: true }
+            , { field: 'PayMode', width: 200, title: '支付类别', sort: true }
 
             // , { field: 'Sort', fixed: 'right', title: '排序', width: 80, edit: 'text' }
-            , { title: '操作', align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
+            // , { title: '操作', align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
         ]]
         , where: {