#

luxiaotao1123

2020-06-15 aa321710e9a249fc09e3e9735a0d6820dcf392e3

#

 src/main/java/com/zy/asrs/controller/WorkController.java

@@ -64,4 +64,12 @@
        return R.ok("出库成功");
    }

    @RequestMapping("/hand/control/wrkMast")
    @ManagerAuth(memo = "手动处理工作档")
    public R handControlWrkMast(@RequestParam String workNo,
                                @RequestParam Integer type){

        return R.ok();
    }

}

 src/main/webapp/static/js/common.js

@@ -87,5 +87,67 @@
            }
        });
    }

}


// http请求
!function (n) {
    "use strict";

    var http = {
        toAjax: function (params) {
            $.ajax(params);
        },
        get: function (url, data, callback) {
            http.toAjax({
                method: 'GET',
                url: url,
                data: data,
                dataType: 'json',
                header: {'Content-Type': 'application/json'},
                timeout: 10000,
                cache: false,
                success: function (result) {
                    callback(result);
                },
                error: function (res, type) {

                }
            })
        },
        // 默认表单
        post: function (url, param, callback, type) {
            var headerType;
            if (type === 'json') {
                headerType = {'Content-Type': 'application/json'}
            } else {
                headerType = {'Content-Type': 'application/x-www-form-urlencoded'}
            }
            headerType['token'] = localStorage.getItem('token');
            http.toAjax({
                method: 'POST',
                url: url,
                data: param,
                dataType: 'json',
                headers: headerType,
                timeout: 10000,
                cache: false,
                success: function (res) {
                    if (res.code === 200){
                        callback(res);
                    } else if (res.code === 403){
                        top.location.href = baseUrl+"/";
                    }  else {
                        layer.msg(res.msg);
                    }
                },
                error: function (res, type) {

                }
            })
        },
    };
    "function" == typeof define && define.amd ? define(function () {
        return http
    }) : "object" == typeof module && module.exports ? module.exports = http : n.http = http
}(this);

 src/main/webapp/static/js/wrkMast/wrkMast.js

@@ -299,6 +299,24 @@
                    }
                });
                break;
            // 完成
            case 'complete':
                layer.confirm('确认完成该笔工作档？', {title: '工作号：'+data.wrkNo}, function(){
                    http.post(baseUrl+"/hand/control/wrkMast", {workNo: data.wrkNo, type:1}, function (res) {
                        layer.msg(res.msg);
                    })
                    layer.closeAll();
                });
                break;
            // 取消
            case 'cancel':
                layer.confirm('确认取消该笔工作档？', {title: '工作号：'+data.wrkNo}, function(){
                    http.post(baseUrl+"/hand/control/wrkMast", {workNo: data.wrkNo, type:2}, function (res) {
                        layer.msg(res.msg);
                    })
                    layer.closeAll();
                });
                break;
            // 详情
            case 'detail':
                layer.open({