Merge branch 'feat-修改bug' of kxs-end/admin-server into release-adminserver

AppStart/ExcelHelper.cs

@@ -100,6 +100,7 @@ namespace MySystem
                                                     SourceStoreId = storefor.StoreId, //源仓库
                                                     CardType = CardType,
                                                     OutBatchNo = Areas,
+                                                    PrizeParams = "299",
                                                 }).Entity;
                                                 store.ProductName = kqProduct.Name;
                                                 store.BrandId = BrandId.ToString();

Areas/Admin/Controllers/MainServer/PosMachinesTwoController.cs

@@ -658,7 +658,7 @@ namespace MySystem.Areas.Admin.Controllers
             }
 
 
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("PosMachinesTwo", Fields, "Id desc", "0", 1, 20000, condition, "BindingState,ActivationState,UserId,StoreId,PosSn,BrandId,ActivityList,BindMerchantId,PosSnType,DeviceType,BindingTime,ActivationTime,TransferTime,OpId", false);
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("PosMachinesTwo", Fields, "Id desc", "0", 1, 20000, condition, "BindingState,ActivationState,UserId,StoreId,PosSn,BrandId,ActivityList,BindMerchantId,PosSnType,DeviceType,BindingTime,ActivationTime,TransferTime,OpId,OutBatchNo", false);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
@@ -742,6 +742,7 @@ namespace MySystem.Areas.Admin.Controllers
             ReturnFields.Add("ActivationTime", "激活时间");
             ReturnFields.Add("TransferTime", "划拨时间");
             ReturnFields.Add("OpCode", "所属运营中心");
+            ReturnFields.Add("OutBatchNo", "广电卡地区");
 
             result.Add("Fields", ReturnFields);
             AddSysLog("0", "PosMachinesTwo", "ExportExcel");

wwwroot/layuiadmin/modules_main/PosMachinesTwo_Admin.js

@@ -172,6 +172,7 @@ layui.config({
             , { field: 'PosIsFirst', width: 200, title: '是否首台(机具奖励发放)', sort: true }
             , { field: 'SeoKeyword', width: 200, title: '实际押金金额', sort: true }
             , { field: 'PrizeParams', width: 200, title: '设置押金金额', sort: true }
+            , { field: 'OutBatchNo', width: 200, title: '广电卡地区', sort: true }
             , { title: '操作', width: 100, align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
         ]]
         , where: {