DuGuYang 2 years ago
parent
commit
2eca623e02

+ 47 - 36
Areas/Admin/Controllers/MainServer/TradeRecordController.cs

@@ -884,11 +884,10 @@ namespace MySystem.Areas.Admin.Controllers
 
         #region 获取激活信息预览
 
-        public IActionResult IndexDataSIM(string right, string DateStr)
+        public IActionResult IndexDataSIM(string right)
         {
             ViewBag.RightInfo = RightInfo;
             ViewBag.right = right;
-            ViewBag.DateStr = DateStr;
 
             return View();
         }
@@ -901,44 +900,56 @@ namespace MySystem.Areas.Admin.Controllers
         public JsonResult IndexDataSIMDo(string DateStr)
         {
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
-            Dictionary<string, object> dataInfo = new Dictionary<string, object>();
-            var result = RadioCardHelper.Instance.QueryCardOrderInfo(DateStr, DateStr, "1", "99999");
-            result = result.Replace("null", "\"\"");
-            JsonData jsonObj = JsonMapper.ToObject(result);
-            if (jsonObj["resultCode"].ToString() == "1")
-            {
-                var data = jsonObj["data"]["records"];
-                for (int i = 0; i < data.Count; i++)
+            Dictionary<string, object> obj = new Dictionary<string, object>();
+            if (!string.IsNullOrEmpty(DateStr))
+            {
+                var result = RadioCardHelper.Instance.QueryCardOrderInfo(DateStr, DateStr, "1", "99999");
+                result = result.Replace("null", "\"\"");
+                JsonData jsonObj = JsonMapper.ToObject(result);
+                if (jsonObj["resultCode"].ToString() == "1")
                 {
-                    dataInfo.Add("OrderNo", data[i]["orderNo"].ToString()); //订单编码
-                    dataInfo.Add("CreateDate", data[i]["orderCreateTime"].ToString()); //订单创建时间
-                    dataInfo.Add("PhoneNumber", data[i]["phoneNo"].ToString()); //选择号码
-                    dataInfo.Add("HasFirstCharge", data[i]["firstCharge"].ToString()); //是否有首充
-                    dataInfo.Add("FirstChargeAmount", data[i]["initialChargeAmount"].ToString()); //首充金额(元)
-                    dataInfo.Add("Province", data[i]["province"].ToString()); //号码归属省份
-                    dataInfo.Add("City", data[i]["city"].ToString()); //号码归属地市
-                    dataInfo.Add("ProductName", data[i]["productName"].ToString()); //商品名称
-                    dataInfo.Add("ActiveName", data[i]["promotionName"].ToString()); //促销活动名称
-                    dataInfo.Add("ProductType", data[i]["productTypeName"].ToString()); //商品类型名称
-                    dataInfo.Add("ActualAmount", data[i]["paidInAmount"].ToString()); //实付金额(元)
-                    dataInfo.Add("OrderStatus", data[i]["orderStatus"].ToString()); //订单状态
-                    dataInfo.Add("ActStatus", data[i]["activationStatusName"].ToString()); //激活状态名称
-                    dataInfo.Add("ActDate", data[i]["activationTime"].ToString()); //激活时间
-                    dataInfo.Add("WorkNo", data[i]["jobId"].ToString()); //BOSS员工工号
-                    dataInfo.Add("AccountName", ""); //账号姓名
-                    dataInfo.Add("SimNo", data[i]["iccId"].ToString()); //SIM卡号
-                    dataList.Add(dataInfo);
+                    var data = jsonObj["data"]["records"];
+                    for (int i = 0; i < data.Count; i++)
+                    {
+                        Dictionary<string, object> dataInfo = new Dictionary<string, object>();
+                        dataInfo.Add("orderNo", data[i]["orderNo"].ToString()); //订单编码
+                        dataInfo.Add("orderCreateTime", data[i]["orderCreateTime"].ToString()); //订单创建时间
+                        dataInfo.Add("phoneNo", data[i]["phoneNo"].ToString()); //选择号码
+                        dataInfo.Add("firstCharge", data[i]["firstCharge"].ToString()); //是否有首充
+                        dataInfo.Add("initialChargeAmount", data[i]["initialChargeAmount"].ToString()); //首充金额(元)
+                        dataInfo.Add("province", data[i]["province"].ToString()); //号码归属省份
+                        dataInfo.Add("city", data[i]["city"].ToString()); //号码归属地市
+                        dataInfo.Add("productName", data[i]["productName"].ToString()); //商品名称
+                        dataInfo.Add("promotionName", data[i]["promotionName"].ToString()); //促销活动名称
+                        dataInfo.Add("productTypeName", data[i]["productTypeName"].ToString()); //商品类型名称
+                        dataInfo.Add("paidInAmount", data[i]["paidInAmount"].ToString()); //实付金额(元)
+                        dataInfo.Add("orderStatus", data[i]["orderStatus"].ToString()); //订单状态
+                        dataInfo.Add("activationStatusName", data[i]["activationStatusName"].ToString()); //激活状态名称
+                        dataInfo.Add("activationTime", data[i]["activationTime"].ToString()); //激活时间
+                        dataInfo.Add("jobId", data[i]["jobId"].ToString()); //BOSS员工工号
+                        dataInfo.Add("AccountName", ""); //账号姓名
+                        dataInfo.Add("iccId", data[i]["iccId"].ToString()); //SIM卡号
+                        dataList.Add(dataInfo);
+                    }
                 }
-            }
 
-            Dictionary<string, object> obj = new Dictionary<string, object>();
-            obj.Add("code", 0);
-            obj.Add("msg", "");
-            obj.Add("count", dataList.Count);
-            obj.Add("data", dataList);
+                obj.Add("code", 0);
+                obj.Add("msg", "");
+                obj.Add("count", dataList.Count);
+                obj.Add("data", dataList);
 
-            AddSysLog("0", "TradeRecord", "PreviewGetSimTrade");
-            return Json(obj);
+                AddSysLog("0", "TradeRecord", "PreviewGetSimTrade");
+                return Json(obj);
+            }
+            else
+            {
+                obj.Add("code", 0);
+                obj.Add("msg", "");
+                obj.Add("count", dataList.Count);
+                obj.Add("data", dataList);
+                return Json(obj);
+
+            }
         }
         #endregion
 

