货主信息 主单修改用户 货主统计

@@ -399,8 +399,7 @@ public class SecurityDeclarationController {
         //生成相对路径
         URL resource = this.getClass().getClassLoader().getResource("/");
         String path = resource.getPath();
-        String w = path.substring(0, path.indexOf("R"));
-        String s = w +"/agent/resource/img/bar_code/"+replace+".png";
+        String s = path +"../../resource/img/bar_code/"+replace+".png";
         //生成条形码
         BarCodeUtil.generateFile(replace, s);
 

+package com.agent.controller.system;
+
+import com.agent.entity.agent.CargoCountEntity;
+import com.agent.entity.system.RoleEntity;
+import com.agent.entity.system.UserEntity;
+import com.agent.service.system.CargoCountService;
+import com.agent.vo.agent.CargoCountVo;
+import com.agent.vo.agent.UserVo;
+import com.framework.core.Servlets;
+import com.plugin.easyui.DataGrid;
+import com.plugin.easyui.EasyPage;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Auther: shenhl
+ * @Date: 2019/6/18 18:07
+ */
+
+@RequestMapping(value = "/cargo")
+@Controller
+public class CargoController {
+
+
+    @Resource
+    CargoCountService cargoCountService;
+
+    @RequestMapping("/list")
+    public String list(){
+        return "cargo/cargo";
+    }
+
+    /**
+     * 查询用户分页
+     * @return
+     */
+    @RequestMapping(value="grid.json")
+    @ResponseBody
+    public DataGrid<CargoCountVo> grid(HttpServletRequest request, EasyPage<CargoCountEntity> pageForm) {
+        Map<String, Object> searchParams = Servlets.getParametersStartingWith(request, "search_");
+        if (!searchParams.containsKey("LIKE_tstype")){
+            searchParams.put("LIKE_tstype", 1);
+        }
+
+
+        pageForm.setSearchParams(searchParams);
+        pageForm.parseData(cargoCountService.getPage(pageForm));
+        DataGrid<CargoCountEntity> cargoCountEntityDataGrid = pageForm.getData();
+
+
+        List<CargoCountVo> cargoCountVos = new ArrayList<>();
+        if(CollectionUtils.isNotEmpty(cargoCountEntityDataGrid.getRows())){
+            for (CargoCountEntity cargo: cargoCountEntityDataGrid.getRows()){
+                CargoCountVo vo = new CargoCountVo();
+                vo.setForshort(cargo.getForshort());
+                vo.setFullname(cargo.getFullname());
+                if ("1".equals(cargo.getTstype())){
+                    vo.setTstype("发货人");
+                }else if ("2".equals(cargo.getTstype())){
+                    vo.setTstype("订舱代理");
+                }else {
+                    vo.setTstype("操作代理");
+                }
+                vo.setContacts(cargo.getContacts());
+                vo.setPhone(cargo.getPhone());
+                vo.setWaybill(cargo.getWaybill());
+                vo.setCustomsstatus(cargo.getCustomsstatus());
+                vo.setFlightno(cargo.getFlightno());
+                vo.setFlightdate(cargo.getFlightdate());
+                vo.setOrig(cargo.getOrig());
+                vo.setDest(cargo.getDest());
+                vo.setPiece(cargo.getPiece());
+                vo.setWeight(cargo.getWeight());
+                vo.setRetext(cargo.getRetext());
+                vo.setLoginname(cargo.getLoginname());
+                vo.setCodes(cargo.getCodes());
+
+                cargoCountVos.add(vo);
+            }
+        }
+
+        DataGrid<CargoCountVo> vos = new DataGrid<>();
+        vos.setRows(cargoCountVos);
+        vos.setTotal(cargoCountEntityDataGrid.getTotal());
+        return vos;
+
+    }
+
+}

+package com.agent.controller.system;
+
+import com.agent.entity.agent.HZSHIPPERINFORMATIONEntity;
+import com.agent.service.system.HzInfoService;
+import com.agent.util.HttpJsonMsg;
+import com.agent.vo.ResponseModel;
+import com.agent.vo.agent.HZSHIPPERINFORMATIONVo;
+import com.framework.core.Servlets;
+import com.framework.util.StringUtils;
+import com.plugin.easyui.DataGrid;
+import com.plugin.easyui.EasyPage;
+import org.apache.commons.collections.CollectionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Auther: shenhl
+ * @Date: 2019/4/17 09:55
+ */
+@RequestMapping(value = "/hzinfo")
+@Controller
+public class HzInfoController {
+
+    private static final Logger logger = LoggerFactory.getLogger(HzInfoController.class);
+
+    @Resource
+    private HzInfoService hzInfoService;
+
+
+    @RequestMapping(value = "/list")
+    public String list(){
+       return  "system/user/hzinfo";
+    }
+
+    @RequestMapping(value = "/choosetHz")
+    public String selectHz(){
+       return  "hz/hzinfo";
+    }
+
+
+
+    @RequestMapping(value = "/add")
+    public String add(){
+        return  "system/user/hzinfo_add";
+    }
+
+    /**
+     * 分页查询
+     * @param request
+     * @param pageForm
+     * @return
+     */
+    @RequestMapping(value = "/grid.json")
+    @ResponseBody
+    public DataGrid<HZSHIPPERINFORMATIONVo> grid(HttpServletRequest request, EasyPage<HZSHIPPERINFORMATIONEntity> pageForm) {
+
+        Map<String, Object> searchParams = Servlets.getParametersStartingWith(request, "search_");
+//        searchParams.put("LIKE_phone","17600319854");
+        searchParams.put("LIKE_delete_flag","1");
+
+        pageForm.setSearchParams(searchParams);
+        pageForm.parseData(hzInfoService.getPage(pageForm));
+        DataGrid<HZSHIPPERINFORMATIONEntity> hzshipperinformationEntityDataGrid = pageForm.getData();
+        List<HZSHIPPERINFORMATIONVo>rows = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(hzshipperinformationEntityDataGrid.getRows())){
+            for (HZSHIPPERINFORMATIONEntity hz: hzshipperinformationEntityDataGrid.getRows()){
+                HZSHIPPERINFORMATIONVo hzvo = new HZSHIPPERINFORMATIONVo();
+                hzvo.setId(hz.getId());
+                hzvo.setForShort(hz.getFor_short());
+                hzvo.setFullName(hz.getFull_name());
+                hzvo.setContacts(hz.getContacts());
+                if ("1".equals(hz.getThe_shipper_type())){
+                    hzvo.setTheShipperType("发货人");
+                }else if ("2".equals(hz.getThe_shipper_type())){
+                    hzvo.setTheShipperType("订舱代理");
+                }else {
+                    hzvo.setTheShipperType("操作代理");
+                }
+
+                hzvo.setPhone(hz.getPhone());
+                hzvo.setDeleteFlag(hz.getDelete_flag());
+
+                rows.add(hzvo);
+            }
+        }
+        DataGrid<HZSHIPPERINFORMATIONVo> vos = new DataGrid<>();
+        vos.setRows(rows);
+        vos.setTotal(hzshipperinformationEntityDataGrid.getTotal());
+        return vos;
+    }
+
+    /**
+     * 添加
+     * @param hz
+     * @param request
+     * @return
+     */
+    @RequestMapping("/save")
+    @ResponseBody
+    public ResponseModel save(HZSHIPPERINFORMATIONEntity hz, HttpServletRequest request){
+       ResponseModel model = new ResponseModel();
+       //获取对象值
+       String forshort = request.getParameter("forshort");
+       String fullname = request.getParameter("fullname");
+       //发货人
+       String one = request.getParameter("one");
+       //订舱代理
+       String two = request.getParameter("two");
+       //操作代理
+       String three = request.getParameter("three");
+       String contacts = request.getParameter("contacts");
+       String phone = request.getParameter("phone");
+
+        List<String> list = new ArrayList<>();
+        if (!StringUtils.isBlank(one)){
+           list.add(one);
+        }
+        if (!StringUtils.isBlank(two)){
+           list.add(two);
+        }
+        if (!StringUtils.isBlank(three)){
+           list.add(three);
+        }
+
+
+        for (String type: list){
+            switch (type) {
+                case "1":
+                    if (hzInfoService.forShortShipperType(forshort, "1") == 0) {
+
+                        HZSHIPPERINFORMATIONEntity hzshipperinformationEntity = new HZSHIPPERINFORMATIONEntity();
+
+                        hzshipperinformationEntity.setFor_short(forshort);
+                        hzshipperinformationEntity.setFull_name(fullname);
+                        hzshipperinformationEntity.setThe_shipper_type("1");
+                        hzshipperinformationEntity.setContacts(contacts);
+                        hzshipperinformationEntity.setPhone(phone);
+                        hzshipperinformationEntity.setDelete_flag("1");
+                        hzInfoService.save(hzshipperinformationEntity);
+                        model.setStatus(200);
+                        continue;
+                    }else {
+                        model.setStatus(201);
+                        break;
+                    }
+                case "2":
+                    if (hzInfoService.forShortShipperType(forshort, "2") == 0) {
+                        HZSHIPPERINFORMATIONEntity hzshipperinformationEntity = new HZSHIPPERINFORMATIONEntity();
+                        hzshipperinformationEntity.setFor_short(forshort);
+                        hzshipperinformationEntity.setFull_name(fullname);
+                        hzshipperinformationEntity.setThe_shipper_type("2");
+                        hzshipperinformationEntity.setContacts(contacts);
+                        hzshipperinformationEntity.setPhone(phone);
+                        hzshipperinformationEntity.setDelete_flag("1");
+                        hzInfoService.save(hzshipperinformationEntity);
+                        model.setStatus(200);
+                        continue;
+                    }else {
+                        model.setStatus(201);
+                        break;
+                    }
+                case "3":
+                    if (hzInfoService.forShortShipperType(forshort, "3") == 0) {
+                        HZSHIPPERINFORMATIONEntity hzshipperinformationEntity = new HZSHIPPERINFORMATIONEntity();
+                        hzshipperinformationEntity.setFor_short(forshort);
+                        hzshipperinformationEntity.setFull_name(fullname);
+                        hzshipperinformationEntity.setThe_shipper_type("3");
+                        hzshipperinformationEntity.setContacts(contacts);
+                        hzshipperinformationEntity.setPhone(phone);
+                        hzshipperinformationEntity.setDelete_flag("1");
+                        hzInfoService.save(hzshipperinformationEntity);
+                        model.setStatus(200);
+                        continue;
+                    }else {
+                        model.setStatus(201);
+                        break;
+                    }
+            }
+        }
+        return model;
+
+    }
+
+    /**
+     * 删除
+     *
+     * @param ids
+     * @return
+     */
+    @RequestMapping(value = "/delete", method = { RequestMethod.POST })
+    @ResponseBody
+    public ResponseModel delete(String ids) {
+        ResponseModel model = new ResponseModel();
+        try {
+            hzInfoService.deletes(ids);
+            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" }, method = {RequestMethod.GET })
+    public String edit(Long id, Model model) {
+        if (id != null) {
+            HZSHIPPERINFORMATIONEntity hz = hzInfoService.findOne(id);
+            model.addAttribute("entity", hz);
+        }
+        return "system/user/hzinfo_edit";
+    }
+
+    /**
+     * 修改
+     * @param hz
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public ResponseModel update(HZSHIPPERINFORMATIONEntity hz, HttpServletRequest request){
+        ResponseModel responseModel = new ResponseModel();
+
+        if (hzInfoService.forShortShipperType(hz.getFor_short(), hz.getThe_shipper_type())==0){
+            hz.setDelete_flag("1");
+            int update = hzInfoService.update(hz);
+            if (update>0){
+                responseModel.setStatus(200);
+            }else {
+                responseModel.setStatus(202);
+            }
+        }else {
+            responseModel.setStatus(201);
+        }
+        return responseModel;
+    }
+
+}

+package com.agent.controller.system;
+
+import com.agent.controller.BasicController;
+import com.agent.entity.agent.BasicAgentEntity;
+import com.agent.entity.agent.ManifestEntity;
+import com.agent.entity.agent.PreparesecondaryEntity;
+import com.agent.entity.system.UserEntity;
+import com.agent.service.agent.BasicAgentService;
+import com.agent.service.agent.ManifestService;
+import com.agent.service.agent.PreparesecondaryService;
+import com.agent.service.system.UserService;
+import com.agent.util.HttpJsonMsg;
+import com.agent.vo.ResponseModel;
+import com.agent.vo.agent.ManifestVo;
+import com.framework.core.Servlets;
+import com.framework.shiro.SessionUtil;
+import com.plugin.easyui.DataGrid;
+import com.plugin.easyui.EasyPage;
+import org.apache.shiro.SecurityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import tools.Tools;
+import tools.oclass.FemyList;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * @Auther: shenhl
+ * @Date: 2019/3/15 09:52
+ */
+@Controller
+@RequestMapping(value = "/wbm")
+public class WaybillnomasterController extends BasicController {
+
+    private static final Logger logger = LoggerFactory.getLogger(com.agent.controller.agent.ManifestController.class);
+
+    public static boolean isSuccess = false;
+
+    @Resource
+    private ManifestService manifestService;
+
+    @Resource
+    private PreparesecondaryService preparesecondaryServer;
+
+    @Resource
+    private BasicAgentService agentService;
+
+    @Resource
+    private UserService userService;
+
+
+    @RequestMapping(value="/list")
+    public String list() {
+        return "system/user/wbm";
+    }
+
+
+    /**
+     * 查询分页数据
+     *
+     * @return
+     */
+    @RequestMapping(value = "/grid.json")
+    @ResponseBody
+    public DataGrid<ManifestVo> grid(HttpServletRequest request, EasyPage<ManifestEntity> pageForm) {
+        Map<String, Object> searchParams = Servlets.getParametersStartingWith(request, "search_");
+        // searchParams.put("EQ_isdelete", 0);
+        pageForm.setSearchParams(searchParams);
+        // UserEntity ue =
+        // (UserEntity)SecurityUtils.getSubject().getSession().getAttribute("user");
+        UserEntity ue = (UserEntity) SecurityUtils.getSubject().getSession().getAttribute("user");
+        if (ue != null) {
+            Long u = ue.getId();
+            Set<String> sk = pageForm.getSearchParams().keySet();
+
+            if (Tools.getUserId() != null && Tools.getUserId() != 1) {
+                // 不是管理员,添加用户id的条件
+                pageForm.getSearchParams().put("EQ_USER_ID", u);
+            }
+        }
+
+        pageForm.parseData(manifestService.getPage(pageForm));
+        //
+        DataGrid<ManifestEntity> manis = pageForm.getData();
+        List<ManifestVo> manifestVos  = new ArrayList<>();
+        for (ManifestEntity mani : manis.getRows()){
+            ManifestVo manifestVo = new ManifestVo();
+            manifestVo.setId(mani.getId());
+            manifestVo.setUnlodingcode(mani.getUnlodingcode());
+            manifestVo.setCnecusid(mani.getCnecusid());
+            manifestVo.setShpcusid(mani.getShpcusid());
+            manifestVo.setShpaeo(mani.getShpaeo());
+            manifestVo.setCneaeo(mani.getCneaeo());
+            manifestVo.setFlightno(mani.getFlightno());
+            manifestVo.setFlightdate(mani.getFlightdate());
+            manifestVo.setOriginatingstation(mani.getOriginatingstation());
+            manifestVo.setDestinationstation(mani.getDestinationstation());
+            manifestVo.setWaybillnomaster(mani.getWaybillnomaster());
+            manifestVo.setTotalweight(mani.getTotalweight());
+            manifestVo.setTotalpiece(mani.getTotalpiece());
+            manifestVo.setPreparetotalpiece(mani.getPreparetotalpiece());
+            manifestVo.setPreparetotalweight(mani.getPreparetotalweight());
+            manifestVo.setAgentcompanycode(mani.getAgentcompanycode());
+            manifestVo.setStowagedate(mani.getStowagedate());
+            manifestVo.setStatus(mani.getStatus());
+            manifestVo.setCarrier(mani.getCarrier());
+            manifestVo.setCustomsstatus(mani.getCustomsstatus());
+            manifestVo.setPaymode(mani.getPaymode());
+            manifestVo.setSpecialgoodscode(mani.getSpecialgoodscode());
+            manifestVo.setCustomscode(mani.getCustomscode());
+            manifestVo.setAgentman(mani.getAgentman());
+            manifestVo.setAgentcompany(mani.getAgentcompany());
+            manifestVo.setReceiptinformation(mani.getReceiptinformation());
+            manifestVo.setCreatedate(mani.getCreatedate());
+            manifestVo.setProductname(mani.getProductname());
+            manifestVo.setUnnumber(mani.getUnnumber());
+            manifestVo.setCategory(mani.getCategory());
+            manifestVo.setSh_company(mani.getSh_company());
+            manifestVo.setSh_address(mani.getSh_address());
+            manifestVo.setSh_zipcode(mani.getSh_zipcode());
+            manifestVo.setSh_city(mani.getSh_city());
+            manifestVo.setSh_deltaname(mani.getSh_deltaname());
+            manifestVo.setSh_country(mani.getSh_country());
+            manifestVo.setSh_telephone(mani.getSh_telephone());
+            manifestVo.setSh_fax(mani.getSh_fax());
+            manifestVo.setSh_name(mani.getSh_name());
+            manifestVo.setCo_company(mani.getCo_company());
+            manifestVo.setCo_address(mani.getCo_address());
+            manifestVo.setCo_zipcode(mani.getCo_zipcode());
+            manifestVo.setCo_city(mani.getCo_city());
+            manifestVo.setCo_deltaname(mani.getCo_deltaname());
+            manifestVo.setCo_country(mani.getCo_country());
+            manifestVo.setCo_telephone(mani.getCo_telephone());
+            manifestVo.setCo_fax(mani.getCo_fax());
+            manifestVo.setCo_name(mani.getCo_name());
+            manifestVo.setReach_station(mani.getReach_station());
+            manifestVo.setCarrier1(mani.getCarrier1());
+            manifestVo.setReach_station1(mani.getReach_station1());
+            manifestVo.setCarrier2(mani.getCarrier2());
+            manifestVo.setReach_station2(mani.getReach_station2());
+            manifestVo.setName_ofgoods(mani.getName_ofgoods());
+            manifestVo.setDelivery_station(mani.getDelivery_station());
+            manifestVo.setSh_provincecode(mani.getSh_provincecode());
+            manifestVo.setSh_provincename(mani.getSh_provincename());
+            manifestVo.setDe_number(mani.getDe_number());
+            manifestVo.setDe_weight(mani.getDe_weight());
+            manifestVo.setDe_chweight(mani.getDe_chweight());
+            manifestVo.setDe_size(mani.getDe_size());
+            manifestVo.setDe_volume(mani.getDe_volume());
+            manifestVo.setDe_type(mani.getDe_type());
+            manifestVo.setDe_trstation(mani.getDe_trstation());
+            manifestVo.setDe_packing(mani.getDe_packing());
+            manifestVo.setDe_remarks(mani.getDe_remarks());
+            manifestVo.setDe_ids(mani.getDe_ids());
+            manifestVo.setResponse_code(mani.getResponse_code());
+            manifestVo.setResponse_text(mani.getResponse_text());
+            manifestVo.setSave_time(mani.getSave_time());
+            manifestVo.setUSER_ID(mani.getUSER_ID());
+
+            if(mani.getUSER_ID() != null){
+                UserEntity one = userService.findOne(mani.getUSER_ID());
+                manifestVo.setLoginaccount(one.getLoginaccount());
+                BasicAgentEntity one1 = agentService.findOne(one.getAgent());
+                manifestVo.setAgentCode(one1.getThreeCode());
+            }
+            manifestVos.add(manifestVo);
+        }
+        DataGrid<ManifestVo> vo  = new DataGrid<>();
+        vo.setRows(manifestVos);
+        vo.setTotal(manis.getTotal());
+//		return pageForm.getData();
+        return vo;
+    }
+
+    /**
+     *  模糊查询匹配信息
+     * @param id
+     * @param model
+     * @return
+     */
+    @RequestMapping(value = "/infor")
+    @ResponseBody
+    public List<ManifestEntity> infor(String id, Model model) {
+        List<ManifestEntity> li = null;
+        if (Tools.getUserId() != null && Tools.getUserId().longValue() == 1) {
+            li = manifestService.queryAll();
+        } else {
+            li = manifestService.queryByUserId(Tools.getUserId());
+        }
+
+        List<ManifestEntity> result = new FemyList();
+        for (ManifestEntity me : li) {
+            if (result.contains(me)) {
+            } else {
+                result.add(me);
+            }
+        }
+        return result;
+    }
+
+    /**
+     * 模糊查询匹配信息
+     * @param id
+     * @param model
+     * @return
+     */
+    @RequestMapping(value = "/inforPre")
+    @ResponseBody
+    public List<PreparesecondaryEntity> inforPre(String id, Model model) {
+        List<PreparesecondaryEntity> li = preparesecondaryServer.queryByUserId(Tools.getUserId());
+        List<PreparesecondaryEntity> result = new FemyList();
+        for (PreparesecondaryEntity pe : li) {
+            if (result.contains(pe)) {
+
+            } else {
+                result.add(pe);
+            }
+        }
+        return result;
+    }
+
+    /**
+     * 查询分制单分页数据
+     *
+     * @return
+     */
+    @RequestMapping(value = "/sub/grid.json")
+    @ResponseBody
+    public DataGrid<PreparesecondaryEntity> gridSub(Long mawbId, HttpServletRequest request) {
+        DataGrid<PreparesecondaryEntity> dg = new DataGrid<>();
+        dg.setRows(preparesecondaryServer.findByMawbId(mawbId));
+        return dg;
+    }
+
+
+    /**
+     * 删除
+     *
+     * @param ids
+     * @return
+     */
+    @RequestMapping(value = "/delete", method = { RequestMethod.POST })
+    @ResponseBody
+    public ResponseModel delete(String ids) {
+        ResponseModel model = new ResponseModel();
+        try {
+            manifestService.trueDeleteAll(ids);
+            model.setStatus(200);
+            model.setMsg(HttpJsonMsg.SUCCESS);
+        } catch (Exception e) {
+            e.printStackTrace();
+            model.setStatus(500);
+            model.setMsg(HttpJsonMsg.ERROR);
+            logger.error("系统异常 >>", e);
+        }
+        return model;
+    }
+
+
+    /**
+     * 分单删除
+     *
+     * @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")
+    public String edit(Model model, Long id){
+        ManifestEntity manifest = null;
+        UserEntity user = SessionUtil.getUser();
+        // 判断是否是便捷
+        if (id != null) {
+            manifest = manifestService.findOne(id);
+            user = userService.findOne(manifest.getUSER_ID());
+        }
+        List<UserEntity> laList = userService.findAll();
+        //全部用户账户号
+        model.addAttribute("userList", laList);
+        //主单号id
+        model.addAttribute("manifest",manifest);
+        model.addAttribute("wbm", user);
+        return "system/user/wbm_edit";
+    }
+
+    //修改
+    @RequestMapping(value = "/userUpdate")
+    @ResponseBody
+    public ResponseModel userUpdate(@RequestParam("ids") Long ids,
+                                    @RequestParam("userId") Long userId,
+                                    @RequestParam("loginaccount") String loginaccount){
+        ResponseModel rm = new ResponseModel(200,"",null);
+
+        try {
+            UserEntity user = userService.findLoginaccount(loginaccount);
+            if (user.getId() != null){
+                manifestService.userUpdate(user.getId(), ids);
+                rm.setStatus(200);
+            }else {
+                rm.setStatus(500);
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            rm.setStatus(500);
+        }
+
+        return rm;
+    }
+
+
+}

+package com.agent.entity.agent;
+
+import com.agent.entity.IdEntity;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.util.Date;
+
+/**
+ * @Auther: shenhl
+ * @Date: 2019/6/18 19:02
+ */
+@Entity
+@Table(name = "cargo_count")
+public class CargoCountEntity extends IdEntity{
+
+    /**
+     * 简称
+     */
+    private String forshort;
+    /**
+     * 货主名称
+     */
+    private String fullname;
+    /**
+     * 货主类型
+     */
+    private String tstype;
+    /**
+     * 联系人
+     */
+    private String contacts;
+    /**
+     * 电话
+     */
+    private String phone;
+    /**
+     * 主单号
+     */
+    private String waybill;
+    /**
+     * 海关关区
+     */
+    private String customsstatus;
+    /**
+     * 航班号
+     */
+    private String flightno;
+    /**
+     * 航班日期
+     */
+    private Date flightdate;
+    /**
+     * 起始站
+     */
+    private String orig;
+    /**
+     * 目的站
+     */
+    private String dest;
+    /**
+     * 件数
+     */
+    private String piece;
+    /**
+     * 重量
+     */
+    private String weight;
+    /**
+     * 回执信息
+     */
+    private String retext;
+    /**
+     * 用户登录名称
+     */
+    private String loginname;
+    /**
+     * 货代信息
+     */
+    private String codes;
+
+    public String getForshort() {
+        return forshort;
+    }
+
+    public void setForshort(String forshort) {
+        this.forshort = forshort;
+    }
+
+    public String getFullname() {
+        return fullname;
+    }
+
+    public void setFullname(String fullname) {
+        this.fullname = fullname;
+    }
+
+    public String getTstype() {
+        return tstype;
+    }
+
+    public void setTstype(String tstype) {
+        this.tstype = tstype;
+    }
+
+    public String getContacts() {
+        return contacts;
+    }
+
+    public void setContacts(String contacts) {
+        this.contacts = contacts;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getWaybill() {
+        return waybill;
+    }
+
+    public void setWaybill(String waybill) {
+        this.waybill = waybill;
+    }
+
+    public String getCustomsstatus() {
+        return customsstatus;
+    }
+
+    public void setCustomsstatus(String customsstatus) {
+        this.customsstatus = customsstatus;
+    }
+
+    public String getFlightno() {
+        return flightno;
+    }
+
+    public void setFlightno(String flightno) {
+        this.flightno = flightno;
+    }
+
+    public Date getFlightdate() {
+        return flightdate;
+    }
+
+    public void setFlightdate(Date flightdate) {
+        this.flightdate = flightdate;
+    }
+
+    public String getOrig() {
+        return orig;
+    }
+
+    public void setOrig(String orig) {
+        this.orig = orig;
+    }
+
+    public String getDest() {
+        return dest;
+    }
+
+    public void setDest(String dest) {
+        this.dest = dest;
+    }
+
+    public String getPiece() {
+        return piece;
+    }
+
+    public void setPiece(String piece) {
+        this.piece = piece;
+    }
+
+    public String getWeight() {
+        return weight;
+    }
+
+    public void setWeight(String weight) {
+        this.weight = weight;
+    }
+
+    public String getRetext() {
+        return retext;
+    }
+
+    public void setRetext(String retext) {
+        this.retext = retext;
+    }
+
+    public String getLoginname() {
+        return loginname;
+    }
+
+    public void setLoginname(String loginname) {
+        this.loginname = loginname;
+    }
+
+    public String getCodes() {
+        return codes;
+    }
+
+    public void setCodes(String codes) {
+        this.codes = codes;
+    }
+}

+package com.agent.repository.system;
+
+import com.agent.entity.agent.CargoCountEntity;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+/**
+ * @Auther: shenhl
+ * @Date: 2019/6/18 19:15
+ */
+public interface CargoCountRepository extends PagingAndSortingRepository<CargoCountEntity, Long>,
+        JpaSpecificationExecutor<CargoCountEntity> {
+}

@@ -34,4 +34,11 @@ public interface UserRepository extends PagingAndSortingRepository<UserEntity, L
     @Modifying(clearAutomatically=true)
     @Query(value = "UPDATE SYS_USER SET password=?1 where loginaccount=?2", nativeQuery = true)
     public void updatePassword(String password, String loginacount);
+
+    @Query(value = "SELECT * FROM sys_user", nativeQuery = true)
+    List<UserEntity> findAlls();
+
+    @Query(value = "select * from sys_user where LOGINACCOUNT = ?1", nativeQuery = true)
+    UserEntity findLoginaccount(String loginaccount);
+
 }

+package com.agent.service.system;
+
+import com.agent.entity.agent.CargoCountEntity;
+import com.agent.repository.system.CargoCountRepository;
+import com.agent.service.BasicService;
+import com.plugin.easyui.EasyPage;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * @Auther: shenhl
+ * @Date: 2019/6/18 19:13
+ */
+@Service
+public class CargoCountService extends BasicService<CargoCountEntity> {
+
+
+    @Resource
+    CargoCountRepository cargoCountRepository;
+
+    /**
+     * 分页查询
+     *
+     * @param pageForm 分页对象
+     * @return 包含分页信息和数据的分页对象
+     */
+    public Page<CargoCountEntity> getPage(EasyPage<CargoCountEntity> pageForm) {
+
+        PageRequest pageRequest = buildPageRequest(pageForm);
+        Specification<CargoCountEntity> spec = buildSpecification(pageForm);
+        Page<CargoCountEntity> page = cargoCountRepository.findAll(spec, pageRequest);
+        return page;
+    }
+
+}

@@ -40,6 +40,14 @@ public class UserService extends BasicService<UserEntity> {
     }
 
     /**
+     * 查询所有用户
+     */
+    public List<UserEntity> findAll(){
+
+        return userDao.findAlls();
+    }
+
+    /**
      * 根据id 查询
      *
      * @param id
@@ -138,4 +146,9 @@ public class UserService extends BasicService<UserEntity> {
     	//System.out.println("update loginaaccount and password:"+logincount+" "+password);
     	userDao.updatePassword(password, logincount);
     }
+
+    //查询该用户是否存在
+    public UserEntity findLoginaccount(String loginaccount){
+        return userDao.findLoginaccount(loginaccount);
+    }
 }

 package com.agent.util;
 
 import cn.jiguang.common.utils.StringUtils;
-import org.krysalis.barcode4j.impl.code39.Code39Bean;
+import org.krysalis.barcode4j.impl.code128.Code128Bean;
 import org.krysalis.barcode4j.output.bitmap.BitmapCanvasProvider;
 import org.krysalis.barcode4j.tools.UnitConv;
 
@@ -53,16 +53,17 @@ public class BarCodeUtil {
             return;
         }
 
-        Code39Bean bean = new Code39Bean();
+//        Code39Bean bean = new Code39Bean();
+        Code128Bean bean = new Code128Bean();
 
         // 精细度
         final int dpi = 150;
         // module宽度
-        final double moduleWidth = UnitConv.in2mm(1.0f / dpi);
+        final double moduleWidth = UnitConv.in2mm(2.0f / dpi);
 
         // 配置对象
         bean.setModuleWidth(moduleWidth);
-        bean.setWideFactor(3);
+//        bean.setWideFactor(3);
         bean.doQuietZone(false);
 
         String format = "image/png";
@@ -84,11 +85,11 @@ public class BarCodeUtil {
 
 
 
-//    public static void main(String[] args) {
-//        String msg = "172-27295203";
-//        String path = "D:/shangyou/agent/barcode.png";
-//        File file = generateFile(msg, path);
-//        System.out.println(file);
-//    }
+    public static void main(String[] args) {
+        String msg = "17227295203";
+        String path = "D:/barcode.png";
+        File file = generateFile(msg, path);
+        System.out.println(file);
+    }
 
 }

+package com.agent.vo.agent;
+
+import java.util.Date;
+
+/**
+ * @Auther: shenhl
+ * @Date: 2019/6/18 19:19
+ */
+public class CargoCountVo {
+
+    /**
+     * 简称
+     */
+    private String forshort;
+    /**
+     * 货主名称
+     */
+    private String fullname;
+    /**
+     * 货主类型
+     */
+    private String tstype;
+    /**
+     * 联系人
+     */
+    private String contacts;
+    /**
+     * 电话
+     */
+    private String phone;
+    /**
+     * 主单号
+     */
+    private String waybill;
+    /**
+     * 海关关区
+     */
+    private String customsstatus;
+    /**
+     * 航班号
+     */
+    private String flightno;
+    /**
+     * 航班日期
+     */
+    private Date flightdate;
+    /**
+     * 起始站
+     */
+    private String orig;
+    /**
+     * 目的站
+     */
+    private String dest;
+    /**
+     * 件数
+     */
+    private String piece;
+    /**
+     * 重量
+     */
+    private String weight;
+    /**
+     * 回执信息
+     */
+    private String retext;
+    /**
+     * 用户登录名称
+     */
+    private String loginname;
+    /**
+     * 货代信息
+     */
+    private String codes;
+
+    /**
+     * 总件数
+     * @return
+     */
+    private int totalpiec;
+
+    /**
+     * 总重量
+     * @return
+     */
+    private int totalweight;
+
+    public int getTotalpiec() {
+        return totalpiec;
+    }
+
+    public void setTotalpiec(int totalpiec) {
+        this.totalpiec = totalpiec;
+    }
+
+    public int getTotalweight() {
+        return totalweight;
+    }
+
+    public void setTotalweight(int totalweight) {
+        this.totalweight = totalweight;
+    }
+
+    public String getForshort() {
+        return forshort;
+    }
+
+    public void setForshort(String forshort) {
+        this.forshort = forshort;
+    }
+
+    public String getFullname() {
+        return fullname;
+    }
+
+    public void setFullname(String fullname) {
+        this.fullname = fullname;
+    }
+
+    public String getTstype() {
+        return tstype;
+    }
+
+    public void setTstype(String tstype) {
+        this.tstype = tstype;
+    }
+
+    public String getContacts() {
+        return contacts;
+    }
+
+    public void setContacts(String contacts) {
+        this.contacts = contacts;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getWaybill() {
+        return waybill;
+    }
+
+    public void setWaybill(String waybill) {
+        this.waybill = waybill;
+    }
+
+    public String getCustomsstatus() {
+        return customsstatus;
+    }
+
+    public void setCustomsstatus(String customsstatus) {
+        this.customsstatus = customsstatus;
+    }
+
+    public String getFlightno() {
+        return flightno;
+    }
+
+    public void setFlightno(String flightno) {
+        this.flightno = flightno;
+    }
+
+    public Date getFlightdate() {
+        return flightdate;
+    }
+
+    public void setFlightdate(Date flightdate) {
+        this.flightdate = flightdate;
+    }
+
+    public String getOrig() {
+        return orig;
+    }
+
+    public void setOrig(String orig) {
+        this.orig = orig;
+    }
+
+    public String getDest() {
+        return dest;
+    }
+
+    public void setDest(String dest) {
+        this.dest = dest;
+    }
+
+    public String getPiece() {
+        return piece;
+    }
+
+    public void setPiece(String piece) {
+        this.piece = piece;
+    }
+
+    public String getWeight() {
+        return weight;
+    }
+
+    public void setWeight(String weight) {
+        this.weight = weight;
+    }
+
+    public String getRetext() {
+        return retext;
+    }
+
+    public void setRetext(String retext) {
+        this.retext = retext;
+    }
+
+    public String getLoginname() {
+        return loginname;
+    }
+
+    public void setLoginname(String loginname) {
+        this.loginname = loginname;
+    }
+
+    public String getCodes() {
+        return codes;
+    }
+
+    public void setCodes(String codes) {
+        this.codes = codes;
+    }
+}

+<%--
+  Created by IntelliJ IDEA.
+  User: lenovo
+  Date: 2019/3/15
+  Time: 9:33
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%
+    String path = request.getContextPath();
+    String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
+%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link href="<%=basePath %>resource/css/base.css" rel="stylesheet">
+    <link rel="stylesheet" href="<%=basePath %>resource/easyui/uimaker/easyui.css">
+    <link rel="stylesheet" type="text/css" href="<%=basePath %>resource/easyui/uimaker/icon.css">
+    <link rel="stylesheet" href="<%=basePath %>resource/css/providers.css">
+
+    <link rel="stylesheet" href="<%=basePath%>resource/layui/css/layui.css" media="all">
+    <script type="text/javascript" src="<%=basePath%>resource/easyui/jquery.min.js"></script>
+    <script type="text/javascript" src="<%=basePath%>resource/layer-v3.0.3/layer/layer.js"></script>
+    <script type="text/javascript" src="<%=basePath%>resource/layui/layui.js"></script>
+
+</head>
+<body>
+<div class="container">
+    <div data-options="closable:true">
+        <table id="dg" style="width:100%;" title="<spring:message code="wbm.list"/>"
+               data-options="
+                rownumbers:true,
+                singleSelect:false,
+                autoRowHeight:false,
+                pagination:true,
+                fitColumns:true,
+                striped:true,
+                collapsible:true,
+                toolbar:'#tb',
+                pageSize:10">
+            <thead>
+            <tr>
+                <%--<th field="."  formatter="editFormat"><spring:message code="opt.edit" /></th>--%>
+                <th field="loginname"><spring:message code="manifest.loginaccount"/></th>
+                <th field="codes"><spring:message code="manifest.agentCode"/></th>
+                <th field="contacts">联系人</th>
+                <th field="phone">电话</th>
+                <th field="tstype">货主类型</th>
+                <th field="fullname">货主名称</th>
+                <th field="forshort">货主简称</th>
+                <th field="waybill" sortable="true"><spring:message code="manifest.bill.number"/></th>
+                <th field="customsstatus"><spring:message code="manifest.customs"/></th>
+                <th field="flightno"><spring:message code="manifest.flight.number"/></th>
+                <th field="flightdate" formatter="formatFlightDate"><spring:message code="manifest.flight.date"/></th>
+                <th field="orig"><spring:message code="manifest.starting.point"/></th>
+                <th field="dest"><spring:message code="manifest.destination"/></th>
+                <th id="tpie" field="piece"><spring:message code="manifest.number.of.fittings"/></th>
+                <th id="twei" field="weight"><spring:message code="manifest.pre.weight"/></th>
+                <th field="retext" formatter="checkResponseText" width="200"><spring:message code="manifest.response_text" /></th>
+                <%--<th field=".." formatter="operatorFormat"><spring:message code="opt.operator" /></th>--%>
+            </tr>
+            </thead>
+        </table>
+        <div id="tb" style="padding:0 30px;"><input type="hidden" id="idcc">
+            <form id="searchForm">
+                <table class="search_form_table">
+                    <select name="search_LIKE_tstype" id="tstype" style="width:166px;height:35px;line-height:35px;" >
+                        <option value="1">发货人</option>
+                        <option value="2">订舱代理</option>
+                        <option value="3">操作代理</option>
+                    </select>
+                    <a href="javascript:doSearch()" class="easyui-linkbutton" iconCls="icon-search" data-options="selected:true"><spring:message code="opt.search" /></a>
+                </table>
+            </form>
+
+            总件数：<span id = "totalpiec"></span>
+            总重量：<span id = "totalweight"></span>
+        </div>
+    </div>
+
+</div>
+<script type="text/javascript" src="<%=basePath %>resource/easyui/jquery.min.js"></script>
+<script type="text/javascript" src="<%=basePath %>resource/easyui/jquery.easyui.min.js"></script>
+<script type="text/javascript" src="<%=basePath %>resource/easyui/easyui-lang-${pageContext.response.locale}.js"></script>
+<script type="text/javascript" src="<%=basePath %>resource/easyui/datagrid-detailview.js"></script>
+<script type="text/javascript" src="<%=basePath %>resource/js/tools.js?version=${version}"></script>
+<!--弹出层引入的JS-->
+<script type="text/javascript" src="<%=basePath %>resource/layer-v3.0.3/layer/layer.js"></script>
+<script type="text/javascript">
+
+    function formatFlightDate(value, row, index){
+        return row.flightdate.split(" ")[0];
+    }
+
+    // function appendCarrier(value, row, index) {
+    //     return row.carrier+row.flightno;
+    // }
+
+    function checkResponseText(value, row, index) {
+        var res = '';
+        if(value){
+            var start_yupei = value.indexOf("41301");
+            var start_yundi = value.indexOf("45201");
+            if(start_yupei>-1||start_yundi>-1){
+                // 成功
+                res = '<span style="color:green;">'+value+'</span>';
+            }else{
+                // 未通过或者未回执
+                var start_exception_ = value.indexOf("分单");
+                var start_exception_ = value.indexOf("主单");
+                if(start_exception_>-1||start_exception_>-1){
+                    //没有回执
+                    res = '<span style="color:black;">'+value+'</span>';
+                }else{
+                    res = '<span style="color:red;">'+value+'</span>';
+                }
+            }
+        }
+
+        return res;
+    }
+
+    var totalpiece = 0;
+    var totalweight = 0;
+
+    $(function(){
+        function getPageNumber(){
+            var pageNumber = window.localStorage.getItem("pageNumber");
+            if(typeof(pageNumber) != "undefined")
+            {
+                try{
+                    var pattern = /^\d+$/g;		//判断是否是数字
+
+                    //console.log(pageNumber.search(pattern));
+
+                    if(pageNumber.search(pattern) >= 0)
+                    {
+                        var num = parseInt(pageNumber);
+                        return num;
+                    }
+                    return 1;
+                }
+                catch(e){
+                    return 1;
+                }
+            }
+            return 1;
+        }
+
+        //console.log(getPageNumber());
+
+
+
+
+        $('#dg').datagrid({
+            url:'<%=basePath %>cargo/grid.json',
+            //queryParams:$("#searchForm").serializeJson(),
+            pageNumber:getPageNumber(),
+            view: detailview,
+            detailFormatter:function(index,row){
+                $("#totalpiec").html('');
+                $("#totalweight").html('');
+                totalpiece += parseInt(row.piece);
+                totalweight += parseInt(row.weight);
+
+
+                $("#totalpiec").html(totalpiece);
+                $("#totalweight").html(totalweight);
+
+                return '<div id="ddv-' + index + '""></div>';
+            },
+        });
+    });
+
+
+
+
+    function editFormat(val,row,index){
+
+        var html='<a href="javascript:void(0)" style="padding-left:10px;text-decoration:none;color:blue;padding-right:20px;" onclick="userUpdate('+row.id+')"><i class="iconfont">&#xe65a;</i></a>'
+        html += '<a href="javascript:void(0)" style="text-decoration:none;margin-left:20px;color:blue;" </a>';
+        return html;
+    }
+
+    //分单撤销
+    function preoperatorFormat(val, row, index){
+        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;
+    }
+
+    function prebackout(id){
+        if(typeof(id) == "undefined")
+            return;
+        layer.confirm("确定要撤销吗？", function(flag){
+            layer.close(flag);
+            $.ajax({
+                url:"<%=basePath %>/manifest/prebackout",
+                data:{
+                    id:id
+                },
+                success:function(data){
+                    if(data.status == 200)
+                        layer.alert("撤销请求已发送！");
+                    else
+                        layer.alert("撤销请求发送失败！");
+                }
+            });
+        });
+    }
+    //主单撤销按钮
+    function operatorFormat(val, row, index){
+        var html = "<a href='javascript:void(0)' onclick='backout("+row.id+")' style='text-decoration:none;color:blue;'><spring:message code='opt.backout'/></a>";
+        html+="<a href='javascript:void(0)' onclick='openReceipt(\""+row.waybillnomaster+"\")' style='text-decoration:none;color:blue;margin-left:20px;'><spring:message code='opt.open.receipt'/></a>";
+        return html;
+    }
+    function backout(id){
+        if(typeof(id) == "undefined")
+            return;
+        layer.confirm("确定要撤销吗？", function(flag){
+            layer.close(flag);
+            //提交到后台，发送一个撤销报文
+            $.ajax({
+                url:"<%=basePath %>/manifest/backout",
+                data:{
+                    id:id
+                },
+                success:function(data){
+                    if(data.status == 200)
+                        layer.alert("撤销请求已发送！");
+                    else
+                        layer.alert("撤销请求发送失败！");
+                }
+            });
+        });
+    }
+
+    //查看分单回执
+    function openSubReceipt(waybill_no,subno){
+        if(typeof(waybill_no) == "undefined")
+            return;
+        if(typeof(subno) == "undefined")
+            return;
+        seeReceipt(waybill_no,subno,false);
+    }
+
+    //查看主单回执
+    function openReceipt(waybill_no){
+        if(typeof(waybill_no) == "undefined")
+            return;
+        seeReceipt(waybill_no,"",true);
+    }
+
+    function seeReceipt(waybill_no,sub_waybill_no,isMain){
+        layui.use('layer', function(){
+            var layer = layui.layer;
+            var api="<%=basePath%>receipt/seeReceipt";
+            var params = "waybill_no="+waybill_no;
+            if(!isMain){
+                params+="&sub_waybill_no="+sub_waybill_no;
+            }
+            var viewUrl = api+"?"+params;
+
+            parent.layer.open({
+                type: 2,
+                title: "<spring:message code='opt.open.receipt'/>",
+                shadeClose: true,
+                shade: 0.8,
+                area: ['80%', '60%'],
+                content: viewUrl
+            });
+        });
+    }
+
+    //制分单
+    function makeHawb(id){
+        window.location.href="<%=basePath %>manifest/subedit?mawbId="+id;
+    }
+
+    //分单编辑
+    function editHbillRow(id){
+        window.location.href="<%=basePath %>manifest/subedit?id="+id;
+    }
+
+    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>';
+	      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;
+    }
+
+
+    function editRow(id){
+        var page = $("#dg").datagrid("getPager").data("pagination").options;
+        window.localStorage.setItem("pageNumber", page.pageNumber);
+        if(id==undefined){
+            window.location.href='<%=basePath %>manifest/edit?id=';
+        }else{
+            window.location.href='<%=basePath %>manifest/edit?id='+id;
+        }
+    }
+
+    function userUpdate(id) {
+        // iframe层
+        layer.open({
+            type : 2,
+            title : '修改主单号用户',
+            maxmin : true,
+            shadeClose : false, // 点击遮罩关闭层
+            area : [ '450px', '300px' ],
+            content : '<%=basePath %>wbm/edit?id='+id
+        });
+    }
+
+    function doSearch(){
+        totalpiece = 0;
+        totalweight = 0;
+        $('#dg').datagrid("options").queryParams=$("#searchForm").serializeJson();
+        $('#dg').datagrid("reload");
+    }
+
+    function getIds() {
+        var ids = [];
+        var rows = $("#dg").datagrid('getChecked');
+        $.each(rows,function(key,v){
+            ids.push(v.id);
+        });
+        return ids;
+    }
+
+
+
+
+    $("#manifnum").keyup(function(){
+        var leng =  $("#manifnum").val().length;
+        if (leng == 3)
+        {
+            $("#manifnum").val( $("#manifnum").val()+"-")
+        }
+    })
+</script>
+</body>
+</html>
+
+

+<%--
+  Created by IntelliJ IDEA.
+  User: lenovo
+  Date: 2019/3/15
+  Time: 9:33
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%
+    String path = request.getContextPath();
+    String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
+%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link href="<%=basePath %>resource/css/base.css" rel="stylesheet">
+    <link rel="stylesheet" href="<%=basePath %>resource/easyui/uimaker/easyui.css">
+    <link rel="stylesheet" type="text/css" href="<%=basePath %>resource/easyui/uimaker/icon.css">
+    <link rel="stylesheet" href="<%=basePath %>resource/css/providers.css">
+
+    <link rel="stylesheet" href="<%=basePath%>resource/layui/css/layui.css" media="all">
+    <script type="text/javascript" src="<%=basePath%>resource/easyui/jquery.min.js"></script>
+    <script type="text/javascript" src="<%=basePath%>resource/layer-v3.0.3/layer/layer.js"></script>
+    <script type="text/javascript" src="<%=basePath%>resource/layui/layui.js"></script>
+
+</head>
+<body>
+<div class="container">
+    <div data-options="closable:true">
+        <table id="dg" style="width:100%;" title="货主信息管理"
+               data-options="
+                rownumbers:true,
+                singleSelect:false,
+                autoRowHeight:false,
+                pagination:true,
+                fitColumns:true,
+                striped:true,
+                collapsible:true,
+                toolbar:'#tb',
+                pageSize:10">
+            <thead>
+            <tr>
+                <th field="."  formatter="editFormat"><spring:message code="opt.edit" /></th>
+                <th field="forShort">简称</th>
+                <th field="fullName">全称</th>
+                <th field="theShipperType" sortable="true">货主类型</th>
+                <th field="contacts">联系人</th>
+                <th field="phone">电话</th>
+
+            </tr>
+            </thead>
+        </table>
+        <div id="tb" style="padding:0 30px;"><input type="hidden" id="idcc">
+            <form id="searchForm">
+                <table class="search_form_table">
+                    <%--联系人:<input id="manifnum" type="text" name="search_LIKE_waybillnomaster" style="width:166px;height:35px;line-height:35px;">--%>
+                    电话:<input class="easyui-textbox" type="text" name="search_LIKE_phone" style="width:166px;height:35px;line-height:35px;">
+                    <a href="javascript:doSearch()" class="easyui-linkbutton" iconCls="icon-search" data-options="selected:true"><spring:message code="opt.search" /></a>
+                    <%--<a href="javascript:doSave()" class="easyui-linkbutton" style="background:#18A197;color:#FFF;border: 1px solid #18A197;" iconCls="icon-add"><spring:message code="opt.add" /></a>--%>
+                    <%--<a href="javascript:doDelete()" class="easyui-linkbutton" style="background:red;color:#FFF;border: 1px solid red" iconCls="icon-no"><spring:message code="opt.delete" /></a>--%>
+                </table>
+            </form>
+        </div>
+    </div>
+
+</div>
+<script type="text/javascript" src="<%=basePath %>resource/easyui/jquery.min.js"></script>
+<script type="text/javascript" src="<%=basePath %>resource/easyui/jquery.easyui.min.js"></script>
+<script type="text/javascript" src="<%=basePath %>resource/easyui/easyui-lang-${pageContext.response.locale}.js"></script>
+<script type="text/javascript" src="<%=basePath %>resource/easyui/datagrid-detailview.js"></script>
+<script type="text/javascript" src="<%=basePath %>resource/js/tools.js?version=${version}"></script>
+<!--弹出层引入的JS-->
+<script type="text/javascript" src="<%=basePath %>resource/layer-v3.0.3/layer/layer.js"></script>
+<script type="text/javascript">
+
+    $(function(){
+        function getPageNumber(){
+            var pageNumber = window.localStorage.getItem("pageNumber");
+            if(typeof(pageNumber) != "undefined")
+            {
+                try{
+                    var pattern = /^\d+$/g;		//判断是否是数字
+
+                    //console.log(pageNumber.search(pattern));
+
+                    if(pageNumber.search(pattern) >= 0)
+                    {
+                        var num = parseInt(pageNumber);
+                        return num;
+                    }
+                    return 1;
+                }
+                catch(e){
+                    return 1;
+                }
+            }
+            return 1;
+        }
+
+        //console.log(getPageNumber());
+
+        $('#dg').datagrid({
+            url:'<%=basePath %>hzinfo/grid.json',
+            //queryParams:$("#searchForm").serializeJson(),
+            pageNumber:getPageNumber(),
+            view: detailview,
+            detailFormatter:function(index,row){
+                return '<div id="ddv-' + index + '"style="padding:5px 0"></div>';
+            }
+        });
+    });
+
+    function editFormat(val,row,index){
+
+        var html='<a href="javascript:void(0)" style="padding-left:10px;text-decoration:none;color:blue;padding-right:20px;" onclick="findOneHz('+row.id+')" lay-event="choose"><i class="iconfont">选择</i></a>'
+        html += '<a href="javascript:void(0)" style="text-decoration:none;margin-left:20px;color:blue;" </a>';
+        return html;
+    }
+
+
+    function doSearch(){
+        $('#dg').datagrid("options").queryParams=$("#searchForm").serializeJson();
+        $('#dg').datagrid("reload");
+    }
+
+    function getIds() {
+        var ids = [];
+        var rows = $("#dg").datagrid('getChecked');
+        $.each(rows,function(key,v){
+            ids.push(v.id);
+        });
+        return ids;
+    }
+
+    function doDelete(){
+        var rows = $("#dg").datagrid('getChecked');
+        if(rows.length==0){
+            layer.open({content:"<spring:message code="opt.selectone" />"});
+            return false;
+        }
+        layer.confirm("<spring:message code="opt.confirmdel" />?", {btn:['<spring:message code="opt.confirm" />','<spring:message code="opt.cancel" />']},function () {
+            $.post("<%=basePath %>hzinfo/delete",{ids:getIds().join(",")},function(data){
+                if(data.status == 200) {
+                    layer.confirm("<spring:message code="opt.delsuccess" />!",{btn:['<spring:message code="opt.confirm" />','<spring:message code="opt.cancel" />']},function(){
+                        window.location.href="<%=basePath %>hzinfo/list";
+                    })
+                }else{
+                    layer.open({content:"<spring:message code="opt.delfailed" />!"});
+                }
+            },"json");
+
+        });
+    }
+
+    $("#manifnum").keyup(function(){
+        var leng =  $("#manifnum").val().length;
+        if (leng == 3)
+        {
+            $("#manifnum").val( $("#manifnum").val()+"-")
+        }
+    })
+
+</script>
+</body>
+</html>
+
+

@@ -81,6 +81,8 @@
                             <li><a href="javascript:void(0)" onclick="addTab('<spring:message code="menu.user" />||system/user/list',this)"><spring:message code="menu.user" /></a></li>
                             <li><a href="javascript:void(0);" onclick="addTab('<spring:message code="menu.wbm" />||wbm/list',this)"><spring:message code="menu.wbm" /></a></li>
                             <li><a href="javascript:void(0);" onclick="addTab('<spring:message code="hz.info" />||hzinfo/list',this)"><spring:message code="hz.info" /></a></li>
+                            <li><a href="javascript:void(0);" onclick="addTab('<spring:message code="hz.info" />||hzinfo/list',this)"><spring:message code="hz.info" /></a></li>
+                            <li><a href="javascript:void(0);" onclick="addTab('货量统计||cargo/list',this)">货量统计</a></li>
                                 <%-- <li><a href="javascript:void(0)" onclick="addTab('<spring:message code="menu.consignee_info_set" />||consignee/list')"><spring:message code="menu.consignee_info_set" /></a></li> --%>
                         </ul>
                     </li>

+<%--
+  Created by IntelliJ IDEA.
+  User: lenovo
+  Date: 2019/3/15
+  Time: 9:33
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%
+    String path = request.getContextPath();
+    String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
+%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link href="<%=basePath %>resource/css/base.css" rel="stylesheet">
+    <link rel="stylesheet" href="<%=basePath %>resource/easyui/uimaker/easyui.css">
+    <link rel="stylesheet" type="text/css" href="<%=basePath %>resource/easyui/uimaker/icon.css">
+    <link rel="stylesheet" href="<%=basePath %>resource/css/providers.css">
+
+    <link rel="stylesheet" href="<%=basePath%>resource/layui/css/layui.css" media="all">
+    <script type="text/javascript" src="<%=basePath%>resource/easyui/jquery.min.js"></script>
+    <script type="text/javascript" src="<%=basePath%>resource/layer-v3.0.3/layer/layer.js"></script>
+    <script type="text/javascript" src="<%=basePath%>resource/layui/layui.js"></script>
+
+</head>
+<body>
+<div class="container">
+    <div data-options="closable:true">
+        <table id="dg" style="width:100%;" title="货主信息管理"
+               data-options="
+                rownumbers:true,
+                singleSelect:false,
+                autoRowHeight:false,
+                pagination:true,
+                fitColumns:true,
+                striped:true,
+                collapsible:true,
+                toolbar:'#tb',
+                pageSize:10">
+            <thead>
+            <tr>
+                <th field="."  formatter="editFormat"><spring:message code="opt.edit" /></th>
+                <th field="forShort">简称</th>
+                <th field="fullName">全称</th>
+                <th field="theShipperType" sortable="true">货主类型</th>
+                <th field="contacts">联系人</th>
+                <th field="phone">电话</th>
+
+            </tr>
+            </thead>
+        </table>
+        <div id="tb" style="padding:0 30px;"><input type="hidden" id="idcc">
+            <form id="searchForm">
+                <table class="search_form_table">
+                    <%--联系人:<input id="manifnum" type="text" name="search_LIKE_waybillnomaster" style="width:166px;height:35px;line-height:35px;">--%>
+                    电话号:<input class="easyui-textbox" type="text" name="search_LIKE_phone" style="width:166px;height:35px;line-height:35px;">
+                    <a href="javascript:doSearch()" class="easyui-linkbutton" iconCls="icon-search" data-options="selected:true"><spring:message code="opt.search" /></a>
+                    <a href="javascript:doSave()" class="easyui-linkbutton" style="background:#18A197;color:#FFF;border: 1px solid #18A197;" iconCls="icon-add"><spring:message code="opt.add" /></a>
+                    <a href="javascript:doDelete()" class="easyui-linkbutton" style="background:red;color:#FFF;border: 1px solid red" iconCls="icon-no"><spring:message code="opt.delete" /></a>
+                </table>
+            </form>
+        </div>
+    </div>
+
+</div>
+<script type="text/javascript" src="<%=basePath %>resource/easyui/jquery.min.js"></script>
+<script type="text/javascript" src="<%=basePath %>resource/easyui/jquery.easyui.min.js"></script>
+<script type="text/javascript" src="<%=basePath %>resource/easyui/easyui-lang-${pageContext.response.locale}.js"></script>
+<script type="text/javascript" src="<%=basePath %>resource/easyui/datagrid-detailview.js"></script>
+<script type="text/javascript" src="<%=basePath %>resource/js/tools.js?version=${version}"></script>
+<!--弹出层引入的JS-->
+<script type="text/javascript" src="<%=basePath %>resource/layer-v3.0.3/layer/layer.js"></script>
+<script type="text/javascript">
+
+    $(function(){
+        function getPageNumber(){
+            var pageNumber = window.localStorage.getItem("pageNumber");
+            if(typeof(pageNumber) != "undefined")
+            {
+                try{
+                    var pattern = /^\d+$/g;		//判断是否是数字
+
+                    //console.log(pageNumber.search(pattern));
+
+                    if(pageNumber.search(pattern) >= 0)
+                    {
+                        var num = parseInt(pageNumber);
+                        return num;
+                    }
+                    return 1;
+                }
+                catch(e){
+                    return 1;
+                }
+            }
+            return 1;
+        }
+
+        //console.log(getPageNumber());
+
+        $('#dg').datagrid({
+            url:'<%=basePath %>hzinfo/grid.json',
+            //queryParams:$("#searchForm").serializeJson(),
+            pageNumber:getPageNumber(),
+            view: detailview,
+            detailFormatter:function(index,row){
+                return '<div id="ddv-' + index + '"style="padding:5px 0"></div>';
+            }
+        });
+    });
+
+    function editFormat(val,row,index){
+
+        var html='<a href="javascript:void(0)" style="padding-left:10px;text-decoration:none;color:blue;padding-right:20px;" onclick="userUpdate('+row.id+')"><i class="iconfont">&#xe65a;</i></a>'
+        html += '<a href="javascript:void(0)" style="text-decoration:none;margin-left:20px;color:blue;" </a>';
+        return html;
+    }
+
+    function seeReceipt(waybill_no,sub_waybill_no,isMain){
+        layui.use('layer', function(){
+            var layer = layui.layer;
+            var api="<%=basePath%>receipt/seeReceipt";
+            var params = "waybill_no="+waybill_no;
+            if(!isMain){
+                params+="&sub_waybill_no="+sub_waybill_no;
+            }
+            var viewUrl = api+"?"+params;
+
+            parent.layer.open({
+                type: 2,
+                title: "<spring:message code='opt.open.receipt'/>",
+                shadeClose: true,
+                shade: 0.8,
+                area: ['80%', '60%'],
+                content: viewUrl
+            });
+        });
+    }
+
+    //分单编辑
+    function editHbillRow(id){
+        window.location.href="<%=basePath %>manifest/subedit?id="+id;
+    }
+
+    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>';
+	      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;
+    }
+
+
+    function editRow(id){
+        var page = $("#dg").datagrid("getPager").data("pagination").options;
+        window.localStorage.setItem("pageNumber", page.pageNumber);
+        if(id==undefined){
+            window.location.href='<%=basePath %>manifest/edit?id=';
+        }else{
+            window.location.href='<%=basePath %>manifest/edit?id='+id;
+        }
+    }
+
+    function userUpdate(id) {
+        // iframe层
+        layer.open({
+            type : 2,
+            title : '修改主单号用户',
+            maxmin : true,
+            shadeClose : false, // 点击遮罩关闭层
+            area : [ '700px', '350px' ],
+            content : '<%=basePath %>hzinfo/edit?id='+id
+        });
+    }
+
+    //添加
+    function doSave() {
+        layer.open({
+            type : 2,
+            title : '新增',
+            maxmin : true,
+            shadeClose : false, // 点击遮罩关闭层
+            area : [ '700px', '350px' ],
+            content : '<%=basePath %>hzinfo/add'
+        });
+    }
+
+    function doSearch(){
+        $('#dg').datagrid("options").queryParams=$("#searchForm").serializeJson();
+        $('#dg').datagrid("reload");
+    }
+
+    function getIds() {
+        var ids = [];
+        var rows = $("#dg").datagrid('getChecked');
+        $.each(rows,function(key,v){
+            ids.push(v.id);
+        });
+        return ids;
+    }
+
+    function doDelete(){
+        var rows = $("#dg").datagrid('getChecked');
+        if(rows.length==0){
+            layer.open({content:"<spring:message code="opt.selectone" />"});
+            return false;
+        }
+        layer.confirm("<spring:message code="opt.confirmdel" />?", {btn:['<spring:message code="opt.confirm" />','<spring:message code="opt.cancel" />']},function () {
+            $.post("<%=basePath %>hzinfo/delete",{ids:getIds().join(",")},function(data){
+                if(data.status == 200) {
+                    layer.confirm("<spring:message code="opt.delsuccess" />!",{btn:['<spring:message code="opt.confirm" />','<spring:message code="opt.cancel" />']},function(){
+                        window.location.href="<%=basePath %>hzinfo/list";
+                    })
+                }else{
+                    layer.open({content:"<spring:message code="opt.delfailed" />!"});
+                }
+            },"json");
+
+        });
+    }
+
+    $("#manifnum").keyup(function(){
+        var leng =  $("#manifnum").val().length;
+        if (leng == 3)
+        {
+            $("#manifnum").val( $("#manifnum").val()+"-")
+        }
+    })
+</script>
+</body>
+</html>
+
+

+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%
+    String path = request.getContextPath();
+    String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
+%>
+<!DOCTYPE html> 
+<html lang="en"> 
+<head> 
+    <meta charset="utf-8"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1"> 
+    <link href="<%=basePath %>resource/css/base.css" rel="stylesheet">
+    <link href="<%=basePath %>resource/css/basic_info.css" rel="stylesheet">
+	<link rel="stylesheet" href="<%=basePath %>resource/easyui/uimaker/easyui.css">
+	<link href="<%=basePath %>resource/css/form.css" rel="stylesheet">
+    <script type="text/javascript" src="<%=basePath %>resource/easyui/jquery.min.js"></script>
+    <script type="text/javascript" src="<%=basePath %>resource/validate/jquery.validate.js"></script>
+    <script type="text/javascript" src="<%=basePath %>resource/validate/validate-extends.js"></script>
+    <link rel="stylesheet" href="<%=basePath %>resource/css/form.css">
+    <script type="text/javascript" src="<%=basePath %>resource/js/tools.js"></script>
+    <!-- validate 验证中英文 -->
+    <script type="text/javascript" src="<%=basePath %>resource/validate/jquery.validate-${pageContext.response.locale}.js"></script>
+</head>
+<body>
+	<div class="container">
+		
+		<div class="content">
+		        <form class="from-control" id="form">
+                      <table class="kv-table">
+                          <tbody>
+                          <tr>
+                              <td class="kv-label">简称</td>
+                              <td class="kv-content">
+                                  <input id="forshort" name="forshort" type="text" required/>
+                              </td>
+                          </tr>
+                          <tr>
+                              <td class="kv-label">全称</td>
+                              <td class="kv-content">
+                                  <input  id="fullname" name="fullname" type="text" required/>
+                              </td>
+                          </tr>
+                          <tr>
+                              <td class="kv-label">货主类型</td>
+                              <td class="kv-content">
+                                  <div class="date">
+                                      <label>
+                                          <input id="one" name="one" type="checkbox" value="1" checked>发货人
+                                      </label>
+                                      <label>
+                                          <input id="two" name="two" type="checkbox" value="2">订舱代理
+                                      </label>
+                                      <label>
+                                          <input id="three" name="three" type="checkbox" value="3">操作代理
+                                      </label>
+                                  </div>
+                              </td>
+                          </tr>
+                          <tr>
+                              <td class="kv-label">联系人</td>
+                              <td class="kv-content"><input type="text" id="contacts" name="contacts" required></td>
+                          </tr>
+                          <tr>
+                              <td class="kv-label">电话</td>
+                              <td class="kv-content"><input type="text" id="phone" name="phone" required></td>
+                          </tr>
+
+                          <tr>
+                              <td colspan="6">
+                                  <div class="opt-buttons" style="padding-top:20px;">
+                                      <button type="submit" class="easyui-linkbutton l-btn l-btn-small l-btn-selected " data-options="selected:true">
+                                          <span class="l-btn-left"><span class="l-btn-text"><spring:message code="opt.save" /></span></span>
+                                      </button>
+                                      <%--<button type="button" class="easyui-linkbutton l-btn l-btn-small" onclick="window.location.href='<%=basePath%>system/user/list'">--%>
+                                          <%--<span class="l-btn-left"><span class="l-btn-text"><spring:message code="opt.cancel"/></span></span>--%>
+                                      <%--</button>--%>
+                                  </div>
+                              </td>
+                          </tr>
+                          </tbody>
+                      </table>
+               </form>
+		</div>
+	</div>
+	<script type="text/javascript" src="<%=basePath %>resource/layer-v3.0.3/layer/layer.js"></script>
+    <script src="<%=basePath %>resource/easyui/jquery.easyui.min.js"></script>
+    <script src="<%=basePath %>resource/js/tools.js"></script>
+	<script type="text/javascript">
+        $("#form").validate({
+            submitHandler:function(form){
+                submit();
+            }
+        });
+
+        var selectFals = false;
+	    function submit(){
+	        var chboxValue=[];
+	        var checkBox = $("input[name=one],input[name=two],input[name=three]");
+	        for (var i=0; i<checkBox.length; i++){
+	            if (checkBox[i].checked){
+                    selectFals = true;
+                }
+            }
+
+            if (selectFals == true){
+                var data = $("#form").serialize();
+                $.post("<%=basePath%>hzinfo/save",data,function(data){
+                    if(data.status==200){
+                        layer.confirm("<spring:message code="opt.savesuccess" />!",{btn:['<spring:message code="opt.confirm" />','<spring:message code="opt.cancel" />']},function(){
+                            var index = parent.layer.getFrameIndex(window.name); // 获取窗口索引
+                            parent.layer.close(index);
+                            window.parent.location.reload();
+                        })
+                    }else if(data.status == 201){
+                        layer.open({content:"该简称和货主类型已存在!"});
+                    }else {
+                        layer.open({content:"网络异常!"});
+                    }
+                })
+            }else {
+	            alert("货主类型至少选择一项");
+	            return false;
+            }
+	    }
+	</script>
+</body> 
+</html>
\ No newline at end of file

+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%
+    String path = request.getContextPath();
+    String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
+%>
+<!DOCTYPE html> 
+<html lang="en"> 
+<head> 
+    <meta charset="utf-8"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1"> 
+    <link href="<%=basePath %>resource/css/base.css" rel="stylesheet">
+    <link href="<%=basePath %>resource/css/basic_info.css" rel="stylesheet">
+	<link rel="stylesheet" href="<%=basePath %>resource/easyui/uimaker/easyui.css">
+	<link href="<%=basePath %>resource/css/form.css" rel="stylesheet">
+    <script type="text/javascript" src="<%=basePath %>resource/easyui/jquery.min.js"></script>
+    <script type="text/javascript" src="<%=basePath %>resource/validate/jquery.validate.js"></script>
+    <script type="text/javascript" src="<%=basePath %>resource/validate/validate-extends.js"></script>
+    <link rel="stylesheet" href="<%=basePath %>resource/css/form.css">
+    <script type="text/javascript" src="<%=basePath %>resource/js/tools.js"></script>
+    <!-- validate 验证中英文 -->
+    <script type="text/javascript" src="<%=basePath %>resource/validate/jquery.validate-${pageContext.response.locale}.js"></script>
+</head>
+<body>
+	<div class="container">
+		
+		<div class="content">
+		        <form class="from-control" id="form">
+                      <input type="hidden" id="id" name="id" value="${entity.id}">
+                      <table class="kv-table">
+                          <tbody>
+                          <tr>
+                              <td class="kv-label">简称</td>
+                              <td class="kv-content">
+                                  <input id="forshort" name="for_short" type="text" value="${entity.for_short}" required/>
+                              </td>
+                          </tr>
+
+                          <tr>
+                              <td class="kv-label">全称</td>
+                              <td class="kv-content">
+                                  <input  id="fullname" name="full_name" type="text" value="${entity.full_name}" required/>
+                              </td>
+                          </tr>
+                          <tr>
+                              <td class="kv-label">货主类型</td>
+                              <td class="kv-content">
+                                  <div class="date">
+                                      <label>
+                                          <input id="one" name="the_shipper_type" type="checkbox" ${1 eq entity.the_shipper_type?"checked":""} value="1">发货人
+                                      </label>
+                                      <label>
+                                          <input id="two" name="the_shipper_type" type="checkbox" ${2 eq entity.the_shipper_type?"checked":""} value="2">订舱代理
+                                      </label>
+                                      <label>
+                                          <input id="three" name="the_shipper_type" type="checkbox" ${3 eq entity.the_shipper_type?"checked":""} value="3">操作代理
+                                      </label>
+                                  </div>
+                              </td>
+                          </tr>
+                          <tr>
+                              <td class="kv-label">联系人</td>
+                              <td class="kv-content">
+                                  <input  id="contacts" name="contacts" type="text" value="${entity.contacts}" required/>
+                              </td>
+                          </tr>
+                          <tr>
+                              <td class="kv-label">电话</td>
+                              <td class="kv-content">
+                                  <input  id="phone" name="phone" type="text" value="${entity.phone}" required/>
+                              </td>
+                          </tr>
+                          <tr>
+                              <td colspan="6">
+                                  <div class="opt-buttons" style="padding-top:20px;">
+                                      <button type="submit" class="easyui-linkbutton l-btn l-btn-small l-btn-selected " data-options="selected:true">
+                                          <span class="l-btn-left"><span class="l-btn-text"><spring:message code="opt.save" /></span></span>
+                                      </button>
+                                  </div>
+                              </td>
+                          </tr>
+                          </tbody>
+                      </table>
+               </form>
+		</div>
+	</div>
+	<script type="text/javascript" src="<%=basePath %>resource/layer-v3.0.3/layer/layer.js"></script>
+    <script src="<%=basePath %>resource/easyui/jquery.easyui.min.js"></script>
+    <script src="<%=basePath %>resource/js/tools.js"></script>
+	<script type="text/javascript">
+        $("#form").validate({
+            submitHandler:function(form){
+                submit();
+            }
+        });
+
+        $(function () {
+            $("#form").find("input[type=checkbox]").bind("click", function () {
+                //当前checkbox是否选中
+                if (this.checked){
+                    //除当前的checkbox其他不选中
+                    $("#form").find("input[type=checkbox]").not(this).attr("checked", false);
+                }
+            })
+        })
+
+
+        var selectFals = false;
+	    function submit(){
+            var chboxValue=[];
+            var checkBox = $("input[id=one],input[id=two],input[id=three]");
+            for (var i=0; i<checkBox.length; i++){
+                if (checkBox[i].checked){
+                    selectFals = true;
+                }
+            }
+
+            if (selectFals == true){
+                var data = $("#form").serialize();
+                $.post("<%=basePath%>hzinfo/update",data,function(data){
+                    if(data.status==200){
+                        layer.confirm("修改成功!",{btn:['<spring:message code="opt.confirm" />','<spring:message code="opt.cancel" />']},function(){
+                            var index = parent.layer.getFrameIndex(window.name); // 获取窗口索引
+                            parent.layer.close(index);
+                            window.parent.location.reload();
+                        })
+                    }else if(data.status == 201){
+                        layer.open({content:"该简称和货主类型已存在!"});
+                    }else {
+                        layer.open({content:"网络异常!"});
+                    }
+                })
+            }else {
+                alert("货主类型至少选择一项");
+                return false;
+            }
+	    }
+	</script>
+</body> 
+</html>
\ No newline at end of file

+<%--
+  Created by IntelliJ IDEA.
+  User: lenovo
+  Date: 2019/3/15
+  Time: 9:33
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%
+    String path = request.getContextPath();
+    String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
+%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link href="<%=basePath %>resource/css/base.css" rel="stylesheet">
+    <link rel="stylesheet" href="<%=basePath %>resource/easyui/uimaker/easyui.css">
+    <link rel="stylesheet" type="text/css" href="<%=basePath %>resource/easyui/uimaker/icon.css">
+    <link rel="stylesheet" href="<%=basePath %>resource/css/providers.css">
+
+    <link rel="stylesheet" href="<%=basePath%>resource/layui/css/layui.css" media="all">
+    <script type="text/javascript" src="<%=basePath%>resource/easyui/jquery.min.js"></script>
+    <script type="text/javascript" src="<%=basePath%>resource/layer-v3.0.3/layer/layer.js"></script>
+    <script type="text/javascript" src="<%=basePath%>resource/layui/layui.js"></script>
+
+</head>
+<body>
+<div class="container">
+    <div data-options="closable:true">
+        <table id="dg" style="width:100%;" title="<spring:message code="wbm.list"/>"
+               data-options="
+                rownumbers:true,
+                singleSelect:false,
+                autoRowHeight:false,
+                pagination:true,
+                fitColumns:true,
+                striped:true,
+                collapsible:true,
+                toolbar:'#tb',
+                pageSize:10">
+            <thead>
+            <tr>
+                <th field="."  formatter="editFormat"><spring:message code="opt.edit" /></th>
+                <th field="loginaccount"><spring:message code="manifest.loginaccount"/></th>
+                <th field="agentCode"><spring:message code="manifest.agentCode"/></th>
+                <th field="waybillnomaster" sortable="true"><spring:message code="manifest.bill.number"/></th>
+                <th field="customscode"><spring:message code="manifest.customs"/></th>
+                <th field="flightno" formatter="appendCarrier"><spring:message code="manifest.flight.number"/></th>
+                <th field="flightdate" formatter="formatFlightDate"><spring:message code="manifest.flight.date"/></th>
+                <th field="originatingstation"><spring:message code="manifest.starting.point"/></th>
+                <th field="destinationstation"><spring:message code="manifest.destination"/></th>
+                <th field="preparetotalpiece"><spring:message code="manifest.number.of.fittings"/></th>
+                <th field="preparetotalweight"><spring:message code="manifest.pre.weight"/></th>
+                <th field="response_text" formatter="checkResponseText" width="200"><spring:message code="manifest.response_text" /></th>
+                <%--<th field=".." formatter="operatorFormat"><spring:message code="opt.operator" /></th>--%>
+            </tr>
+            </thead>
+        </table>
+        <div id="tb" style="padding:0 30px;"><input type="hidden" id="idcc">
+            <form id="searchForm">
+                <table class="search_form_table">
+                    <spring:message code="manifest.bill.number"/>:<input id="manifnum" type="text" name="search_LIKE_waybillnomaster" style="width:166px;height:35px;line-height:35px;">
+                    <spring:message code="manifest.flight.number"/>:<input class="easyui-textbox" type="text" name="search_LIKE_flightno" style="width:166px;height:35px;line-height:35px;">
+                    <a href="javascript:doSearch()" class="easyui-linkbutton" iconCls="icon-search" data-options="selected:true"><spring:message code="opt.search" /></a>
+                    <%--<a href="javascript:editRow()" class="easyui-linkbutton" style="background:#18A197;color:#FFF;border: 1px solid #18A197;" iconCls="icon-add"><spring:message code="opt.add" /></a>--%>
+                    <a href="javascript:doDelete()" class="easyui-linkbutton" style="background:red;color:#FFF;border: 1px solid red" iconCls="icon-no"><spring:message code="opt.delete" /></a>
+                </table>
+            </form>
+        </div>
+    </div>
+
+</div>
+<script type="text/javascript" src="<%=basePath %>resource/easyui/jquery.min.js"></script>
+<script type="text/javascript" src="<%=basePath %>resource/easyui/jquery.easyui.min.js"></script>
+<script type="text/javascript" src="<%=basePath %>resource/easyui/easyui-lang-${pageContext.response.locale}.js"></script>
+<script type="text/javascript" src="<%=basePath %>resource/easyui/datagrid-detailview.js"></script>
+<script type="text/javascript" src="<%=basePath %>resource/js/tools.js?version=${version}"></script>
+<!--弹出层引入的JS-->
+<script type="text/javascript" src="<%=basePath %>resource/layer-v3.0.3/layer/layer.js"></script>
+<script type="text/javascript">
+
+    function formatFlightDate(value, row, index){
+        return row.flightdate.split(" ")[0];
+    }
+
+    function appendCarrier(value, row, index) {
+        return row.carrier+row.flightno;
+    }
+
+    function checkResponseText(value, row, index) {
+        var res = '';
+        if(value){
+            var start_yupei = value.indexOf("41301");
+            var start_yundi = value.indexOf("45201");
+            if(start_yupei>-1||start_yundi>-1){
+                // 成功
+                res = '<span style="color:green;">'+value+'</span>';
+            }else{
+                // 未通过或者未回执
+                var start_exception_ = value.indexOf("分单");
+                var start_exception_ = value.indexOf("主单");
+                if(start_exception_>-1||start_exception_>-1){
+                    //没有回执
+                    res = '<span style="color:black;">'+value+'</span>';
+                }else{
+                    res = '<span style="color:red;">'+value+'</span>';
+                }
+            }
+        }
+
+        return res;
+    }
+
+    $(function(){
+        function getPageNumber(){
+            var pageNumber = window.localStorage.getItem("pageNumber");
+            if(typeof(pageNumber) != "undefined")
+            {
+                try{
+                    var pattern = /^\d+$/g;		//判断是否是数字
+
+                    //console.log(pageNumber.search(pattern));
+
+                    if(pageNumber.search(pattern) >= 0)
+                    {
+                        var num = parseInt(pageNumber);
+                        return num;
+                    }
+                    return 1;
+                }
+                catch(e){
+                    return 1;
+                }
+            }
+            return 1;
+        }
+
+        //console.log(getPageNumber());
+
+        $('#dg').datagrid({
+            url:'<%=basePath %>wbm/grid.json',
+            //queryParams:$("#searchForm").serializeJson(),
+            pageNumber:getPageNumber(),
+            view: detailview,
+            detailFormatter:function(index,row){
+                return '<div id="ddv-' + index + '"style="padding:5px 0"></div>';
+            },
+            onExpandRow: function(index,row){
+                console.log("expand row index:"+index);
+                $('#ddv-'+index).datagrid({
+                    url:'<%=basePath %>wbm/sub/grid.json?mawbId='+row.id,
+                    fitColumns:true,
+                    singleSelect:true,
+                    loadMsg:'正在加载……',
+                    height:'auto',
+                    autoRowHeight:"true",
+                    columns:[[
+                        {field:'.',title:'',formatter:editHbillFormat},
+                        {field:'waybillnosecondary',title:'<spring:message code="manifest.odd.number"/>'},
+                        {field:'originatingstation',title:'<spring:message code="manifest.starting.point"/>'},
+                        {field:'destinationstation',title:'<spring:message code="manifest.destination"/>'},
+                        {field:'preparepiece',title:'<spring:message code="manifest.number.of.fittings"/>'},
+                        {field:'prepareweight',title:'<spring:message code="manifest.pre.weight"/>'},
+                        {field:'response_text',width:160,title:'<spring:message code="manifest.response_text"/>',
+                            formatter:function(value, row, index){
+                                var res = '';
+                                if(value){
+                                    var start_yupei = value.indexOf("41301");
+                                    var start_yundi = value.indexOf("45201");
+                                    if(start_yupei>-1||start_yundi>-1){
+                                        // 成功
+                                        res = '<span style="color:green;">'+value+'</span>';
+                                    }else{
+                                        // 未通过或者未回执
+                                        var start_exception_1 = value.indexOf("分单");
+                                        var start_exception_2 = value.indexOf("主单");
+                                        if(start_exception_1>-1||start_exception_2>-1){
+                                            //没有回执
+                                            res = '<span style="color:black;">'+value+'</span>';
+                                        }else{
+                                            res = '<span style="color:red;">'+value+'</span>';
+                                        }
+                                    }
+                                }
+
+                                return res;
+                            }
+                        },
+                        <%--{field:'..', title:'<spring:message code="opt.operator" />', formatter:preoperatorFormat, width:40}--%>
+                    ]],
+                    onResize:function(){
+                        $('#dg').datagrid('fixDetailRowHeight',index);
+                    },
+                    onLoadSuccess:function(){
+                        $('#dg').datagrid('resize');
+                    }
+                });
+
+                $('#dg').datagrid('fixDetailRowHeight',index);
+            }
+        });
+    });
+
+    function editFormat(val,row,index){
+
+        var html='<a href="javascript:void(0)" style="padding-left:10px;text-decoration:none;color:blue;padding-right:20px;" onclick="userUpdate('+row.id+')"><i class="iconfont">&#xe65a;</i></a>'
+        html += '<a href="javascript:void(0)" style="text-decoration:none;margin-left:20px;color:blue;" </a>';
+        return html;
+    }
+
+    //分单撤销
+    function preoperatorFormat(val, row, index){
+        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;
+    }
+
+    function prebackout(id){
+        if(typeof(id) == "undefined")
+            return;
+        layer.confirm("确定要撤销吗？", function(flag){
+            layer.close(flag);
+            $.ajax({
+                url:"<%=basePath %>/manifest/prebackout",
+                data:{
+                    id:id
+                },
+                success:function(data){
+                    if(data.status == 200)
+                        layer.alert("撤销请求已发送！");
+                    else
+                        layer.alert("撤销请求发送失败！");
+                }
+            });
+        });
+    }
+    //主单撤销按钮
+    function operatorFormat(val, row, index){
+        var html = "<a href='javascript:void(0)' onclick='backout("+row.id+")' style='text-decoration:none;color:blue;'><spring:message code='opt.backout'/></a>";
+        html+="<a href='javascript:void(0)' onclick='openReceipt(\""+row.waybillnomaster+"\")' style='text-decoration:none;color:blue;margin-left:20px;'><spring:message code='opt.open.receipt'/></a>";
+        return html;
+    }
+    function backout(id){
+        if(typeof(id) == "undefined")
+            return;
+        layer.confirm("确定要撤销吗？", function(flag){
+            layer.close(flag);
+            //提交到后台，发送一个撤销报文
+            $.ajax({
+                url:"<%=basePath %>/manifest/backout",
+                data:{
+                    id:id
+                },
+                success:function(data){
+                    if(data.status == 200)
+                        layer.alert("撤销请求已发送！");
+                    else
+                        layer.alert("撤销请求发送失败！");
+                }
+            });
+        });
+    }
+
+    //查看分单回执
+    function openSubReceipt(waybill_no,subno){
+        if(typeof(waybill_no) == "undefined")
+            return;
+        if(typeof(subno) == "undefined")
+            return;
+        seeReceipt(waybill_no,subno,false);
+    }
+
+    //查看主单回执
+    function openReceipt(waybill_no){
+        if(typeof(waybill_no) == "undefined")
+            return;
+        seeReceipt(waybill_no,"",true);
+    }
+
+    function seeReceipt(waybill_no,sub_waybill_no,isMain){
+        layui.use('layer', function(){
+            var layer = layui.layer;
+            var api="<%=basePath%>receipt/seeReceipt";
+            var params = "waybill_no="+waybill_no;
+            if(!isMain){
+                params+="&sub_waybill_no="+sub_waybill_no;
+            }
+            var viewUrl = api+"?"+params;
+
+            parent.layer.open({
+                type: 2,
+                title: "<spring:message code='opt.open.receipt'/>",
+                shadeClose: true,
+                shade: 0.8,
+                area: ['80%', '60%'],
+                content: viewUrl
+            });
+        });
+    }
+
+    //制分单
+    function makeHawb(id){
+        window.location.href="<%=basePath %>manifest/subedit?mawbId="+id;
+    }
+
+    //分单编辑
+    function editHbillRow(id){
+        window.location.href="<%=basePath %>manifest/subedit?id="+id;
+    }
+
+    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>';
+	      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;
+    }
+
+
+    function editRow(id){
+        var page = $("#dg").datagrid("getPager").data("pagination").options;
+        window.localStorage.setItem("pageNumber", page.pageNumber);
+        if(id==undefined){
+            window.location.href='<%=basePath %>manifest/edit?id=';
+        }else{
+            window.location.href='<%=basePath %>manifest/edit?id='+id;
+        }
+    }
+
+    function userUpdate(id) {
+        // iframe层
+        layer.open({
+            type : 2,
+            title : '修改主单号用户',
+            maxmin : true,
+            shadeClose : false, // 点击遮罩关闭层
+            area : [ '450px', '300px' ],
+            content : '<%=basePath %>wbm/edit?id='+id
+        });
+    }
+
+    function doSearch(){
+        $('#dg').datagrid("options").queryParams=$("#searchForm").serializeJson();
+        $('#dg').datagrid("reload");
+    }
+
+    function getIds() {
+        var ids = [];
+        var rows = $("#dg").datagrid('getChecked');
+        $.each(rows,function(key,v){
+            ids.push(v.id);
+        });
+        return ids;
+    }
+
+    //分单删除
+    function delHbillRow(id,mawbId,index){
+        $.post("<%=basePath %>wbm/subdelete",{id:id},function(data){
+            if(data.status == 200) {
+                $('#ddv-'+index).datagrid({
+                    url:'<%=basePath %>wbm/sub/grid.json?mawbId='+id,
+                    queryParams:$("#searchForm").serializeJson(),
+                    fitColumns:true,
+                    singleSelect:true,
+                    loadMsg:'',
+                    height:'auto',
+                    columns:[[
+                        {field:'.',title:'<spring:message code="opt.name"/>',formatter:editHbillFormat,width:80},
+                        {field:'hawbNo',title:'<spring:message code="bill.hawbNo"/>',width:100},
+                        {field:'totalPieces',title:'<spring:message code="bill.pieces"/>',width:100},
+                        {field:'grossWeight',title:'<spring:message code="bill.weightcharge"/>',width:100},
+                        {field:'productname',title:'<spring:message code="bill.productname"/>',width:100},
+                        {field:'departureStation',title:'<spring:message code="bill.orilocation"/>',width:100},
+                        {field:'destinationStation',title:'<spring:message code="bill.destination"/>',width:100},
+                    ]],
+                    onResize:function(){
+                        $('#dg').datagrid('fixDetailRowHeight',index);
+                    },
+                    onLoadSuccess:function(){
+                        setTimeout(function(){
+                            $('#dg').datagrid('fixDetailRowHeight',index);
+                        },0);
+                    }
+                    //onClickRow: editHbillRow
+
+                })
+                layer.open({content:"<spring:message code="opt.success"/>"});
+            }else{
+                layer.open({content:"<spring:message code="opt.delfailed"/>!"});
+            }
+        },"json");
+    }
+
+
+    function doDelete(){
+        var rows = $("#dg").datagrid('getChecked');
+        if(rows.length==0){
+            layer.open({content:"<spring:message code="opt.selectone" />"});
+            return false;
+        }
+        layer.confirm("<spring:message code="opt.confirmdel" />?", {btn:['<spring:message code="opt.confirm" />','<spring:message code="opt.cancel" />']},function () {
+            $.post("<%=basePath %>wbm/delete",{ids:getIds().join(",")},function(data){
+                if(data.status == 200) {
+                    layer.confirm("<spring:message code="opt.delsuccess" />!",{btn:['<spring:message code="opt.confirm" />','<spring:message code="opt.cancel" />']},function(){
+                        window.location.href="<%=basePath %>wbm/list";
+                    })
+                }else{
+                    layer.open({content:"<spring:message code="opt.delfailed" />!"});
+                }
+            },"json");
+
+        });
+    }
+
+    $("#manifnum").keyup(function(){
+        var leng =  $("#manifnum").val().length;
+        if (leng == 3)
+        {
+            $("#manifnum").val( $("#manifnum").val()+"-")
+        }
+    })
+</script>
+</body>
+</html>
+
+

+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%--
+  Created by IntelliJ IDEA.
+  User: lenovo
+  Date: 2019/3/15
+  Time: 16:24
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%
+    String path = request.getContextPath();
+    String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
+%>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<html>
+<head>
+    <title>Title</title>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link href="<%=basePath %>resource/css/base.css" rel="stylesheet">
+    <link href="<%=basePath %>resource/css/basic_info.css" rel="stylesheet">
+    <link rel="stylesheet" href="<%=basePath %>resource/easyui/uimaker/easyui.css">
+    <link href="<%=basePath %>resource/css/form.css" rel="stylesheet">
+    <link rel="stylesheet" href="<%=basePath %>resource/css/form.css">
+    <script type="text/javascript" src="<%=basePath %>resource/easyui/jquery.min.js"></script>
+    <script type="text/javascript" src="<%=basePath %>resource/validate/jquery.validate.js"></script>
+    <script type="text/javascript" src="<%=basePath %>resource/validate/validate-extends.js"></script>
+
+    <script type="text/javascript" src="<%=basePath %>resource/js/tools.js"></script>
+    <!-- validate 验证中英文 -->
+    <script type="text/javascript" src="<%=basePath %>resource/validate/jquery.validate-${pageContext.response.locale}.js"></script>
+</head>
+<body>
+<div class="container">
+    <div class="content">
+        <form class="from-control" id="form">
+            <input type="hidden" id="id" name="id" value="${manifest.id }">
+            <div></div>
+            <div>
+                <table class="kv-table">
+                    <tbody>
+                        <div>
+                            <tr class="kv-content" >
+                                <td style="background-color: #EBEDF4; color: black;" class="kv-label" colspan="6"><spring:message code="wbm.loginName"/></td>
+                                <td style="background-color: #EBEDF4; color: black;" class="kv-label" colspan="1">
+                                    <%--<select id="user_update" required>--%>
+                                        <%--<c:forEach var="user" items="${userList}">--%>
+                                            <%--<option id = "${user.id}">${user.loginaccount}</option>--%>
+                                        <%--</c:forEach>--%>
+                                    <%--</select>--%>
+                                        <input type="text" id = "loginaccount" name = "loginacciunt" value="${wbm.loginaccount}" required="required">
+                                </td>
+                                <td style="background-color: #EBEDF4; color: black;" class="kv-label" colspan="4">
+                                    <button type="button"  class="layui-btn layui-btn-sm layui-icon layui-icon-user" id="subbtn">
+                                        <i class="fa fa-trash hidden" aria-hidden="true"></i>提交
+                                    </button>
+                                </td>
+                            </tr>
+                            <%--<tr class="kv-content" style="float:left">--%>
+                                <%--<td style="background-color: #EBEDF4; color: black;" class="kv-label" colspan="2">--%>
+                                     <%----%>
+                                <%--</td>--%>
+                            <%--</tr>--%>
+                        </div>
+                    </tbody>
+                </table>
+            </div>
+        </form>
+    </div>
+</div>
+
+<script type="text/javascript">
+
+
+    $("#subbtn").on("click",function () {
+        var userId = "";
+        console.log("success");
+
+        var loginaccount = $("#loginaccount").val();
+        var idss = $('#user_update>option:selected');
+        idss.val(function(){
+            userId = (this.id);
+        });
+
+        var ids = $("#id").val();
+            $.ajax({
+                type : 'POST',
+                // contentType: 'application/json; charset=UTF-8',
+                data : {
+                    "ids" : ids,
+                    "userId" : userId,
+                    "loginaccount":loginaccount
+                },
+                url :"<%=basePath%>wbm/userUpdate",
+                success : function(data) {
+                    console.log(data)
+                    if (data.status != 200) {
+                        alert("该账号不存在");
+                    }else {
+                        // parent.reLoad();
+                        alert("修改成功");
+                        window.parent.location.reload();
+                        var index = parent.layer.getFrameIndex(window.name); // 获取窗口索引
+                        parent.layer.close(index);
+                    }
+                }
+            });
+    })
+
+
+</script>
+</body>
+</html>

@@ -13,6 +13,7 @@ var detailview = $.extend({}, $.fn.datagrid.defaults.view, {
 		}
 		
 		var rows = state.data.rows;
+
 		var fields = $(target).datagrid('getColumnFields', frozen);
 		var table = [];
 		table.push('<table class="datagrid-btable" cellspacing="0" cellpadding="0" border="0"><tbody>');