18516761980
2022-01-14 7b1146c3bc59e8b380c5132b25d6fc65fef0ff74
#单据类型区分入库单和出库单
5个文件已修改
21 ■■■■■ 已修改文件
src/main/java/zy/cloud/wms/manager/controller/CstmrController.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/controller/ItemController.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/item/item.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/tableData.js 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/item/item.html 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/controller/CstmrController.java
@@ -42,7 +42,8 @@
        convert(param, wrapper);
        hostEq(wrapper);
//        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        wrapper.orderBy("create_time",false);
//        wrapper.orderBy("create_time",false);
        wrapper.orderBy("id",false);
        return R.ok(cstmrService.selectPage(new Page<>(curr, limit), wrapper));
    }
src/main/java/zy/cloud/wms/manager/controller/ItemController.java
@@ -53,7 +53,8 @@
        excludeTrash(param);
        convert(param, wrapper);
        hostEq(wrapper);
        wrapper.orderBy("status",true);
//        wrapper.orderBy("status",true);
        wrapper.orderBy("id",false);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(itemService.selectPage(new Page<>(curr, limit), wrapper));
    }
src/main/webapp/static/js/item/item.js
@@ -67,7 +67,7 @@
            statusCode: 200
        },
        done: function(res, curr, count) {
            console.log(res)
            // console.log(res)
            if (res.code === 403) {
                top.location.href = baseUrl+"/";
            }
@@ -244,7 +244,7 @@
    // 时间选择器
    function layDateRender(mData) {
        console.log(mData)
        // console.log(mData)
        setTimeout(function () {
            layDate.render({
                elem: '#startTime',
src/main/webapp/static/js/tableData.js
@@ -41,10 +41,10 @@
            type:'GET',
            dataType:'JSON',
            data:{},
            success:function(res){
            success:function(res){
                // console.log(JSON.stringify(res.data));
                if(res.code==200){
                    data=res.data
                    // 判断时间是否有null  有null的改为 ""
                    for(var i = 0;i<data.length;i++){
                        var dataNode = data[i].nodes
@@ -118,7 +118,7 @@
                                            
                                    }
                                }
                                tab(endTime$,realEndTime$,);
                                tab(endTime$,realEndTime$);
                            }
                            
                        }
src/main/webapp/views/item/item.html
@@ -113,7 +113,10 @@
                <div class="layui-form-item">
                    <label class="layui-form-label">实施周期(月): </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="realMonth" id="realMonth$" placeholder="填写数字月份" type="number" onkeyup="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}" onafterpaste="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}">
                        <input class="layui-input" name="realMonth" id="realMonth$" placeholder="填写数字月份" type="number"
                               onkeyup="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}"
                               onafterpaste="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}"
                               oninput="if(value>200)value=200;if(value<0)value=0">
                    </div>
                </div>
            </div>