完成商品退货

src/main/java/com/yeqifu/bus/controller/BusinessController.java

@@ -48,4 +48,13 @@ public class BusinessController {
         return "business/inport/inportManager";
     }
 
+    /**
+     * 跳转到退货管理页面
+     * @return
+     */
+    @RequestMapping("toOutportManager")
+    public String toOutportManager(){
+        return "business/outport/outportManager";
+    }
+
 }

src/main/java/com/yeqifu/bus/controller/InportController.java

@@ -122,13 +122,13 @@ public class InportController {
 
     /**
      * 删除进货商品
-     * @param inportVo
+     * @param id
      * @return
      */
     @RequestMapping("deleteInport")
-    public ResultObj deleteInport(InportVo inportVo){
+    public ResultObj deleteInport(Integer id){
         try {
-            inportService.removeById(inportVo);
+            inportService.removeById(id);
             return ResultObj.DELETE_SUCCESS;
         } catch (Exception e) {
             e.printStackTrace();

src/main/java/com/yeqifu/bus/controller/OutportController.java

@@ -0,0 +1,116 @@
+package com.yeqifu.bus.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeqifu.bus.entity.Goods;
+import com.yeqifu.bus.entity.Outport;
+import com.yeqifu.bus.entity.Provider;
+import com.yeqifu.bus.service.IGoodsService;
+import com.yeqifu.bus.service.IOutportService;
+import com.yeqifu.bus.service.IProviderService;
+import com.yeqifu.bus.vo.OutportVo;
+import com.yeqifu.sys.common.DataGridView;
+import com.yeqifu.sys.common.ResultObj;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * InnoDB free: 9216 kB 前端控制器
+ * </p>
+ *
+ * @author luoyi-
+ * @since 2019-12-19
+ */
+@RestController
+@RequestMapping("/outport")
+public class OutportController {
+
+    @Autowired
+    private IOutportService outportService;
+
+    @Autowired
+    private IProviderService providerService;
+
+    @Autowired
+    private IGoodsService goodsService;
+
+    /**
+     * 添加退货信息
+     * @param id    进货单ID
+     * @param number    退货数量
+     * @param remark    备注
+     * @return
+     */
+    @RequestMapping("addOutport")
+    public ResultObj addOutport(Integer id,Integer number,String remark){
+        try {
+            outportService.addOutport(id,number,remark);
+            return ResultObj.BACKINPORT_SUCCESS;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResultObj.BACKINPORT_ERROR;
+        }
+    }
+
+    /**t
+     * 查询商品退货
+     * @param outportVo
+     * @return
+     */
+    @RequestMapping("loadAllOutport")
+    public DataGridView loadAllOuport(OutportVo outportVo){
+        IPage<Outport> page = new Page<Outport>(outportVo.getPage(),outportVo.getLimit());
+        QueryWrapper<Outport> queryWrapper = new QueryWrapper<Outport>();
+        //对供应商进行查询
+        queryWrapper.eq(outportVo.getProviderid()!=null&&outportVo.getProviderid()!=0,"providerid",outportVo.getProviderid());
+        //对商品进行查询
+        queryWrapper.eq(outportVo.getGoodsid()!=null&&outportVo.getGoodsid()!=0,"goodsid",outportVo.getGoodsid());
+        //对时间进行查询要求大于开始时间小于结束时间
+        queryWrapper.ge(outportVo.getStartTime()!=null,"outputtime",outportVo.getStartTime());
+        queryWrapper.le(outportVo.getEndTime()!=null,"outputtime",outportVo.getEndTime());
+        //通过进货时间对商品进行排序
+        queryWrapper.orderByDesc("outputtime");
+        IPage<Outport> page1 = outportService.page(page, queryWrapper);
+        List<Outport> records = page1.getRecords();
+        for (Outport ouport : records) {
+            Provider provider = providerService.getById(ouport.getProviderid());
+            if (provider!=null){
+                //设置供应商姓名
+                ouport.setProvidername(provider.getProvidername());
+            }
+            Goods goods = goodsService.getById(ouport.getGoodsid());
+            if (goods!=null){
+                //设置商品名称
+                ouport.setGoodsname(goods.getGoodsname());
+                //设置商品规格
+                ouport.setSize(goods.getSize());
+            }
+        }
+        return new DataGridView(page1.getTotal(),page1.getRecords());
+    }
+
+    /**
+     * 删除退货信息
+     * @param id
+     * @return
+     */
+    @RequestMapping("deleteOutport")
+    public ResultObj deleteOutport(Integer id){
+        try {
+            outportService.removeById(id);
+            return ResultObj.DELETE_SUCCESS;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResultObj.DELETE_ERROR;
+        }
+    }
+
+
+}
+

src/main/java/com/yeqifu/bus/entity/Outport.java

@@ -0,0 +1,67 @@
+package com.yeqifu.bus.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * InnoDB free: 9216 kB
+ * </p>
+ *
+ * @author luoyi-
+ * @since 2019-12-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("bus_outport")
+public class Outport implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private Integer providerid;
+
+    private String paytype;
+
+    private Date outputtime;
+
+    private String operateperson;
+
+    private Double outportprice;
+
+    private Integer number;
+
+    private String remark;
+
+    private Integer goodsid;
+
+    /**
+     * 供应商姓名
+     */
+    @TableField(exist = false)
+    private String providername;
+
+    /**
+     * 商品名称
+     */
+    @TableField(exist = false)
+    private String goodsname;
+
+    /**
+     * 商品规格
+     */
+    @TableField(exist = false)
+    private String size;
+
+}

src/main/java/com/yeqifu/bus/mapper/OutportMapper.java

@@ -0,0 +1,16 @@
+package com.yeqifu.bus.mapper;
+
+import com.yeqifu.bus.entity.Outport;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * InnoDB free: 9216 kB Mapper 接口
+ * </p>
+ *
+ * @author luoyi-
+ * @since 2019-12-19
+ */
+public interface OutportMapper extends BaseMapper<Outport> {
+
+}

src/main/java/com/yeqifu/bus/mapper/xml/OutportMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeqifu.bus.mapper.OutportMapper">
+
+</mapper>

src/main/java/com/yeqifu/bus/service/IOutportService.java

@@ -0,0 +1,23 @@
+package com.yeqifu.bus.service;
+
+import com.yeqifu.bus.entity.Outport;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * InnoDB free: 9216 kB 服务类
+ * </p>
+ *
+ * @author luoyi-
+ * @since 2019-12-19
+ */
+public interface IOutportService extends IService<Outport> {
+
+    /**
+     * 对商品进货进行退货处理
+     * @param id    进货单ID
+     * @param number    退货数量
+     * @param remark    备注
+     */
+    void addOutport(Integer id, Integer number, String remark);
+}

src/main/java/com/yeqifu/bus/service/impl/InportServiceImpl.java

@@ -10,6 +10,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * InnoDB free: 9216 kB; (`providerid`) REFER `warehouse/bus_provider`(`id`); (`goo 服务实现类
@@ -40,6 +42,11 @@ public class InportServiceImpl extends ServiceImpl<InportMapper, Inport> impleme
         return super.save(entity);
     }
 
+    /**
+     * 更新商品进货
+     * @param entity
+     * @return
+     */
     @Override
     public boolean updateById(Inport entity) {
         //根据进货ID查询进货信息
@@ -52,4 +59,22 @@ public class InportServiceImpl extends ServiceImpl<InportMapper, Inport> impleme
         //更新进货单
         return super.updateById(entity);
     }
+
+    /**
+     * 删除商品进货信息
+     * @param id
+     * @return
+     */
+    @Override
+    public boolean removeById(Serializable id) {
+        //根据进货ID查询进货信息
+        Inport inport = baseMapper.selectById(id);
+        //根据商品ID查询商品信息
+        Goods goods = goodsMapper.selectById(inport.getGoodsid());
+        //库存算法  当前库存-进货单数量
+        goods.setNumber(goods.getNumber()-inport.getNumber());
+        goodsMapper.updateById(goods);
+        //更新商品的数量
+        return super.removeById(id);
+    }
 }

src/main/java/com/yeqifu/bus/service/impl/OutportServiceImpl.java

@@ -0,0 +1,69 @@
+package com.yeqifu.bus.service.impl;
+
+import com.yeqifu.bus.entity.Goods;
+import com.yeqifu.bus.entity.Inport;
+import com.yeqifu.bus.entity.Outport;
+import com.yeqifu.bus.mapper.GoodsMapper;
+import com.yeqifu.bus.mapper.InportMapper;
+import com.yeqifu.bus.mapper.OutportMapper;
+import com.yeqifu.bus.service.IOutportService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yeqifu.sys.common.WebUtils;
+import com.yeqifu.sys.entity.User;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * InnoDB free: 9216 kB 服务实现类
+ * </p>
+ *
+ * @author luoyi-
+ * @since 2019-12-19
+ */
+@Service
+public class OutportServiceImpl extends ServiceImpl<OutportMapper, Outport> implements IOutportService {
+
+    @Autowired
+    private InportMapper inportMapper;
+
+    @Autowired
+    private GoodsMapper goodsMapper;
+
+    /**
+     * @param id    进货单ID
+     * @param number    退货数量
+     * @param remark    备注
+     */
+    @Override
+    public void addOutport(Integer id, Integer number, String remark) {
+        //1.通过进货单ID查询出进货单信息
+        Inport inport = inportMapper.selectById(id);
+        //2.根据商品ID查询商品信息
+        Goods goods = goodsMapper.selectById(inport.getGoodsid());
+        //3.修改商品的数量     商品的数量-退货的数量
+        goods.setNumber(goods.getNumber()-number);
+
+        //修改进货的数量
+        inport.setNumber(inport.getNumber()-number);
+        inportMapper.updateById(inport);
+
+        //4.进行修改
+        goodsMapper.updateById(goods);
+
+        //5.添加退货单信息
+        Outport outport = new Outport();
+        outport.setGoodsid(inport.getGoodsid());
+        outport.setNumber(number);
+        User user = (User) WebUtils.getSession().getAttribute("user");
+        outport.setOperateperson(user.getName());
+        outport.setOutportprice(inport.getInportprice());
+        outport.setPaytype(inport.getPaytype());
+        outport.setOutputtime(new Date());
+        outport.setRemark(remark);
+        outport.setProviderid(inport.getProviderid());
+        getBaseMapper().insert(outport);
+    }
+}

src/main/java/com/yeqifu/bus/vo/OutportVo.java

@@ -0,0 +1,29 @@
+package com.yeqifu.bus.vo;
+
+import com.yeqifu.bus.entity.Outport;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @Author: 落亦-
+ * @Date: 2019/12/18 10:29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class OutportVo extends Outport {
+
+    private Integer page = 1;
+
+    private Integer limit = 10;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date startTime;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date endTime;
+
+
+}

src/main/java/com/yeqifu/sys/common/ResultObj.java

@@ -32,6 +32,9 @@ public class ResultObj {
     public static final ResultObj DISPATCH_SUCCESS = new ResultObj(Constast.OK,"分配成功");
     public static final ResultObj DISPATCH_ERROR = new ResultObj(Constast.ERROR,"分配失败");
 
+    public static final ResultObj BACKINPORT_SUCCESS = new ResultObj(Constast.OK,"退货成功");
+    public static final ResultObj BACKINPORT_ERROR = new ResultObj(Constast.ERROR,"退货失败");
+
     private Integer code;
     private String msg;
 

src/main/resources/templates/business/goods/goodsManager.html

@@ -252,10 +252,6 @@
                 {field: 'goodsname', title: '商品名称', align: 'center',width:'150'},
                 {field: 'providername', title: '供应商', align: 'center',width:'150'},
                 {field: 'produceplace', title: '商品产地', align: 'center',width:'150'},
-                {field: 'size', title: '规格', align: 'center',width:'120'},
-                {field: 'goodspackage', title: '包装', align: 'center',width:'120'},
-                {field: 'productcode', title: '生产批号', align: 'center',width:'130'},
-                {field: 'promitcode', title: '批准文号', align: 'center',width:'130'},
                 {field: 'description', title: '商品描述', align: 'center',width:'150'},
                 {field: 'price', title: '销售价格', align: 'center',width:'90'},
                 {field: 'number', title: '数量', align: 'center',width:'90'},
@@ -263,6 +259,10 @@
                 {field: 'goodsimg', title: '商品图片', align: 'center',width:'150', templet:function(d){
                     return '<img width=40 height=40 src=/file/showImageByPath?path='+d.goodsimg+ ' />';
                 }},
+                {field: 'size', title: '规格', align: 'center',width:'120'},
+                {field: 'goodspackage', title: '包装', align: 'center',width:'120'},
+                {field: 'productcode', title: '生产批号', align: 'center',width:'130'},
+                {field: 'promitcode', title: '批准文号', align: 'center',width:'130'},
                 {field: 'available', title: '是否可用', align: 'center',width:'100',templet:function (d) {
                     return d.available==1?'<font color="blue">可用</font>':'<font color="red">不可用</font>';
                 }},

src/main/resources/templates/business/inport/inportManager.html

@@ -116,9 +116,6 @@
         <button type="button" lay-event="add" shiro:hasPermission="inport:create" class="layui-btn layui-btn-sm layui-btn-normal layui-btn-radius">
             <i class="layui-icon layui-icon-add-1"></i>添加进货
         </button>
-        <button type="button" lay-event="deleteBatch" shiro:hasPermission="inport:create" class="layui-btn layui-btn-sm layui-btn-danger layui-btn-radius">
-            <i class="layui-icon layui-icon-delete"></i>批量删除
-        </button>
     </div>
     <div id="inportRowBar" style="display: none;">
         <button type="button" lay-event="update" shiro:hasPermission="inport:update" class="layui-btn layui-btn-sm layui-btn-radius"><i
@@ -127,6 +124,9 @@
         <button type="button" lay-event="delete" shiro:hasPermission="inport:delete" class="layui-btn layui-btn-sm layui-btn-danger layui-btn-radius"><i
                 class="layui-icon layui-icon-delete"></i>删除
         </button>
+        <button type="button" lay-event="back" shiro:hasPermission="inport:back" class="layui-btn layui-btn-sm layui-btn-warm layui-btn-radius"><i
+                class="layui-icon layui-icon-delete"></i>退货
+        </button>
     </div>
 </div>
 
@@ -140,6 +140,7 @@
                     <select name="providerid" id="providerid" lay-filter="providerid">
                         <option value="0">请选择供应商</option>
                     </select>
+                    <div class="mydiv" title="不可修改" style="position:absolute;width:100%;height:100%;left:0px;top:0px;background:#fff;opacity:0;filter:alpha(opacity=0)"> </div>
                 </div>
             </div>
             <div class="layui-inline">
@@ -149,6 +150,7 @@
                         <option value="0">请选择商品</option>
                     </select>
                 </div>
+                <div class="mydiv" title="不可修改" style="position:absolute;width:100%;height:100%;left:0px;top:0px;background:#fff;opacity:0;filter:alpha(opacity=0)"> </div>
             </div>
         </div>
         <div class="layui-form-item">
@@ -197,6 +199,42 @@
     </form>
 </div>
 
+<!--退货的弹出层-->
+<div id="backGoodsDiv" style="display: none;padding-right: 3%">
+    <form action="" method="post" class="layui-form" id="dataFrmBack" lay-filter="dataFrmBack">
+
+        <div class="layui-form-item">
+            <div class="layui-inline">
+                <label class="layui-form-label">退货数量</label>
+                <div class="layui-input-block">
+                    <input type="hidden" name="id">  <!-- 进货单ID  -->
+                    <input type="hidden" name="currentNumber" id="currentNumber">  <!-- 进货单中进货数量  -->
+                    <input type="text" name="number" lay-verify="required|checkNumber" autocomplete="off" class="layui-input input-radius" placeholder="请输入退货数量">
+                </div>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <div class="layui-inline">
+                <label class="layui-form-label">退货备注</label>
+                <div class="layui-input-block">
+                    <textarea name="remark" placeholder="请输入退货备注" class="layui-textarea" cols="200" rows="8"></textarea>
+                </div>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <div class="layui-input-block" style="text-align: center;padding-right: 7%">
+                <button type="button" class="layui-btn layui-btn-radius" lay-submit="" lay-filter="doBackSubmit" id="doBackSubmit"><i
+                        class="layui-icon layui-icon-search layui-icon-normal"></i>提交
+                </button>
+                <button type="reset" class="layui-btn layui-btn-radius layui-btn-warm"><i
+                        class="layui-icon layui-icon-refresh"></i><span>重置</span>
+                </button>
+            </div>
+        </div>
+    </form>
+</div>
+
+
 <script type="text/javascript" src="/resources/layui/layui.js"></script>
 
 <script type="text/javascript">
@@ -233,14 +271,14 @@
                 {field: 'id', title: 'ID', align: 'center',width:'50'},
                 {field: 'providername', title: '供应商', align: 'center',width:'100'},
                 {field: 'goodsname', title: '商品名称', align: 'center',width:'150'},
-                {field: 'size', title: '商品规格', align: 'center',width:'100'},
                 {field: 'paytype', title: '支付类型', align: 'center',width:'90'},
                 {field: 'inporttime', title: '进货时间', align: 'center',width:'170'},
                 {field: 'operateperson', title: '操作员', align: 'center',width:'130'},
                 {field: 'number', title: '进货数量', align: 'center',width:'100'},
+                {field: 'size', title: '商品规格', align: 'center',width:'100'},
                 {field: 'inportprice', title: '进货价格', align: 'center',width:'120'},
                 {field: 'remark', title: '备注', align: 'center',width:'120'},
-                {fixed: 'right', title: '操作', toolbar: '#inportRowBar', align: 'center',width:'180'}
+                {fixed: 'right', title: '操作', toolbar: '#inportRowBar', align: 'center',width:'260'}
             ] ],
             done: function (data, curr, count) {
                 //不是第一页时，如果当前返回的数据为0那么就返回上一页
@@ -342,7 +380,10 @@
                     $("#dataFrm")[0].reset();
                     //初始化供应商的下拉列表
                     initProviderSelect();
+                    //使该div隐藏
+                    $(".mydiv").hide();
                     url="/inport/addInport";
+
                 }
             });
         }
@@ -363,6 +404,8 @@
                     initProviderSelect(data.providerid);
                     //商品进行反选
                     initGoodsSelect(data.providerid,data.goodsid);
+                    //禁用供应商和商品的下拉列表
+                    $(".mydiv").show();
                     url="/inport/updateInport";
                 }
             });
@@ -441,6 +484,47 @@
             });
         }
 
+        //打开退货的弹出层
+        function backInport(data) {
+            mainIndex = layer.open({
+                type:1,
+                content:$("#backGoodsDiv"),
+                area:['600px','400px'],
+                title:'商品退货',
+                success:function () {
+                    //清空原有的数据
+                    $("#dataFrmBack")[0].reset();
+                    //装载新的数据   获得进货的ID以及当前进货单的进货数量
+                    form.val("dataFrmBack",{id:data.id,currentNumber:data.number});
+                }
+            });
+        }
+
+        //自定义验证规则
+        form.verify({
+           checkNumber: function (value) {
+               var currentNumber = $("#currentNumber").val();
+               //value为退货的数量    currentNumber为当前进货单的数量
+               if (parseInt(value)>currentNumber||parseInt(value)<1){
+                   return '退货数量只能在【0】-【'+currentNumber+'】之间';
+               }
+           }
+        });
+
+        //退货提交
+        form.on("submit(doBackSubmit)",function (data) {
+            $.post("/outport/addOutport",data.field,function (res) {
+                if (res.code==200){
+                    //重新加载表格数据
+                    tableIns.reload();
+                    //关闭退货弹出层
+                    layer.close(mainIndex);
+                }
+                layer.msg(res.msg);
+            });
+            return false;
+        })
+
 
 
     });

src/main/resources/templates/business/outport/outportManager.html

@@ -0,0 +1,256 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org"
+      xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <meta charset="UTF-8">
+    <title>Right</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta http-equiv="Access-Control-Allow-Origin" content="*">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="format-detection" content="telephone=no">
+    <link rel="icon" href="/resources/favicon.ico">
+    <link rel="stylesheet" href="resources/layui/css/layui.css" th:href="@{/resources/layui/css/layui.css}" media="all"/>
+    <link rel="stylesheet" th:href="@{/resources/css/public.css}" media="all"/>
+    <link rel="stylesheet" th:href="@{/resources/layui_ext/dtree/dtree.css}" media="all"/>
+    <link rel="stylesheet" th:href="@{/resources/layui_ext/dtree/font/dtreefont.css}" media="all"/>
+    <style>
+        input#search_provideridTree_select_input_id {
+            border-radius: 10px;
+            height: 30px;
+            margin-top: 4px;
+        }
+        input#provideridTree_select_input_id {
+            border-radius: 10px;
+            height: 30px;
+            margin-top: 4px;
+        }
+        input#leaderprovideridTree_select_input_id {
+            border-radius: 10px;
+            height: 30px;
+            margin-top: 4px;
+        }
+        input.layui-input.layui-unselect {
+            border-radius: 10px;
+            height: 30px;
+            margin-top: 4px;
+        }
+        input#search_goodsidTree_select_input_id {
+            border-radius: 10px;
+            height: 30px;
+            margin-top: 4px;
+        }
+        input#goodsidTree_select_input_id {
+            border-radius: 10px;
+            height: 30px;
+            margin-top: 4px;
+        }
+        input#leadergoodsidTree_select_input_id {
+            border-radius: 10px;
+            height: 30px;
+            margin-top: 4px;
+        }
+        input.layui-input.layui-unselect {
+            border-radius: 10px;
+            height: 30px;
+            margin-top: 4px;
+        }
+    </style>
+</head>
+<body>
+<!--查询条件-->
+<fieldset class="layui-elem-field layui-field-title" style="margin-top: 15px;">
+    <legend>搜索条件</legend>
+</fieldset>
+<form action="" method="post" id="searchFrm" lay-filter="searchFrm" class="layui-form">
+    <div class="layui-form-item">
+        <div class="layui-inline">
+            <label class="layui-form-label">供应商名称</label>
+            <div class="layui-input-inline">
+                <select name="providerid" id="select_providerid">
+                    <option value="0">请选择供应商</option>
+                </select>
+            </div>
+        </div>
+        <div class="layui-inline">
+            <label class="layui-form-label">商品名称</label>
+            <div class="layui-input-inline">
+                <select name="goodsid" id="select_goodsid">
+                    <option value="0">请选择商品</option>
+                </select>
+            </div>
+        </div>
+        <div class="layui-inline">
+            <label class="layui-form-label">开始时间</label>
+            <div class="layui-input-inline">
+                <input type="text" name="startTime" id="startTime" readonly="readonly" placeholder="yyyy-MM-dd"
+                       class="layui-input input-radius">
+            </div>
+        </div>
+        <div class="layui-inline">
+            <label class="layui-form-label">结束时间</label>
+            <div class="layui-input-inline">
+                <input type="text" name="endTime" id="endTime" readonly="readonly" placeholder="yyyy-MM-dd"
+                       class="layui-input input-radius">
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <div class="layui-input-block" style="text-align: center;padding-right: 15%;">
+            <button type="button" class="layui-btn layui-btn-sm layui-btn-radius" lay-submit="" lay-filter="doSearch"><i
+                    class="layui-icon layui-icon-search layui-icon-normal"></i>查询
+            </button>
+            <button type="reset" class="layui-btn layui-btn-sm layui-btn-radius layui-btn-warm"><i
+                    class="layui-icon layui-icon-refresh"></i><span>重置</span>
+            </button>
+        </div>
+    </div>
+</form>
+
+<!--数据表格-->
+<div>
+    <table class="layui-hide" id="outportTable" lay-filter="outportTable"></table>
+    <div id="outportRowBar" style="display: none;">
+        <button type="button" lay-event="delete" shiro:hasPermission="outport:delete" class="layui-btn layui-btn-sm layui-btn-danger layui-btn-radius"><i
+                class="layui-icon layui-icon-delete"></i>删除
+        </button>
+    </div>
+</div>
+
+
+<script type="text/javascript" src="/resources/layui/layui.js"></script>
+
+<script type="text/javascript">
+
+    //提升数据表格的作用域，因为底下还有一个reloadTable方法
+    var tableIns;
+
+    layui.use(['jquery', 'form', 'layer', 'table', 'laydate'], function () {
+        var $ = layui.jquery;
+        var form = layui.form;
+        var layer = layui.layer;
+        var table = layui.table;
+        var laydate = layui.laydate;
+
+        //初始化时间选择器
+        laydate.render({
+            elem: '#startTime',
+            type: 'datetime'
+        });
+        laydate.render({
+            elem: '#endTime',
+            type: 'datetime'
+        })
+
+        //初始化表格 加载数据
+        tableIns = table.render({
+            elem: "#outportTable",
+            title: "进货数据表格",
+            url: "/outport/loadAllOutport",
+            toolbar: true,
+            page: true,
+            height: "full-180",
+            cols: [ [
+                {field: 'id', title: 'ID', align: 'center'},
+                {field: 'providername', title: '供应商', align: 'center',width:'130'},
+                {field: 'goodsname', title: '商品名称', align: 'center',width:'150'},
+                {field: 'paytype', title: '支付类型', align: 'center',width:'90'},
+                {field: 'outputtime', title: '退货时间', align: 'center',width:'170'},
+                {field: 'operateperson', title: '操作员', align: 'center',width:'130'},
+                {field: 'number', title: '退货数量', align: 'center',width:'100'},
+                {field: 'outportprice', title: '退货价格', align: 'center',width:'120'},
+                {field: 'remark', title: '备注', align: 'center',width:'130'},
+                {field: 'size', title: '商品规格', align: 'center',width:'100'},
+                {fixed: 'right', title: '操作', toolbar: '#outportRowBar', align: 'center',width:'130'}
+            ] ],
+            done: function (data, curr, count) {
+                //不是第一页时，如果当前返回的数据为0那么就返回上一页
+                if (data.data.length == 0 && curr != 1) {
+                    tableIns.reload({
+                        page: {
+                            curr: curr - 1
+                        }
+                    })
+                }
+                //当是第一页时，如果当前返回的数据为0并且当前为第一页  给一个空的查询条件，并给curr赋初值为1
+                if (data.data.length==0 && curr==1){
+                    tableIns.reload({
+                        where: "",
+                        page:{
+                            curr:1
+                        }
+                    })
+                }
+            }
+        });
+
+        //监控模糊查询按钮事件
+        form.on("submit(doSearch)", function (data) {
+            tableIns.reload({
+                where: data.field,
+                page: {
+                    curr: 1
+                }
+            });
+            return false;
+        });
+
+        //监控行工具条事件
+        table.on("tool(outportTable)", function (obj) {
+            //获取当前行数据
+            var data = obj.data;
+            switch (obj.event) {
+                case 'delete':
+                    deleteOutport(data);
+                    break;
+            };
+        });
+
+        //初始化供应商名称的下拉列表
+        $.get("/provider/loadAllProviderForSelect",function (res) {
+            var data = res.data;
+            var dom = $("#select_providerid");
+            var html = '<option value="0">请选择供应商</option>';
+            $.each(data,function (index, item) {
+                html += '<option value="'+item.id+'">'+item.providername+'</option>';
+            })
+            dom.html(html);
+            //重新渲染下拉列表
+            form.render("select");
+        });
+        //初始化商品名称的下拉列表
+        $.get("/goods/loadAllGoodsForSelect",function (res) {
+            var data = res.data;
+            var dom = $("#select_goodsid");
+            var html = '<option value="0">请选择商品</option>';
+            $.each(data,function (index, item) {
+                html += '<option value="'+item.id+'">'+item.goodsname+'-['+item.size+']-'+'['+item.providername+']'+'</option>';
+            });
+            dom.html(html);
+            //重新渲染下拉列表
+            form.render("select");
+        });
+
+        //删除退货信息
+        function deleteOutport(data) {
+            layer.confirm('你确定要删除这条退货信息吗？', {icon: 3, title: '提示'}, function (index) {
+                $.post("/outport/deleteOutport", {id: data.id},function (res) {
+                    if (res.code == 200) {
+                        tableIns.reload();
+                    }
+                    layer.msg(res.msg);
+                });
+                layer.close(index);
+            });
+        }
+
+
+    });
+
+
+</script>
+
+</body>
+</html>