合并

Areas/Admin/Controllers/MainServer/MachineApplyController.cs

@@ -166,9 +166,9 @@ namespace MySystem.Areas.Admin.Controllers
 
                 //订单状态
                 int Status = int.Parse(dic["Status"].ToString());
-                if(Status == 0) dic["Status"] = "待审核";
-                if(Status == 1) dic["Status"] = "申请成功";
-                if(Status == 2) dic["Status"] = "申请失败";
+                if(Status == 0) dic["StatusName"] = "待审核";
+                if(Status == 1) dic["StatusName"] = "申请成功";
+                if(Status == 2) dic["StatusName"] = "申请失败";
 
                 //提货方式
                 int DeliveryType = int.Parse(dic["DeliveryType"].ToString());
@@ -177,7 +177,7 @@ namespace MySystem.Areas.Admin.Controllers
                 if(DeliveryType == 2) dic["DeliveryType"] = "上门自提";
 
                 //发货状态
-                int SendStatus = int.Parse(dic["SendStatus"].ToString());
+                int SendStatus = int.Parse(dic["Status"].ToString());
                 if(SendStatus == 0) dic["SendStatus"] = "未发货";
                 if(SendStatus == 1) dic["SendStatus"] = "已发货";
                 

Areas/Admin/Controllers/MainServer/StoreMachineApplyController.cs

@@ -625,7 +625,7 @@ namespace MySystem.Areas.Admin.Controllers
                     KqProducts kqProducts = db.KqProducts.FirstOrDefault(m => m.Id == Id);
                     if (item != null)
                     {
-                        if (kqProducts.Name.Contains("大Pos"))
+                        if (kqProducts.Name.Contains("大POS"))
                         {
                             UserAccount userAccount = db.UserAccount.FirstOrDefault(m => m.UserId == apply.UserId);
                             var Amounts = Convert.ToUInt32(item.Num) * 300;

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -244,9 +244,9 @@ namespace MySystem.Areas.Admin.Controllers
                             RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
                             {
                                 UserId = user.Id, //接收创客
+                                MsgType = 2,
                                 Title = "补录成功通知", //标题
-                                // Content = "<div class='f16'>您的 " + kqProducts.Name + " SN:<br/>" + pos.PosSn + "<br/>已经成功补录，请查收。</div>", //内容
-                                Summary = "您的 " + kqProducts.Name + " SN:<br/>" + pos.PosSn + "<br/>已经成功补录，请查收。",
+                                Summary = "您的 " + kqProducts.Name + " SN:" + pos.PosSn + "已经成功补录，请查收。",
                                 CreateDate = DateTime.Now,
 
                             }));
@@ -813,9 +813,9 @@ namespace MySystem.Areas.Admin.Controllers
                     RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
                     {
                         UserId = pos.UserId, //接收创客
+                        MsgType = 2,
                         Title = "商户型代理设置成功", //标题
-                        // Content = "<div class='f16'>您的 " + kqProducts.Name + " SN:<br/>" + pos.PosSn + "<br/>已经成功补录，请查收。</div>", //内容
-                        Summary = "您的 " + kqProducts.Name + " SN:<br/>" + pos.PosSn + "<br/>已经成功给下级代理" + user.RealName + "" + MakerCode + "<br/>，设置为商户型代理，设置成功后的新增交易的分润归商户型代理所有",
+                        Summary = "您的 " + kqProducts.Name + " SN:" + pos.PosSn + "已经成功给下级代理" + user.RealName + "" + MakerCode + "，设置为商户型代理，设置成功后的新增交易的分润归商户型代理所有",
                         CreateDate = DateTime.Now,
 
                     }));
@@ -1358,9 +1358,9 @@ namespace MySystem.Areas.Admin.Controllers
                 RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
                 {
                     UserId = OutStore.UserId, //接收创客
+                    MsgType = 2,
                     Title = "换绑成功通知", //标题
-                    // Content = "<div class='f16'>您的 " + kqProducts.Name + " SN:<br/>" + pos.PosSn + "<br/>已经成功补录，请查收。</div>", //内容
-                    Summary = "您的 " + oldPosBrand.Name + " SN:<br/>" + OldSn + "<br/>已经成功为客户换绑为" + newPosBrand.Name + "SN:<br/>" + NewSn + "<br/>已经成功补录，请查收。",
+                    Summary = "您的 " + oldPosBrand.Name + " SN:" + OldSn + "已经成功为客户换绑为" + newPosBrand.Name + "SN:" + NewSn + "请告知客户进行绑定。",
                     CreateDate = DateTime.Now,
 
                 }));
