完成pc端与移动端页面的更新

pom.xml

@@ -176,6 +176,7 @@
         </dependency>
 
 
+
     </dependencies>
 
     <dependencyManagement>

src/main/java/com/dreamchaser/depository_manage/entity/Material.java

@@ -61,4 +61,9 @@ public class Material {
      */
     private String depositoryCode;
 
+    /**
+     * 暂存额度
+     */
+    private Integer  numberOfTemporary;
+
 }

src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml

@@ -18,6 +18,7 @@
         <result column="amounts" property="amounts" jdbcType="DOUBLE"/>
         <result column="unit" property="unit" jdbcType="VARCHAR"/>
         <result column="texture" property="texture" jdbcType="VARCHAR"/>
+        <result column="number_of_temporary" property="numberOfTemporary" jdbcType="VARCHAR"/>
     </resultMap>
 
 <!--    字段映射-->
@@ -50,7 +51,7 @@
 
     <!-- 表查询字段 -->
     <sql id="allColumns">
-        m.id, m.depository_id, m.mname, m.quantity, m.price, m.type_id,m.state,m.code ,m.version ,m.amounts ,m.unit ,m.texture,m.depositoryCode
+        m.id, m.depository_id, m.mname, m.quantity, m.price, m.type_id,m.state,m.code ,m.version ,m.amounts ,m.unit ,m.texture,m.depositoryCode,m.number_of_temporary
     </sql>
 
     <!-- 表查询字段，包括材料类型 -->
@@ -244,7 +245,10 @@
                 unit = #{unit},
             </if>
             <if test="depositoryCode != null and depositoryCode !=''">
-                depositoryCode = #{depositoryCode}
+                depositoryCode = #{depositoryCode},
+            </if>
+            <if test="numberOfTemporary != null and numberOfTemporary != ''">
+                number_of_temporary = #{numberOfTemporary}
             </if>
         </set>
         WHERE id = #{id}

src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java

@@ -19,7 +19,10 @@ import com.dreamchaser.depository_manage.utils.WordUtil;
 import org.apache.http.protocol.HTTP;
 import org.springframework.beans.Mergeable;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
+import org.springframework.data.redis.core.RedisOperations;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.SessionCallback;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import cn.hutool.core.lang.Snowflake;
@@ -28,6 +31,7 @@ import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * @author Dreamchaser
@@ -72,6 +76,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
 
     /**
      * 插入一条入库记录
+     *
      * @param map
      * @return
      */
@@ -125,8 +130,10 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
         }
         return depositoryRecordMapper.insertApplicationInRecord(map);
     }
+
     /**
      * 插入一条出库记录
+     *
      * @param map
      * @return
      */
@@ -144,6 +151,10 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
         map.put("depositoryId", materialById.getDepositoryId());
         map.put("state", "待部门负责人审核");
         map.put("istransfer", 2);
+        Map<String, Object> update = new HashMap<>();
+        update.put("id", materialById.getId());
+        update.put("numberOfTemporary", materialById.getNumberOfTemporary() + quantity);
+        materialMapper.updateMaterial(update);
         Depository depositoryRecordById = depositoryMapper.findDepositoryRecordById(materialById.getDepositoryId());
         String code = createCode(depositoryRecordById.getDname(), "outOrderNumber");
         map.put("code", code);
@@ -162,6 +173,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
 
     /**
      * 计算购入材料总数
+     *
      * @return
      */
     @Override
@@ -176,6 +188,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
 
     /**
      * 计算出库材料总数
+     *
      * @param state
      * @return
      */
@@ -256,8 +269,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
             } else {
                 map.put("state", "部门负责人审核未通过");
             }
