暂存

Areas/Admin/Controllers/MainServer/OrderRefundController.cs

@@ -38,18 +38,6 @@ namespace MySystem.Areas.Admin.Controllers
         {
             ViewBag.RightInfo = RightInfo;
             ViewBag.right = right;
-
-            string Condition = "";
-            Condition += "Reason:\"" + data.Reason + "\",";
-            Condition += "Mobile:\"" + data.Mobile + "\",";
-            Condition += "GoodStatus:\"" + data.GoodStatus + "\",";
-
-            if (!string.IsNullOrEmpty(Condition))
-            {
-                Condition = Condition.TrimEnd(',');
-                Condition = ", where: {" + Condition + "}";
-            }
-            ViewBag.Condition = Condition;
             return View();
         }
 
@@ -61,24 +49,15 @@ namespace MySystem.Areas.Admin.Controllers
         /// 退款申请列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(OrderRefund data, int page = 1, int limit = 30)
+        public JsonResult IndexData(OrderRefund data, string OrderNo, string CreateDateData, string UserIdMakerCode, int ProductIdSelect, string RefundStatusSelect, int page = 1, int limit = 30)
         {
-            Dictionary<string, string> OrderRefundReasonDic = new OrderDictionary().getOrderRefundReasonDic();
-            Dictionary<string, string> ErpCompanysDic = new OrderDictionary().getErpCompanysDic();
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
-            Fields.Add("Reason", "1"); //退款原因
-            Fields.Add("Mobile", "2"); //申请人手机号
-            Fields.Add("GoodStatus", "1"); //货物状态
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("OrderRefund", Fields, "Id desc", "False", page, limit);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
-                dic["Reason"] = new DictionaryClass().getDictionaryNameByKey(OrderRefundReasonDic, dic["Reason"].ToString());
-                dic["ErpCompany"] = new DictionaryClass().getDictionaryNameByKey(ErpCompanysDic, dic["ErpCompany"].ToString());
-                dic["GoodStatus"] = dic["GoodStatus"].ToString() == "1" ? "未收到货" : "已收到货";
-                dic["Status"] = dic["Status"].ToString() == "1" ? "已处理" : "未处理";
             }
             return Json(obj);
         }

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

@@ -40,32 +40,46 @@ string right = ViewBag.right as string;
             <div class="layui-form layui-card-header layuiadmin-card-header-auto">
                 <div class="layui-form-item">
                     <div class="layui-inline">
-                        <label class="layui-form-label">退款原因</label>
+                        <label class="layui-form-label">创建时间</label>
                         <div class="layui-input-inline">
-                            <select id="Reason" name="Reason" lay-search="">
+                            <input class="layui-input" type="text" readonly name="CreateDateData" id="CreateDate"
+                                placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    @{Dictionary<string, string> ProductsDic = new MySystem.DictionaryClass().getProductsDic();}
+                    <div class="layui-inline">
+                        <label class="layui-form-label">商品</label>
+                        <div class="layui-input-inline">
+                            <select id="ProductIdSelect" name="ProductIdSelect" lay-search="">
                                 <option value="">全部...</option>
-                                @{Dictionary<string, string> OrderRefundReasonDic = new MySystem.OrderDictionary().getOrderRefundReasonDic();}
-                                    @foreach (string key in OrderRefundReasonDic.Keys)
-                                    {
-                                    <option value="@key">@OrderRefundReasonDic[key]</option>
-                                    }
+                                @foreach (string key in ProductsDic.Keys)
+                                {
+                                <option value="@key">@ProductsDic[key]</option>
+                                }
                             </select>
                         </div>
                     </div>
                     <div class="layui-inline">
-                        <label class="layui-form-label">申请人手机号</label>
+                        <label class="layui-form-label">创客编号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="MakerCode" placeholder="创客编号"
+                                autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">订单号</label>
                         <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="Mobile" placeholder="申请人手机号"
+                            <input class="layui-input" type="text" name="OrderNo" placeholder="订单号"
                                 autocomplete="off">
                         </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="GoodStatus" name="GoodStatus" lay-search="">
+                            <select id="RefundStatusSelect" name="RefundStatusSelect" lay-search="">
                                 <option value="">全部...</option>
-                                <option value="1">未收到货</option>
-                                <option value="2">已收到货</option>
+                                <option value="1">余额</option>
+                                <option value="2">支付宝</option>
                             </select>
                         </div>
                     </div>

wwwroot/layuiadmin/modules_main/OrderRefund_Admin.js

@@ -57,7 +57,7 @@ layui.config({
                 url: "/Admin/OrderRefund/Sort?r=" + Math.random(1),
                 data: "Id=" + data.Id + "&Sort=" + value,
                 dataType: "text",
-                success: function (data) {}
+                success: function (data) { }
             });
         }
     });
@@ -66,46 +66,18 @@ layui.config({
     table.render({
         elem: '#LAY-list-manage',
         url: '/Admin/OrderRefund/IndexData' //模拟接口
-            ,
-        cols: [
-            [{
-                type: 'checkbox',
-                fixed: 'left'
-            }, {
-                field: 'Id',
-                fixed: 'left',
-                title: 'ID',
-                width: 80,
-                sort: true,
-                unresize: true
-            }, {
-                field: 'Reason',
-                title: '退款原因',
-                sort: true
-            }, {
-                field: 'Amount',
-                title: '退款金额',
-                sort: true
-            }, {
-                field: 'Mobile',
-                title: '申请人手机号',
-                sort: true
-            }, {
-                field: 'GoodStatus',
-                title: '货物状态',
-                sort: true
-            }, {
-                field: 'Status',
-                title: '申请状态',
-                sort: true
-            }, {
-                title: '操作',
-                width: 150,
-                align: 'center',
-                fixed: 'right',
-                toolbar: '#table-list-tools'
-            }]
-        ],
+        ,
+        cols: [[
+            { type: 'checkbox', fixed: 'left' },
+            { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true },
+            { field: 'OrderNo', width: 200, title: '订单号', sort: true },
+            { field: 'Refund', width: 200, title: '退款原因', sort: true },
+            { field: 'ProductName', width: 200, title: '商品', sort: true },
+            { field: 'Amount', width: 200, title: '退款金额', sort: true },
+            { field: 'RefundType', width: 200, title: '退回方式', sort: true },
+            { field: 'UserInfo', width: 200, title: '创客信息', sort: true },
+            { title: '操作', width: 150, align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
+        ]],
         page: true,
         limit: 30,
         height: 'full-' + String($('.layui-card-header').height() + 130),
@@ -303,7 +275,7 @@ layui.config({
                 maxmin: false,
                 area: ['460px', '180px'],
                 content: $('#excelForm'),
-                cancel: function () {}
+                cancel: function () { }
             });
         },
         ExportExcel: function () {