+ 1 - 1
Areas/Admin/Views/MainServer/TradeRecord/Index.cshtml

@@ -151,7 +151,7 @@
                             @* <button class="layui-btn" data-type="GetActInfo">
                                 <i class="layui-icon layui-icon-upload layuiadmin-button-btn"></i>获取激活信息
                             </button> *@
-                             <button class="layui-btn" lay-href="/Admin/TradeRecord/IndexDataSIM">
+                             <button class="layui-btn" lay-href="/Admin/TradeRecord/IndexDataSIM?right=@right">
                                 <i class="layui-icon layui-icon-upload layuiadmin-button-btn"></i>获取激活信息
                             </button>
                             }

+ 8 - 14
Areas/Admin/Views/MainServer/TradeRecord/IndexDataSIM.cshtml

@@ -1,8 +1,3 @@
-@{
-    string RightInfo = ViewBag.RightInfo as string;
-    string right = ViewBag.right as string;
-    string DateStr = ViewBag.DateStr as string;
-}
 <!DOCTYPE html>
 <html>
 <head>
@@ -36,23 +31,23 @@
     <div class="layui-fluid">
         <div class="layui-card">
             <div class="layui-form layui-card-header layuiadmin-card-header-auto">
-                <input type="hidden" name="DateStr" value="@DateStr">
                 <div class="layui-form-item">
-                    <div class="layui-form-item">
+                    <div class="layui-inline">
                         <label class="layui-form-label">日期</label>
                         <div class="layui-input-inline">
                             <input class="layui-input" type="text" id="DateStr" name="DateStr"
-                                lay-verify="" autocomplete="off" placeholder="请输入日期">
+                                lay-verify="required|" autocomplete="off" placeholder="请输入日期">
                         </div>
                     </div>