@@ -1464,9 +1464,9 @@ namespace MySystem.Areas.Admin.Controllers
                 RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
                 {
                     UserId = forMakerCode.UserId, //接收创客
+                    MsgType = 2,
                     Title = "解绑成功通知", //标题
-                    // Content = "<div class='f16'>您的 " + kqProducts.Name + " SN:<br/>" + pos.PosSn + "<br/>已经成功补录，请查收。</div>", //内容
-                    Summary = "" + PosSn + "<br/>机具已成功解绑，当前机具如需绑定同一客户请再2个工作日后再进行绑定，<br/>直接绑定会导致数控异常，相关损失由您本人承担。",
+                    Summary = "" + PosSn + "机具已成功解绑，当前机具如需绑定同一客户请再2个工作日后再进行绑定，直接绑定会导致数控异常，相关损失由您本人承担。",
                     CreateDate = DateTime.Now,
 
                 }));

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

@@ -214,11 +214,17 @@
                     <a class="layui-btn layui-btn-warm layui-btn-xs" lay-event="detail"><i class="layui-icon layui-icon-form"></i>详情</a>
                     @if (RightInfo.Contains("," + right + "_audit,"))
                     {
+                        @* <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="send"><i class="layui-icon layui-icon-edit"></i>审核发货</a> *@
+                        @("{{#if (d.Status == 0){ }}")
                         <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="send"><i class="layui-icon layui-icon-edit"></i>审核发货</a>
+                        @("{{#} }}")
                     }
                     @if (RightInfo.Contains("," + right + "_cancel,"))
                     {
+                        @* <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="cancel"><i class="layui-icon layui-icon-edit"></i>取消订单</a> *@
+                        @("{{#if (d.Status == 0){ }}")
                         <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="cancel"><i class="layui-icon layui-icon-edit"></i>取消订单</a>
+                        @("{{#} }}")
                     }
                 </script>
             </div>

Areas/Admin/Views/MainServer/StoreMachineApply/Edit.cshtml

@@ -61,6 +61,7 @@
                             <fieldset class="layui-elem-field layui-field-title">
                                 <legend>申请信息</legend>
                             </fieldset>
+                            <input type="hidden" id="SendSn" name="SendSn" value="@editData.SendSn">
                             @foreach (Dictionary<string, object> item in KsProductList)
                             {
                                 <div class="layui-form-item">
@@ -72,8 +73,10 @@
                                     </div>
                                     <div class="layui-inline">
                                         <label class="layui-form-label">商品数量：</label>
-                                        <div class="layui-input-inline" style="padding-top: 8px;">
-                                            @item["Num"]
+                                        <div class="layui-input-inline productlist">
+                                            <input type="hiden" name="BrandId" value="@item["BrandId"]">
+                                            <input class="layui-input" type="text" name="ApplyNum" placeholder=""
+                                            autocomplete="off" value="@item["Num"]">
                                         </div>
                                     </div>
                                 </div>

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

@@ -128,7 +128,7 @@
                 <script type="text/html" id="table-list-tools">
                     @if (RightInfo.Contains("," + right + "_edit,"))
                     {
-                        <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>编辑</a>
+                        <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>订单信息</a>
                     }
                     @if (RightInfo.Contains("," + right + "_audit,"))
                     {

wwwroot/layuiadmin/modules_main/MachineApply_Admin.js

@@ -203,7 +203,7 @@ layui.config({
                 title: '收件人姓名-联系电话',
                 sort: true
             }, {
-                field: 'Status',
+                field: 'StatusName',
                 width: 200,
                 title: '订单状态',
                 sort: true

wwwroot/layuiadmin/modules_main/StoreMachineApply_Admin.js

@@ -164,6 +164,19 @@ layui.config({
                         });
                     }, 300);
 
+                    var SendSn = '[';
+                    var ApplyNums = layero.find('iframe').contents().find('.productlist input[type=hidden][name=ApplyNum]');
+                    layero.find('iframe').contents().find('.productlist input[type=hidden][name=BrandId]').each(function (i) {
+                        var BrandId = $(this).val();
+                        var ApplyNum = ApplyNums[i].val();
+                        SendSn += '{"BrandId":' + BrandId + ',"ApplyNum":' + ApplyNum + '}';
+                        if(i < ApplyNums.length - 1) {
+                            SendSn += ',';
+                        }
+                    });
+                    SendSn += ']';
+                    layero.find('iframe').contents().find('#SendSn').val(SendSn);
+
                     //监听提交
                     iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
                         var field = data.field; //获取提交的字段