分单删除

@@ -319,9 +319,32 @@ public class WaybillnomasterController extends BasicController {
     }
     }
 
 
 
 
+    /**
+     * 分单删除
+     *
+     * @param id
+     * @return
+     */
+    @RequestMapping(value = "/subdelete", method = { RequestMethod.POST })
+    @ResponseBody
+    public ResponseModel subdelete(Long id) {
+        ResponseModel model = new ResponseModel();
+        try {
+            preparesecondaryServer.delete(id);
+            model.setStatus(200);
+            model.setMsg(HttpJsonMsg.SUCCESS);
+        } catch (Exception e) {
+            model.setStatus(500);
+            model.setMsg(HttpJsonMsg.ERROR);
+            logger.error("系统异常 >>", e);
+        }
+        return model;
+    }
+
+
     //编辑
     //编辑
-    @RequestMapping(value = "/edit/{id}")
-    public String edit(Model model, @PathVariable("id") Long id){
+    @RequestMapping(value = "/edit")
+    public String edit(Model model, Long id){
         ManifestEntity manifest = null;
         ManifestEntity manifest = null;
         UserEntity user = SessionUtil.getUser();
         UserEntity user = SessionUtil.getUser();
         // 判断是否是便捷
         // 判断是否是便捷

@@ -189,7 +189,7 @@
                                 return res;
                                 return res;
                             }
                             }
                         },
                         },
-                        {field:'..', title:'<spring:message code="opt.operator" />', formatter:preoperatorFormat, width:40}
+                        <%--{field:'..', title:'<spring:message code="opt.operator" />', formatter:preoperatorFormat, width:40}--%>
                     ]],
                     ]],
                     onResize:function(){
                     onResize:function(){
                         $('#dg').datagrid('fixDetailRowHeight',index);
                         $('#dg').datagrid('fixDetailRowHeight',index);
@@ -211,10 +211,10 @@
         return html;
         return html;
     }
     }
 
 
-    //分单撤销按钮
+    //分单撤销
     function preoperatorFormat(val, row, index){
     function preoperatorFormat(val, row, index){
-        var html =  "<a href='javascript:void(0)' style='text-decoration:none;color:blue;'></a>";
-        html+="<a href='javascript:void(0)' style='text-decoration:none;color:blue;margin-left:20px;'></a>";
+        var html =  "<a href='javascript:void(0)' onclick='prebackout("+row.id+")' style='text-decoration:none;color:blue;'><spring:message code='opt.delete'/></a>";
+        // html+="<a href='javascript:void(0)' style='text-decoration:none;color:blue;margin-left:20px;'></a>";
         return html;
         return html;
     }
     }
 
 
@@ -312,8 +312,8 @@
     }
     }
 
 
     function editHbillFormat(val,row,index){
     function editHbillFormat(val,row,index){
-        var html='<a href="javascript:void(0)" style="text-decoration:none;margin-left:20px;color:blue;" onclick="editHbillRow('+row.id+')"><i class="iconfont">&#xe65a;</i></a>';
-// 	        html += '<a href="javascript:void(0)" style="text-decoration:none;margin-left:20px;color:red;" onclick="delHbillRow('+row.id+','+row.mawbId+','+index+')"><i class="iconfont">&#xe661;</i></a>';
+        // var html='<a href="javascript:void(0)" style="text-decoration:none;margin-left:20px;color:blue;" onclick="editHbillRow('+row.id+')"><i class="iconfont">&#xe65a;</i></a>';
+	      var  html = '<a href="javascript:void(0)" style="text-decoration:none;margin-left:20px;color:red;" onclick="delHbillRow('+row.id+','+row.mawbId+','+index+')"><i class="iconfont">&#xe661;</i></a>';
         return html;
         return html;
     }
     }
 
 
@@ -336,7 +336,7 @@
             maxmin : true,
             maxmin : true,
             shadeClose : false, // 点击遮罩关闭层
             shadeClose : false, // 点击遮罩关闭层
             area : [ '450px', '300px' ],
             area : [ '450px', '300px' ],
-            content : '/wbm/edit/'+id
+            content : '<%=basePath %>wbm/edit?id='+id
         });
         });
     }
     }