-                    <div class="layui-form-item">
+                    <div class="layui-inline ml50">
                         <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
                             <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>预览
                         </button>
-                    </div>
-                    <div class="layui-form-item">                                          
-                        <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
-                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>执行
+                        @* <button class="layui-btn" data-type="GetActInfo">
+                            <i class="layui-icon layui-icon-upload layuiadmin-button-btn"></i>执行
+                        </button> *@
+                        <button class="layui-btn" lay-submit lay-filter="LAY-list-front-GetSimTradePost">
+                            <i class="layui-icon layui-icon-upload layuiadmin-button-btn"></i>执行
                         </button>
                     </div>
                 </div>
@@ -69,7 +64,6 @@
     <script src="/layuiadmin/layui/layui.js"></script>
     <script src="/layuiadmin/modules_main/TradeRecordSIM_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script>
-        var DateStr = '@DateStr';
     </script>
 </body>
 </html>

+ 43 - 145
wwwroot/layuiadmin/modules_main/TradeRecordSIM_Admin.js

@@ -1,74 +1,3 @@
-var ExcelData;
-function ConfirmImport() {
-    $.ajax({
-        type: "POST",
-        url: "/Admin/TradeRecord/Import?r=" + Math.random(1),
-        data: "ExcelData=" + encodeURIComponent(JSON.stringify(ExcelData)),
-        dataType: "text",
-        success: function (data) {
-            if (data == "success") {
-                layer.msg("导入成功", { time: 2000 }, function () {
-                    window.location.reload();
-                });
-            } else {
-                layer.msg(data);
-            }
-        }
-    });
-}
-
-function ConfirmImportTrade() {
-    $.ajax({
-        type: "POST",
-        url: "/Admin/TradeRecord/ImportTrade?r=" + Math.random(1),
-        data: "ExcelData=" + encodeURIComponent(JSON.stringify(ExcelData)),
-        dataType: "text",
-        success: function (data) {
-            if (data == "success") {
-                layer.msg("导入成功", { time: 2000 }, function () {
-                    window.location.reload();
-                });
-            } else {
-                layer.msg(data);
-            }
-        }
-    });
-}
-
-function CheckImport(table, key, loadindex, index) {
-    $.ajax({
-        url: "/Admin/TradeRecord/CheckImportV2?r=" + Math.random(1),
-        data: "key=" + key,
-        dataType: "json",
-        success: function (data) {
-            console.log(data);
-            if (data.status == 1) {
-                layer.msg("成功操作" + data.data + "条", {
-                    time: 2000
-                }, function () {
-                    layer.close(index); //关闭弹层
-                    layer.close(loadindex);
-                    table.reload('LAY-list-manage'); //数据刷新
-                });
-            } else if (data.status == 2) {
-                layer.close(index); //关闭弹层
-                layer.close(loadindex);
-                var content = '';
-                for (var i = 0; i < data.errList.length; i++) {
-                    content += data.errList[i] + '<br/>'
-                }
-                layer.alert(content);
-            } else {
-                layer.msg(data.data, {
-                    time: 1000
-                }, function () {
-                    CheckImport(table, key, loadindex, index);
-                });
-            }
-        }
-    });
-}
-
 var excel;
 layui.config({
     base: '/layuiadmin/' //静态资源所在路径
@@ -110,31 +39,9 @@ layui.config({
         }
     });
     var layTradeDate = laydate.render({
-        elem: '#TradeDate',
+        elem: '#DateStr',
         trigger: 'click',
         type: 'date',
-        range: true,
-        change: function (value, date, endDate) {
-            var op = true;
-            if (date.year == endDate.year && endDate.month - date.month <= 2) {
-                if (endDate.month - date.month == 2 && endDate.date > date.date) {
-                    op = false;
-                    layTradeDate.hint('日期范围请不要超过2个月');
-                    setTimeout(function () {
-                        $(".laydate-btns-confirm").addClass("laydate-disabled");
-                    }, 1);
-                }
-            } else {
-                op = false;
-                layTradeDate.hint('日期范围请不要超过2个月');
-                setTimeout(function () {
-                    $(".laydate-btns-confirm").addClass("laydate-disabled");
-                }, 1);
-            }
-            if (op) {
-                $('#TradeDate').val(value);
-            }
-        }
     });
 
 
@@ -187,9 +94,6 @@ layui.config({
             , { field: 'activationTime', width: 200, title: '激活时间', sort: true } //激活时间
             , { field: 'jobId', width: 200, title: 'BOSS员工工号', sort: true } //BOSS员工工号
         ]]
-        , where: {
-            DateStr: DateStr
-        }
         , page: true
         , limit: 30
         , height: 'full-' + String($('.layui-card-header').height() + 130)
@@ -213,6 +117,25 @@ layui.config({
         });
     });
 
