暂存

Areas/Admin/Controllers/MainServer/MachineApplyController.cs

@@ -104,7 +104,7 @@ namespace MySystem.Areas.Admin.Controllers
             //发货状态
             if (!string.IsNullOrEmpty(SendStatusSelect))
             {
-                condition += " and SendStatus=" + SendStatusSelect;
+                condition += " and Status=" + SendStatusSelect;
             }
             //仓库类型
             if (!string.IsNullOrEmpty(StoreTypeSelect))

wwwroot/layuiadmin/modules_operate/SysAdminOperate_Admin.js

@@ -140,7 +140,7 @@ layui.config({
                 title: '是否过期',
                 sort: true
             }, {
-                field: 'ExpiredDate',
+                field: 'ExpireDate',
                 title: '过期时间',
                 sort: true
             }, {
@@ -404,8 +404,8 @@ layui.config({
                                 if (data == "success") {
                                     table.reload('LAY-list-manage'); //数据刷新
                                 } else {
-                                        layer.close(loadindex); //关闭弹层
-                                        layer.msg(data);
+                                    layer.close(loadindex); //关闭弹层
+                                    layer.msg(data);
                                 }
                             }
                         });
@@ -515,8 +515,8 @@ layui.config({
                                         table.reload('LAY-list-manage'); //数据刷新
                                     });
                                 } else {
-                                        layer.close(loadindex); //关闭弹层
-                                        layer.msg(data);
+                                    layer.close(loadindex); //关闭弹层
+                                    layer.msg(data);
                                 }
                             }
                         });