-        }
+        } else {
-        else {
             String simpleTime = DateUtil.getSimpleTime(new Date());
             map.put("depositoryManagerTime", DateUtil.DateTimeToTimeStamp(simpleTime));
             map.put("depositoryManager", userid);
@@ -271,6 +283,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                     Double sum = material.getPrice() * record.getQuantity();
                     material.setAmounts(material.getAmounts() - sum);
                     material.setQuantity(material.getQuantity() - record.getQuantity());
+                    material.setNumberOfTemporary(material.getNumberOfTemporary() - record.getQuantity());
                     materialMapper.updateMaterial(material);
                     if (record.getIstransfer() == 1) {
                         map.put("quantity", record.getQuantity().toString());
@@ -281,6 +294,10 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                 } else {
                     map.put("state", "未出库");
                     map.put("depositoryManagerMessage", "当前仓位库存量不足");
+                    Map<String, Object> update = new HashMap<>();
+                    update.put("id", material.getId());
+                    update.put("numberOfTemporary", 0);
+                    materialMapper.updateMaterial(update);
                     depositoryRecordMapper.updateApplicationOutRecord(map);
                     return -1;
                 }
@@ -294,6 +311,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
 
     /**
      * 转移物品
+     *
      * @param map
      */
     public void transferMaterial(Map<String, Object> map) {
@@ -388,6 +406,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
 
     /**
      * 根据条件查询入库记录，同时支持分页查询
+     *
      * @param map
      * @return
      */
@@ -416,8 +435,10 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
         }
         return list;
     }
+
     /**
      * 根据条件查询出库记录，同时支持分页查询
+     *
      * @param map
      * @return
      */
@@ -449,6 +470,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
 
     /**
      * 根据条件查询出库记录数目
+     *
      * @param map
      * @return
      */
@@ -459,6 +481,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
 
     /**
      * 根据id查询出库记录
+     *
      * @param id
      * @return
      */
@@ -469,6 +492,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
 
     /**
      * 根据条件查询入库记录数目
+     *
      * @param map
      * @return
      */
@@ -539,6 +563,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
     public Integer findMyTaskCount(Map<String, Object> map) {
         return depositoryRecordMapper.findMyTaskCount(map);
     }
+
     /**
      * 返回该我的任务数（完成或者未完成）
      *
@@ -617,6 +642,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
 
     /**
      * 计算入库材料总额
+     *
      * @return
      */
     @Override
@@ -634,6 +660,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
 
     /**
      * 计算出库材料总额
+     *
      * @param state
      * @return
      */
@@ -784,6 +811,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
 
     /**
      * 根据id查询入库记录
+     *
      * @param id
      * @return
      */
@@ -794,8 +822,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
 
     /**
      * 根据id删除入库记录
-     * @return 受影响的行数
+     *
      * @param id
+     * @return 受影响的行数
      */
     @Override
     public Integer deleteApplicationInRecordById(Integer id) {
@@ -804,6 +833,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
 
     /**
      * 根据id集合删除多条入库记录
+     *
      * @param list id集合
      * @return 受影响的行数
      */
@@ -813,7 +843,6 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
     }
 
 
-
     /**
      * 对查出来的记录进行包装，包装成前端需要的数据
      *
@@ -881,6 +910,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
 
     /**
      * 根据id获取对应用户
+     *
      * @param id
      * @return
      */
@@ -904,10 +934,12 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
 
     /**
      * 生成单号
+     *
      * @param depositoryName
      * @return
      */
     private String createCode(String depositoryName, String key) {
+
 //        单号（公司简称+仓库简称+年月日+数字（位数设置>=9））
         String code = "GK";
         String nowTime = DateUtil.getNowTime();

src/main/resources/application-test.yml

@@ -80,6 +80,10 @@ spring:
         min-idle: 0
     timeout: 2000ms
 
+
+
+
+
 #  resources:
 #    static-locations: classpath:/static/
 server:

src/main/resources/static/css/public.css

@@ -82,7 +82,7 @@ body {
 }
 
 .my-time{
-    margin-top: 20px;
+    margin-top: 40px;
     margin-bottom: 20px;
 }
 body{

src/main/resources/static/js/lay-module/step-lay/step.css

@@ -3,6 +3,7 @@
     width: 400px;
     margin: 0 auto;
     max-width: 100%;
+    text-align: center;
 }
 
 .step-item {
@@ -54,8 +55,9 @@
 .step-item-main {
     display: block;
     position: relative;
-    margin-left: -50%;
+    /*margin-left: -20px;*/
-    margin-right: 50%;
+    /*margin-left: -50%;*/
+    /*margin-right: 50%;*/
     padding-left: 26px;
     text-align: center;
 }

src/main/resources/static/js/lay-module/step-lay/step.js

@@ -4,21 +4,24 @@
     var carousel = layui.carousel;
 
     // 添加步骤条dom节点
-    var renderDom = function (elem, stepItems, position) {
+    var renderDom = function (elem, stepItems, position,newnumber) {
         var stepDiv = '<div class="lay-step">';
         for (var i = 0; i < stepItems.length; i++) {
             stepDiv += '<div class="step-item">';
             // 线
             if (i < (stepItems.length - 1)) {
                 if (i < position) {
-                    stepDiv += '<div class="step-item-tail"><i class="step-item-tail-done"></i></div>';
+                    stepDiv += '<div class="step-item-tail" style="display:none;"><i class="step-item-tail-done" ></i></div>';
                 } else {
-                    stepDiv += '<div class="step-item-tail"><i class=""></i></div>';
+                    stepDiv += '<div class="step-item-tail" style="display:none;"><i class=""></i></div>';
                 }
             }
 
             // 数字
             var number = stepItems[i].number;
+            if(newnumber != 0){
+            number = newnumber;
+            }
             if (!number) {
                 number = i + 1;
             }
@@ -60,6 +63,7 @@
             param.indicator = 'none';  // 不显示指示器
             param.arrow = 'always';  // 始终显示箭头
             param.autoplay = false;  // 关闭自动播放
+
             if (!param.stepWidth) {
                 param.stepWidth = '400px';
             }
@@ -69,7 +73,7 @@
 
             // 渲染步骤条
             var stepItems = param.stepItems;
-            renderDom(param.elem, stepItems, param.position||0);
+            renderDom(param.elem, stepItems, param.position||0,param.number);
             $('.lay-step').css('width', param.stepWidth);
 
             //监听轮播切换事件

src/main/resources/templates/index.html

@@ -51,6 +51,10 @@
 
             <ul class="layui-nav layui-layout-right">
 
+
+                <li class="layui-nav-item" lay-unselect>
+                    <a href="javascript:;" id="scan"><i class="fa fa-square-o" aria-hidden="true"></i></a>
+                </li>
                 <li class="layui-nav-item" lay-unselect>
                     <a href="javascript:;" data-refresh="刷新"><i class="fa fa-refresh"></i></a>
                 </li>
@@ -151,9 +155,11 @@
         };
         options.iniUrl=  "/index/menus?uid="+uid    // 初始化接口
         miniAdmin.render(options);
-        console.log(options)
 
 
+        /*$("#scan").on("click",function () {
+            alert("扫一扫")
+        });*/
 
 
         // 百度统计代码，只统计指定域名

src/main/resources/templates/pages/application/application-review.html

@@ -156,13 +156,15 @@
 
         var state=$("#state").text();
         //当前处于的状态
-        var position=0,states={};
+        var position=0,states={},number = 1;
         if (state === "待部门负责人审核" || state === "部门负责人审核未通过") {
-            position = 1;
+        // , {title: "未入库"}
-            states  = [{title: "提交申请"}, {title: state}, {title: "未入库"}];
+            states  = [ {title: state}];
+            number = 2;
         } else {
-            position = 2;
+            // {title: "提交申请"},
-            states = [{title: "提交申请"}, {title: "审核通过"}, {title: state}];
+            states = [  {title: state}];
+            number = 3;
         }
         step.render({
             elem: '#stepForm',
@@ -171,6 +173,7 @@
             stepWidth: '750px',
             height: '650px',
             position: position,
+            number:number,
             stepItems: states
         });
 

src/main/resources/templates/pages/application/application-transfer.html

@@ -203,6 +203,7 @@
 
         $('.next').click(function () {
             step.next('#stepForm');
+
         });
 
         // 实现卡片添加

src/main/resources/templates/pages/application/my-apply.html

@@ -10,28 +10,26 @@
     <link rel="stylesheet" href="/static/css/public.css" media="all">
 </head>
 <body>
+<style>
+    .clearfix:after, .clearfix:before {
+        content: "";
+        display: table;
+    }
+
+    .clearfix:after {
+        clear: both;
+    }
+
+    .clearfix {
+        *zoom: 1;
+    }
+</style>
 <div class="layui-bg-gray">
     <fieldset class="layui-elem-field layui-field-title" style="padding: 10px;">
         <legend>入库记录</legend>
-    <table class="layui-table">
+        <ul id="LAY_floor_in" class="flow-default" style="width: 100%"></ul>
-        <colgroup>
-            <col width="25%">
-            <col width="25%">
-            <col width="25%">
-            <col width="25%">
-        </colgroup>
-        <tbody id="LAY_floor_in"></tbody>
-    </table>
         <legend>出库申请</legend>
-    <table class="layui-table">
+        <ul id="LAY_floor_out" class="flow-default" style="width: 100%"></ul>
-        <colgroup>
-            <col width="25%">
-            <col width="25%">
-            <col width="25%">
-            <col width="25%">
-        </colgroup>
-        <tbody id="LAY_floor_out"></tbody>
-    </table>
     </fieldset>
 </div>
 
@@ -39,9 +37,13 @@
 <script src="/static/js/lay-config.js?v=1.0.4" charset="utf-8"></script>
 <script>
     var data;
+
     //先声明
-    function openDetailIn(data){};
+    function openDetailIn(data) {
-    function openDetailOut(data){};
+    };
+
+    function openDetailOut(data) {
+    };
     layui.use(['flow', 'layer', 'flow', 'util'], function () {
         var $ = layui.jquery,
             layer = layui.layer,
@@ -61,21 +63,19 @@
                     result = res.data;
                     applicationIn = result["applicationIn"];
                     InCount = result["InCount"];
-                    applicationOut = result["applicationOut"];
+                    var Width = "25%";
-                    for (let i = 0; i < applicationIn.length; i++) {
+                    if (isMobile()) {
-                        if (i%4===0){
+                        Width = "50%";
-                            lis.push('<tr>');
                     }
-                        lis.push('<td><div class="layui-card  my-shadow my-card flow1" onclick="openDetailIn('
+                    lis.push("<div class='clearfix'>")
+                    for (let i = 0; i < applicationIn.length; i++) {
+                        lis.push('<li style="width:' + Width + ';float:left;"><div class="layui-card  my-shadow my-card flow1" onclick="openDetailIn('
                             + applicationIn[i].id + ')"><div class="layui-card-header"><h2>'
-                            +applicationIn[i].applicantName+'的入库记录')
+                            + applicationIn[i].applicantName + '的入库记录</h2></div>')
-                        lis.push('<div class="layui-card-body">'+applicationIn[i].applyRemark
+                        lis.push('<div class="layui-col-md4 my-time" style="margin-left: 15px; color: #999;font-size: 12px;">'
-                            +'</div><div class="layui-col-md4 my-time" style="margin-left: 15px; color: #999;font-size: 12px;">'
+                            + applicationIn[i].applicantTime + '</div></div></li>');
-                            +applicationIn[i].applicantTime+'</div></div></td>');
-                        if (i%4===3){
-                            lis.push('</tr>');
-                        }
                     }
+                    lis.push('</div>');
                     inpre += applicationIn.length;
                     //执行下一页渲染，第二参数为：满足“加载更多”的条件，即后面仍有分页
                     //pages为Ajax返回的总页数，只有当前页小于总页数的情况下，才会继续出现加载更多
@@ -90,25 +90,26 @@
             , done: function (page, next) { //执行下一页的回调
                 let lis = [];
                 let result;
+                lis.push("<div class='clearfix'>")
                 $.get('/depositoryRecord/myApply?page=' + page + '&size=' + size, function (res) {
                     result = res.data;
-                    applicationIn = result["applicationIn"];
                     applicationOut = result["applicationOut"];
                     OutCount = result["OutCount"];
-                    for (let i = 0; i < applicationOut.length; i++) {
+                    var Width = "25%";
-                        if (i%4===0){
+                    if (isMobile()) {
-                            lis.push('<tr>');
+                        Width = "50%";
                     }
-                        lis.push('<td><div class="layui-card  my-shadow my-card flow1" onclick="openDetailOut('
+                    lis.push("<div class='clearfix'>")
+                    for (let i = 0; i < applicationOut.length; i++) {
+
+                        lis.push('<li style="width:' + Width + ';float:left;"><div class="layui-card  my-shadow my-card flow1" onclick="openDetailOut('
                             + applicationOut[i].id + ')"><div class="layui-card-header"><h2>'
-                            +applicationOut[i].applicantName+'的出库请求')
+                            + applicationOut[i].applicantName + '的出库请求</h2></div>')
-                        lis.push('<div class="layui-card-body">'+applicationOut[i].applyRemark
+                        lis.push('<div class="layui-col-md4 my-time" style="margin-left: 15px; color: #999;font-size: 12px;">'
-                            +'</div><div class="layui-col-md4 my-time" style="margin-left: 15px; color: #999;font-size: 12px;">'
+                            + applicationOut[i].applicantTime + '</div></div></li>');
-                            +applicationOut[i].applicantTime+'</div></div></td>');
+
-                        if (i%4===3){
-                            lis.push('</tr>');
-                        }
                     }
+                    lis.push('</div>');
                     outpre += applicationOut.length;
                     //执行下一页渲染，第二参数为：满足“加载更多”的条件，即后面仍有分页
                     //pages为Ajax返回的总页数，只有当前页小于总页数的情况下，才会继续出现加载更多
@@ -129,7 +130,7 @@
             $(window).on("resize", function () {
                 layer.full(index);
             });
-        },
+        };
         openDetailOut = function (item) {
             var index = layer.open({
                 title: '请求详情',
@@ -143,6 +144,15 @@
             $(window).on("resize", function () {
                 layer.full(index);
             });
+        };
+
+        //定义一个函数判断是手机端还是pc端
+        function isMobile() {
+            if (window.navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i)) {
+                return true; // 移动端
+            } else {
+                return false; // PC端
+            }
         }
     });
 </script>

src/main/resources/templates/pages/application/my-task.html

@@ -10,36 +10,31 @@
     <link rel="stylesheet" href="/static/css/public.css" media="all">
 
 </head>
+<style>
+    .clearfix:after,.clearfix:before{
+        content: "";
+        display: table;
+    }
+    .clearfix:after{
+        clear: both;
+    }
+    .clearfix{
+        *zoom: 1;
+    }
+</style>
+
 
 <div class="layui-bg-gray" style="padding: 10px;">
     <fieldset class="layui-elem-field layui-field-title">
         <legend>未完成任务</legend>
     </fieldset>
-    <table class="layui-table">
+    <ul id="LAY_floor1" class="flow-default" style="width: 100%"></ul>
-        <colgroup>
-            <col width="25%">
-            <col width="25%">
-            <col width="25%">
-            <col width="25%">
-        </colgroup>
-        <tbody id="LAY_floor1">
-        </tbody>
-    </table>
 </div>
 <div class="layui-bg-gray" style="padding: 10px;">
     <fieldset class="layui-elem-field layui-field-title">
         <legend>已完成任务</legend>
     </fieldset>
-    <table class="layui-table">
+   <ul id="LAY_floor2" class="flow-default" style="width: 100%"></ul>
-        <colgroup>
-            <col width="25%">
-            <col width="25%">
-            <col width="25%">
-            <col width="25%">
-        </colgroup>
-        <tbody id="LAY_floor2">
-        </tbody>
-    </table>
 </div>
 
 
@@ -56,10 +51,11 @@
     //先声明
     function openDetail2(data) {
     };
-    layui.use(['flow', 'layer', 'flow', 'util'], function () {
+    layui.use(['flow', 'layer', 'table', 'util'], function () {
         var $ = layui.jquery,
             layer = layui.layer,
             flow = layui.flow,
+            table = layui.table,
             util = layui.util;
         //每页的数量
         var size=8;
@@ -72,26 +68,21 @@
                 let lis = [];
                 let result;
                 $.get('/depositoryRecord/myTask?page='+page+'&size='+size+'&isDone=0', function(res){
+                    var Width = "25%";
                     result=res.data;
-                    console.log(res)
+                    lis.push("<div class='clearfix'>")
                     for (let i=0;i<result.length;i++){
-                        if (i%4===0){
+                        if(isMobile()){
-                            lis.push('<tr>');
+                            Width = "50%";
                         }
-                        lis.push('<td><div class="layui-card  my-shadow my-card flow1" onclick="openDetail1('
+                        lis.push('<li style="width:'+ Width +';float:left;"><div class="layui-card  my-shadow my-card flow1" onclick="openDetail1('
                             +result[i].id+')"><div class="layui-card-header"><h2>'
                             +result[i].applicantName+'的')
                             lis.push('出库请求</h2></div>');
-                        lis.push('<div class="layui-card-body">'+result[i].applyRemark
+                        lis.push('<div class="layui-col-md4 my-time" style="margin-left: 15px; color: #999;font-size: 12px;">'
-                            +'</div><div class="layui-col-md4 my-time" style="margin-left: 15px; color: #999;font-size: 12px;">'
+                            +result[i].applicantTime+'</div></div></li>');
-                            +result[i].applicantTime+'</div></div></td>');
-                        if (i%4===3){
-                            lis.push('</tr>');
-                        }
-                    }
-                    if (result.length%4!==0){
-                        lis.push('</tr>');
                     }
+                    lis.push('</div>');
                     pre1+=result.length;
                     //执行下一页渲染，第二参数为：满足“加载更多”的条件，即后面仍有分页
                     //pages为Ajax返回的总页数，只有当前页小于总页数的情况下，才会继续出现加载更多
@@ -107,12 +98,14 @@
                 let lis = [];
                 let result;
                 $.get('/depositoryRecord/myTask?page='+page+'&size='+size+'&isDone=1', function(res){
+                    var Width = "25%";
                     result=res.data;
+                    lis.push("<div class='clearfix'>")
                     for (let i=0;i<result.length;i++){
-                        if (i%4===0){
+                        if(isMobile()){
-                            lis.push('<tr>');
+                            Width = "50%";
                         }
-                        lis.push('<td><div class="layui-card  my-shadow my-card flow1" onclick="openDetail2('
+                        lis.push('<li style="width:'+ Width +';float:left;"><div class="layui-card  my-shadow my-card flow1" onclick="openDetail2('
                             +result[i].id+')" ><div class="layui-card-header"><h2>'
                             +result[i].applicantName+'的')
                         if (result[i].type===1){
@@ -120,16 +113,10 @@
                         }else {
                             lis.push('出库请求</h2></div>');
                         }
-                        lis.push('<div class="layui-card-body">'+result[i].applyRemark
+                        lis.push('<div class="layui-col-md4 my-time" style="margin-left: 15px; color: #999;font-size: 12px;">'
-                            +'</div><div class="layui-col-md4 my-time" style="margin-left: 15px; color: #999;font-size: 12px;">'
+                            +result[i].applicantTime+'</div></div></li>');
-                            +result[i].applicantTime+'</div></div></td>');
-                        if (i%4===3){
-                            lis.push('</tr>');
-                        }
-                    }
-                    if (result.length%4!==0){
-                        lis.push('</tr>');
                     }
+                    lis.push("</div>")
                     pre2+=result.length;
                     //执行下一页渲染，第二参数为：满足“加载更多”的条件，即后面仍有分页
                     //pages为Ajax返回的总页数，只有当前页小于总页数的情况下，才会继续出现加载更多
@@ -174,6 +161,14 @@
             });
         }
 
+        //定义一个函数判断是手机端还是pc端
+        function isMobile(){
+            if(window.navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i)) {
+                return true; // 移动端
+            }else{
+                return false; // PC端
+            }
+        }
     });
 </script>
 </html>

src/main/resources/templates/pages/application/my-task_back.html

@@ -30,15 +30,8 @@
     <fieldset class="layui-elem-field layui-field-title">
         <legend>已完成任务</legend>
     </fieldset>
-
-
     <table class="layui-table">
-        <colgroup>
+
-            <col width="25%">
-            <col width="25%">
-            <col width="25%">
-            <col width="25%">
-        </colgroup>
         <tbody id="LAY_floor2">
         </tbody>
     </table>
@@ -58,10 +51,11 @@
     //先声明
     function openDetail2(data) {
     };
-    layui.use(['flow', 'layer', 'flow', 'util'], function () {
+    layui.use(['flow', 'layer', 'table', 'util'], function () {
         var $ = layui.jquery,
             layer = layui.layer,
             flow = layui.flow,
+            table = layui.table,
             util = layui.util;
         //每页的数量
         var size=8;
@@ -82,14 +76,10 @@
                         lis.push('<td ><div class="layui-card  my-shadow my-card flow1" onclick="openDetail1('
                             +result[i].id+')"><div class="layui-card-header"><h2>'
                             +result[i].applicantName+'的')
-                        if (result[i].type===1){
-                            lis.push('入库请求</h2></div>');
-                        }else {
                         lis.push('出库请求</h2></div>');
-                        }
                         lis.push('<div class="layui-card-body">'+result[i].applyRemark
                             +'</div><div class="layui-col-md4 my-time" style="margin-left: 15px; color: #999;font-size: 12px;">'
-                            +result[i].applyTime+'</div></div></td>');
+                            +result[i].applicantTime+'</div></div></td>');
                         if (i%4===3){
                             lis.push('</tr>');
                         }
@@ -127,7 +117,7 @@
                         }
                         lis.push('<div class="layui-card-body">'+result[i].applyRemark
                             +'</div><div class="layui-col-md4 my-time" style="margin-left: 15px; color: #999;font-size: 12px;">'
-                            +result[i].applyTime+'</div></div></td>');
+                            +result[i].applicantTime+'</div></div></td>');
                         if (i%4===3){
                             lis.push('</tr>');
                         }
@@ -169,7 +159,7 @@
                 maxmin: true,
                 shadeClose: true,
                 area: ['100%', '100%'],
-                content: '/form_step_look?id='+item,
+                content: '/ApplicationOutView?id='+item,
                 end:function () {
                     location.reload()
                 }

target/classes/application-test.yml

@@ -80,6 +80,10 @@ spring:
         min-idle: 0
     timeout: 2000ms
 
+
+
+
+
 #  resources:
 #    static-locations: classpath:/static/
 server:

target/classes/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml

@@ -18,6 +18,7 @@
         <result column="amounts" property="amounts" jdbcType="DOUBLE"/>
         <result column="unit" property="unit" jdbcType="VARCHAR"/>
         <result column="texture" property="texture" jdbcType="VARCHAR"/>
+        <result column="number_of_temporary" property="numberOfTemporary" jdbcType="VARCHAR"/>
     </resultMap>
 
 <!--    字段映射-->
@@ -50,7 +51,7 @@
 
     <!-- 表查询字段 -->
     <sql id="allColumns">
-        m.id, m.depository_id, m.mname, m.quantity, m.price, m.type_id,m.state,m.code ,m.version ,m.amounts ,m.unit ,m.texture,m.depositoryCode
+        m.id, m.depository_id, m.mname, m.quantity, m.price, m.type_id,m.state,m.code ,m.version ,m.amounts ,m.unit ,m.texture,m.depositoryCode,m.number_of_temporary
     </sql>
 
     <!-- 表查询字段，包括材料类型 -->
@@ -244,7 +245,10 @@
                 unit = #{unit},
             </if>
             <if test="depositoryCode != null and depositoryCode !=''">
-                depositoryCode = #{depositoryCode}
+                depositoryCode = #{depositoryCode},
+            </if>
+            <if test="numberOfTemporary != null and numberOfTemporary != ''">
+                number_of_temporary = #{numberOfTemporary}
             </if>
         </set>
         WHERE id = #{id}

target/classes/static/css/public.css

@@ -82,7 +82,7 @@ body {
 }
 
 .my-time{
-    margin-top: 20px;
+    margin-top: 40px;
     margin-bottom: 20px;
 }
 body{

target/classes/static/js/lay-module/step-lay/step.css

@@ -3,6 +3,7 @@
     width: 400px;
     margin: 0 auto;
     max-width: 100%;
+    text-align: center;
 }
 
 .step-item {
@@ -54,8 +55,9 @@
 .step-item-main {
     display: block;
     position: relative;
-    margin-left: -50%;
+    /*margin-left: -20px;*/
-    margin-right: 50%;
+    /*margin-left: -50%;*/
+    /*margin-right: 50%;*/
     padding-left: 26px;
     text-align: center;
 }

target/classes/static/js/lay-module/step-lay/step.js

@@ -4,21 +4,24 @@
     var carousel = layui.carousel;
 
     // 添加步骤条dom节点
-    var renderDom = function (elem, stepItems, position) {
+    var renderDom = function (elem, stepItems, position,newnumber) {
         var stepDiv = '<div class="lay-step">';
         for (var i = 0; i < stepItems.length; i++) {
             stepDiv += '<div class="step-item">';
             // 线
             if (i < (stepItems.length - 1)) {
                 if (i < position) {
-                    stepDiv += '<div class="step-item-tail"><i class="step-item-tail-done"></i></div>';
+                    stepDiv += '<div class="step-item-tail" style="display:none;"><i class="step-item-tail-done" ></i></div>';
                 } else {
-                    stepDiv += '<div class="step-item-tail"><i class=""></i></div>';
+                    stepDiv += '<div class="step-item-tail" style="display:none;"><i class=""></i></div>';
                 }
             }
 
             // 数字
             var number = stepItems[i].number;
+            if(newnumber != 0){
+            number = newnumber;
+            }
             if (!number) {
                 number = i + 1;
             }
@@ -60,6 +63,7 @@
             param.indicator = 'none';  // 不显示指示器
             param.arrow = 'always';  // 始终显示箭头
             param.autoplay = false;  // 关闭自动播放
+
             if (!param.stepWidth) {
                 param.stepWidth = '400px';
             }
@@ -69,7 +73,7 @@
 
             // 渲染步骤条
             var stepItems = param.stepItems;
-            renderDom(param.elem, stepItems, param.position||0);
+            renderDom(param.elem, stepItems, param.position||0,param.number);
             $('.lay-step').css('width', param.stepWidth);
 
             //监听轮播切换事件

target/classes/templates/index.html

@@ -51,6 +51,10 @@
 
             <ul class="layui-nav layui-layout-right">
 
+
+                <li class="layui-nav-item" lay-unselect>
+                    <a href="javascript:;" id="scan"><i class="fa fa-square-o" aria-hidden="true"></i></a>
+                </li>
                 <li class="layui-nav-item" lay-unselect>
                     <a href="javascript:;" data-refresh="刷新"><i class="fa fa-refresh"></i></a>
                 </li>
@@ -151,9 +155,11 @@
         };
         options.iniUrl=  "/index/menus?uid="+uid    // 初始化接口
         miniAdmin.render(options);
-        console.log(options)
 
 
+        /*$("#scan").on("click",function () {
+            alert("扫一扫")
+        });*/
 
 
         // 百度统计代码，只统计指定域名

target/classes/templates/pages/application/application-review.html

@@ -156,13 +156,15 @@
 
         var state=$("#state").text();
         //当前处于的状态
-        var position=0,states={};
+        var position=0,states={},number = 1;
         if (state === "待部门负责人审核" || state === "部门负责人审核未通过") {
-            position = 1;
+        // , {title: "未入库"}
-            states  = [{title: "提交申请"}, {title: state}, {title: "未入库"}];
+            states  = [ {title: state}];
+            number = 2;
         } else {
-            position = 2;
+            // {title: "提交申请"},
-            states = [{title: "提交申请"}, {title: "审核通过"}, {title: state}];
+            states = [  {title: state}];
+            number = 3;
         }
         step.render({
             elem: '#stepForm',
@@ -171,6 +173,7 @@
             stepWidth: '750px',
             height: '650px',
             position: position,
+            number:number,
             stepItems: states
         });
 

target/classes/templates/pages/application/application-transfer.html

@@ -203,6 +203,7 @@
 
         $('.next').click(function () {
             step.next('#stepForm');
+
         });
 
         // 实现卡片添加

target/classes/templates/pages/application/my-apply.html

@@ -10,28 +10,26 @@
     <link rel="stylesheet" href="/static/css/public.css" media="all">
 </head>
 <body>
+<style>
+    .clearfix:after, .clearfix:before {
+        content: "";
+        display: table;
+    }
+
+    .clearfix:after {
+        clear: both;
+    }
+
+    .clearfix {
+        *zoom: 1;
+    }
+</style>
 <div class="layui-bg-gray">
     <fieldset class="layui-elem-field layui-field-title" style="padding: 10px;">
         <legend>入库记录</legend>
-    <table class="layui-table">
+        <ul id="LAY_floor_in" class="flow-default" style="width: 100%"></ul>
-        <colgroup>
-            <col width="25%">
-            <col width="25%">
-            <col width="25%">
-            <col width="25%">
-        </colgroup>
-        <tbody id="LAY_floor_in"></tbody>
-    </table>
         <legend>出库申请</legend>
-    <table class="layui-table">
+        <ul id="LAY_floor_out" class="flow-default" style="width: 100%"></ul>
-        <colgroup>
-            <col width="25%">
-            <col width="25%">
-            <col width="25%">
-            <col width="25%">
-        </colgroup>
-        <tbody id="LAY_floor_out"></tbody>
-    </table>
     </fieldset>
 </div>
 
@@ -39,9 +37,13 @@
 <script src="/static/js/lay-config.js?v=1.0.4" charset="utf-8"></script>
 <script>
     var data;
+
     //先声明
-    function openDetailIn(data){};
+    function openDetailIn(data) {
-    function openDetailOut(data){};
+    };
+
+    function openDetailOut(data) {
+    };
     layui.use(['flow', 'layer', 'flow', 'util'], function () {
         var $ = layui.jquery,
             layer = layui.layer,
@@ -61,21 +63,19 @@
                     result = res.data;
                     applicationIn = result["applicationIn"];
                     InCount = result["InCount"];
-                    applicationOut = result["applicationOut"];
+                    var Width = "25%";
-                    for (let i = 0; i < applicationIn.length; i++) {
+                    if (isMobile()) {
-                        if (i%4===0){
+                        Width = "50%";
-                            lis.push('<tr>');
                     }
-                        lis.push('<td><div class="layui-card  my-shadow my-card flow1" onclick="openDetailIn('
+                    lis.push("<div class='clearfix'>")
+                    for (let i = 0; i < applicationIn.length; i++) {
+                        lis.push('<li style="width:' + Width + ';float:left;"><div class="layui-card  my-shadow my-card flow1" onclick="openDetailIn('
                             + applicationIn[i].id + ')"><div class="layui-card-header"><h2>'
-                            +applicationIn[i].applicantName+'的入库记录')
+                            + applicationIn[i].applicantName + '的入库记录</h2></div>')
-                        lis.push('<div class="layui-card-body">'+applicationIn[i].applyRemark
+                        lis.push('<div class="layui-col-md4 my-time" style="margin-left: 15px; color: #999;font-size: 12px;">'
-                            +'</div><div class="layui-col-md4 my-time" style="margin-left: 15px; color: #999;font-size: 12px;">'
+                            + applicationIn[i].applicantTime + '</div></div></li>');
-                            +applicationIn[i].applicantTime+'</div></div></td>');
-                        if (i%4===3){
-                            lis.push('</tr>');
-                        }
                     }
+                    lis.push('</div>');
                     inpre += applicationIn.length;
                     //执行下一页渲染，第二参数为：满足“加载更多”的条件，即后面仍有分页
                     //pages为Ajax返回的总页数，只有当前页小于总页数的情况下，才会继续出现加载更多
@@ -90,25 +90,26 @@
             , done: function (page, next) { //执行下一页的回调
                 let lis = [];
                 let result;
+                lis.push("<div class='clearfix'>")
                 $.get('/depositoryRecord/myApply?page=' + page + '&size=' + size, function (res) {
                     result = res.data;
-                    applicationIn = result["applicationIn"];
                     applicationOut = result["applicationOut"];
                     OutCount = result["OutCount"];
-                    for (let i = 0; i < applicationOut.length; i++) {
+                    var Width = "25%";
-                        if (i%4===0){
+                    if (isMobile()) {
-                            lis.push('<tr>');
+                        Width = "50%";
                     }
-                        lis.push('<td><div class="layui-card  my-shadow my-card flow1" onclick="openDetailOut('
+                    lis.push("<div class='clearfix'>")
+                    for (let i = 0; i < applicationOut.length; i++) {
+
+                        lis.push('<li style="width:' + Width + ';float:left;"><div class="layui-card  my-shadow my-card flow1" onclick="openDetailOut('
                             + applicationOut[i].id + ')"><div class="layui-card-header"><h2>'
-                            +applicationOut[i].applicantName+'的出库请求')
+                            + applicationOut[i].applicantName + '的出库请求</h2></div>')
-                        lis.push('<div class="layui-card-body">'+applicationOut[i].applyRemark
+                        lis.push('<div class="layui-col-md4 my-time" style="margin-left: 15px; color: #999;font-size: 12px;">'
-                            +'</div><div class="layui-col-md4 my-time" style="margin-left: 15px; color: #999;font-size: 12px;">'
+                            + applicationOut[i].applicantTime + '</div></div></li>');
-                            +applicationOut[i].applicantTime+'</div></div></td>');
+
-                        if (i%4===3){
-                            lis.push('</tr>');
-                        }
                     }
+                    lis.push('</div>');
                     outpre += applicationOut.length;
                     //执行下一页渲染，第二参数为：满足“加载更多”的条件，即后面仍有分页
                     //pages为Ajax返回的总页数，只有当前页小于总页数的情况下，才会继续出现加载更多
@@ -129,7 +130,7 @@
             $(window).on("resize", function () {
                 layer.full(index);
             });
-        },
+        };
         openDetailOut = function (item) {
             var index = layer.open({
                 title: '请求详情',
@@ -143,6 +144,15 @@
             $(window).on("resize", function () {
                 layer.full(index);
             });
+        };
+
+        //定义一个函数判断是手机端还是pc端
+        function isMobile() {
+            if (window.navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i)) {
+                return true; // 移动端
+            } else {
+                return false; // PC端
+            }
         }
     });
 </script>

target/classes/templates/pages/application/my-task.html

@@ -10,36 +10,31 @@
     <link rel="stylesheet" href="/static/css/public.css" media="all">
 
 </head>
+<style>
+    .clearfix:after,.clearfix:before{
+        content: "";
+        display: table;
+    }
+    .clearfix:after{
+        clear: both;
+    }
+    .clearfix{
+        *zoom: 1;
+    }
+</style>
+
 
 <div class="layui-bg-gray" style="padding: 10px;">
     <fieldset class="layui-elem-field layui-field-title">
         <legend>未完成任务</legend>
     </fieldset>
-    <table class="layui-table">
+    <ul id="LAY_floor1" class="flow-default" style="width: 100%"></ul>
-        <colgroup>
-            <col width="25%">
-            <col width="25%">
-            <col width="25%">
-            <col width="25%">
-        </colgroup>
-        <tbody id="LAY_floor1">
-        </tbody>
-    </table>
 </div>
 <div class="layui-bg-gray" style="padding: 10px;">
     <fieldset class="layui-elem-field layui-field-title">
         <legend>已完成任务</legend>
     </fieldset>
-    <table class="layui-table">
+   <ul id="LAY_floor2" class="flow-default" style="width: 100%"></ul>
-        <colgroup>
-            <col width="25%">
-            <col width="25%">
-            <col width="25%">
-            <col width="25%">
-        </colgroup>
-        <tbody id="LAY_floor2">
-        </tbody>
-    </table>
 </div>
 
 
@@ -56,10 +51,11 @@
     //先声明
     function openDetail2(data) {
     };
-    layui.use(['flow', 'layer', 'flow', 'util'], function () {
+    layui.use(['flow', 'layer', 'table', 'util'], function () {
         var $ = layui.jquery,
             layer = layui.layer,
             flow = layui.flow,
+            table = layui.table,
             util = layui.util;
         //每页的数量
         var size=8;
@@ -72,26 +68,21 @@
                 let lis = [];
                 let result;
                 $.get('/depositoryRecord/myTask?page='+page+'&size='+size+'&isDone=0', function(res){
+                    var Width = "25%";
                     result=res.data;
-                    console.log(res)
+                    lis.push("<div class='clearfix'>")
                     for (let i=0;i<result.length;i++){
-                        if (i%4===0){
+                        if(isMobile()){
-                            lis.push('<tr>');
+                            Width = "50%";
                         }
-                        lis.push('<td><div class="layui-card  my-shadow my-card flow1" onclick="openDetail1('
+                        lis.push('<li style="width:'+ Width +';float:left;"><div class="layui-card  my-shadow my-card flow1" onclick="openDetail1('
                             +result[i].id+')"><div class="layui-card-header"><h2>'
                             +result[i].applicantName+'的')
                             lis.push('出库请求</h2></div>');
-                        lis.push('<div class="layui-card-body">'+result[i].applyRemark
+                        lis.push('<div class="layui-col-md4 my-time" style="margin-left: 15px; color: #999;font-size: 12px;">'
-                            +'</div><div class="layui-col-md4 my-time" style="margin-left: 15px; color: #999;font-size: 12px;">'
+                            +result[i].applicantTime+'</div></div></li>');
-                            +result[i].applicantTime+'</div></div></td>');
-                        if (i%4===3){
-                            lis.push('</tr>');
-                        }
-                    }
-                    if (result.length%4!==0){
-                        lis.push('</tr>');
                     }
+                    lis.push('</div>');
                     pre1+=result.length;
                     //执行下一页渲染，第二参数为：满足“加载更多”的条件，即后面仍有分页
                     //pages为Ajax返回的总页数，只有当前页小于总页数的情况下，才会继续出现加载更多
@@ -107,12 +98,14 @@
                 let lis = [];
                 let result;
                 $.get('/depositoryRecord/myTask?page='+page+'&size='+size+'&isDone=1', function(res){
+                    var Width = "25%";
                     result=res.data;
+                    lis.push("<div class='clearfix'>")
                     for (let i=0;i<result.length;i++){
-                        if (i%4===0){
+                        if(isMobile()){
-                            lis.push('<tr>');
+                            Width = "50%";
                         }
-                        lis.push('<td><div class="layui-card  my-shadow my-card flow1" onclick="openDetail2('
+                        lis.push('<li style="width:'+ Width +';float:left;"><div class="layui-card  my-shadow my-card flow1" onclick="openDetail2('
                             +result[i].id+')" ><div class="layui-card-header"><h2>'
                             +result[i].applicantName+'的')
                         if (result[i].type===1){
@@ -120,16 +113,10 @@
                         }else {
                             lis.push('出库请求</h2></div>');
                         }
-                        lis.push('<div class="layui-card-body">'+result[i].applyRemark
+                        lis.push('<div class="layui-col-md4 my-time" style="margin-left: 15px; color: #999;font-size: 12px;">'
-                            +'</div><div class="layui-col-md4 my-time" style="margin-left: 15px; color: #999;font-size: 12px;">'
+                            +result[i].applicantTime+'</div></div></li>');
-                            +result[i].applicantTime+'</div></div></td>');
-                        if (i%4===3){
-                            lis.push('</tr>');
-                        }
-                    }
-                    if (result.length%4!==0){
-                        lis.push('</tr>');
                     }
+                    lis.push("</div>")
                     pre2+=result.length;
                     //执行下一页渲染，第二参数为：满足“加载更多”的条件，即后面仍有分页
                     //pages为Ajax返回的总页数，只有当前页小于总页数的情况下，才会继续出现加载更多
@@ -174,6 +161,14 @@
             });
         }
 
+        //定义一个函数判断是手机端还是pc端
+        function isMobile(){
+            if(window.navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i)) {
+                return true; // 移动端
+            }else{
+                return false; // PC端
+            }
+        }
     });
 </script>
 </html>

target/classes/templates/pages/application/my-task_back.html

@@ -30,15 +30,8 @@
     <fieldset class="layui-elem-field layui-field-title">
         <legend>已完成任务</legend>
     </fieldset>
-
-
     <table class="layui-table">
-        <colgroup>
+
-            <col width="25%">
-            <col width="25%">
-            <col width="25%">
-            <col width="25%">
-        </colgroup>
         <tbody id="LAY_floor2">
         </tbody>
     </table>
@@ -58,10 +51,11 @@
     //先声明
     function openDetail2(data) {
     };
-    layui.use(['flow', 'layer', 'flow', 'util'], function () {
+    layui.use(['flow', 'layer', 'table', 'util'], function () {
         var $ = layui.jquery,
             layer = layui.layer,
             flow = layui.flow,
+            table = layui.table,
             util = layui.util;
         //每页的数量
         var size=8;
@@ -82,14 +76,10 @@
                         lis.push('<td ><div class="layui-card  my-shadow my-card flow1" onclick="openDetail1('
                             +result[i].id+')"><div class="layui-card-header"><h2>'
                             +result[i].applicantName+'的')
-                        if (result[i].type===1){
-                            lis.push('入库请求</h2></div>');
-                        }else {
                         lis.push('出库请求</h2></div>');
-                        }
                         lis.push('<div class="layui-card-body">'+result[i].applyRemark
                             +'</div><div class="layui-col-md4 my-time" style="margin-left: 15px; color: #999;font-size: 12px;">'
-                            +result[i].applyTime+'</div></div></td>');
+                            +result[i].applicantTime+'</div></div></td>');
                         if (i%4===3){
                             lis.push('</tr>');
                         }
@@ -127,7 +117,7 @@
                         }
                         lis.push('<div class="layui-card-body">'+result[i].applyRemark
                             +'</div><div class="layui-col-md4 my-time" style="margin-left: 15px; color: #999;font-size: 12px;">'
-                            +result[i].applyTime+'</div></div></td>');
+                            +result[i].applicantTime+'</div></div></td>');
                         if (i%4===3){
                             lis.push('</tr>');
                         }
@@ -169,7 +159,7 @@
                 maxmin: true,
                 shadeClose: true,
                 area: ['100%', '100%'],
-                content: '/form_step_look?id='+item,
+                content: '/ApplicationOutView?id='+item,
                 end:function () {
                     location.reload()
                 }