+    form.on('submit(LAY-list-front-GetSimTradePost)', function (data) {
+        var field = data.field;
+        console.log(field);
+        $.ajax({
+            type: "POST",
+            url: "/Admin/TradeRecord/GetSimTradePost?r=" + Math.random(1),
+            data: "DateStr=" + field.DateStr,
+            dataType: "text",
+            success: function (data) {
+                layer.close(index); //关闭弹层
+                if (data == "success") {
+                    layer.msg("提交成功");
+                } else {
+                    layer.msg(data);
+                }
+            }
+        });
+    });
+
     form.on('submit(LAY-list-front-searchall)', function (data) {
         table.reload('LAY-list-manage', {
             where: null,
@@ -225,57 +148,32 @@ layui.config({
     //事件
     var active = {
         GetActInfo: function () {
-            var perContent = layer.open({
-                type: 2
-                , title: '获取广电卡激活数据'
-                , content: 'GetSimTrade'
-                , maxmin: true
-                , area: ['500px', '450px']
-                , btn: ['确定', '取消']
-                , yes: function (index, layero) {
-                    var iframeWindow = window['layui-layer-iframe' + index]
-                        , submitID = 'LAY-list-front-submit'
-                        , submit = layero.find('iframe').contents().find('#' + submitID);
-
-                    setTimeout(function () {
-                        layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
-                            var errObj = $(this).find('.layui-form-danger');
-                            if (errObj.length > 0) {
-                                iframeWindow.element.tabChange('mytabbar', String(i + 1));
-                                submit.click();
+            var index = layer.confirm('确定要获取吗?', function (index) {
+                //监听提交
+                iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
+                    var field = data.field; //获取提交的字段
+                    var userdata = "";
+                    for (var prop in field) {
+                        userdata += prop + "=" + encodeURIComponent(field[prop]) + "&";
+                    }
+                    //提交 Ajax 成功后,静态更新表格中的数据
+                    //$.ajax({});
+
+                    $.ajax({
+                        type: "POST",
+                        url: "/Admin/TradeRecord/GetSimTradePost?r=" + Math.random(1),
+                        data: userdata,
+                        dataType: "text",
+                        success: function (data) {
+                            layer.close(index); //关闭弹层
+                            if (data == "success") {
+                                layer.msg("提交成功");
+                            } else {
+                                layer.msg(data);
                             }
-                        });
-                    }, 300);
-
-
-                    //监听提交
-                    iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
-                        var field = data.field; //获取提交的字段
-                        var userdata = "";
-                        for (var prop in field) {
-                            userdata += prop + "=" + encodeURIComponent(field[prop]) + "&";
                         }
-                        //提交 Ajax 成功后,静态更新表格中的数据
-                        //$.ajax({});
-
-                        $.ajax({
-                            type: "POST",
-                            url: "/Admin/TradeRecord/GetSimTradePost?r=" + Math.random(1),
-                            data: userdata,
-                            dataType: "text",
-                            success: function (data) {
-                                layer.close(index); //关闭弹层
-                                if (data == "success") {
-                                    layer.msg("提交成功");
-                                } else {
-                                    layer.msg(data);
-                                }
-                            }
-                        });
                     });
-
-                    submit.trigger('click');
-                }
+                });
             });
         }
     };