#
luxiaotao1123
2021-04-09 b0b2378ee01defd753805f21851849659038770c
#
3个文件已修改
122 ■■■■ 已修改文件
src/main/java/zy/cloud/wms/manager/controller/DocTypeController.java 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/order/order.js 64 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/order/order.html 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/controller/DocTypeController.java
@@ -16,10 +16,7 @@
import zy.cloud.wms.manager.entity.DocType;
import zy.cloud.wms.manager.service.DocTypeService;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
@RestController
public class DocTypeController extends BaseController {
@@ -63,6 +60,11 @@
    @RequestMapping(value = "/docType/add/auth")
    @ManagerAuth
    public R add(DocType docType) {
        docType.setCreateBy(getUserId());
        docType.setCreateTime(new Date());
        docType.setStatus(1);
        docType.setUpdateBy(getUserId());
        docType.setUpdateTime(new Date());
        docTypeService.insert(docType);
        return R.ok();
    }
@@ -73,6 +75,8 @@
        if (Cools.isEmpty(docType) || null==docType.getDocId()){
            return R.error();
        }
        docType.setUpdateBy(getUserId());
        docType.setUpdateTime(new Date());
        docTypeService.updateById(docType);
        return R.ok();
    }
@@ -90,6 +94,17 @@
        return R.ok();
    }
    @RequestMapping(value = "/docType/delete/one/auth")
    @ManagerAuth
    public R deleteOne(@RequestParam String param){
        DocType docType = JSONArray.parseObject(param, DocType.class);
        if (Cools.isEmpty(docType)){
            return R.error();
        }
        docTypeService.delete(new EntityWrapper<>(docType));
        return R.ok();
    }
    @RequestMapping(value = "/docType/export/auth")
    @ManagerAuth
    public R export(@RequestBody JSONObject param){
src/main/webapp/static/js/order/order.js
@@ -48,8 +48,8 @@
    });
    /* 表格搜索 */
    form.on('submit(docTypeTable)', function (data) {
        insTb.reload({where: data.field});
    form.on('submit(docTypeTableSearch)', function (data) {
        insTb.reload({where: {doc_name: data.field.docName}});
        return false;
    });
@@ -76,27 +76,31 @@
        admin.open({
            type: 1,
            title: (mData ? '修改' : '添加') + '字典',
            content: $('#dictEditDialog').html(),
            content: $('#docTypeEditDialog').html(),
            success: function (layero, dIndex) {
                // 回显表单数据
                form.val('dictEditForm', mData);
                form.val('docTypeEditForm', mData);
                // 表单提交事件
                form.on('submit(dictEditSubmit)', function (data) {
                form.on('submit(docTypeEditSubmit)', function (data) {
                    var loadIndex = layer.load(2);
                    $.get(mData ? '../../json/ok.json' : '../../json/ok.json', data.field, function (res) {
                        layer.close(loadIndex);
                        if (200 === res.code) {
                            layer.close(dIndex);
                            layer.msg(res.msg, {icon: 1});
                            if (obj) {
                                obj.update(data.field);
                            } else {
                    $.ajax({
                        url: baseUrl+"/docType/"+(mData?'update':'add')+"/auth",
                        headers: {'token': localStorage.getItem('token')},
                        data: data.field,
                        method: 'POST',
                        success: function (res) {
                            layer.close(loadIndex);
                            if (res.code === 200){
                                layer.close(dIndex);
                                layer.msg(res.msg, {icon: 1});
                                insTb.reload();
                            } else if (res.code === 403){
                                top.location.href = baseUrl+"/";
                            }else {
                                layer.msg(res.msg, {icon: 2});
                            }
                        } else {
                            layer.msg(res.msg, {icon: 2});
                        }
                    }, 'json');
                    })
                    return false;
                });
            }
@@ -111,18 +115,24 @@
        }, function (i) {
            layer.close(i);
            var loadIndex = layer.load(2);
            $.get('../../json/ok.json', {
                id: obj.data.dictId,
            }, function (res) {
                layer.close(loadIndex);
                if (200 === res.code) {
                    layer.msg(res.msg, {icon: 1});
                    obj.del();
                    $('#dictTable+.layui-table-view .layui-table-body tbody>tr:first').trigger('click');
                } else {
                    layer.msg(res.msg, {icon: 2});
            $.ajax({
                url: baseUrl+"/docType/delete/one/auth",
                headers: {'token': localStorage.getItem('token')},
                data: {param: JSON.stringify(obj.data)},
                method: 'POST',
                success: function (res) {
                    layer.close(loadIndex);
                    if (res.code === 200){
                        layer.closeAll();
                        insTb.reload();
                        $('#dictTable+.layui-table-view .layui-table-body tbody>tr:first').trigger('click');
                    } else if (res.code === 403){
                        top.location.href = baseUrl+"/";
                    } else {
                        layer.msg(res.msg, {icon: 2});
                    }
                }
            }, 'json');
            })
        });
    }
src/main/webapp/views/order/order.html
@@ -65,10 +65,10 @@
                    <form class="layui-form toolbar">
                        <div class="layui-form-item">
                            <div class="layui-inline" style="max-width: 140px;">
                                <input name="dictName" class="layui-input" placeholder="输入字典名称"/>
                                <input name="docName" class="layui-input" placeholder="输入单据类型"/>
                            </div>
                            <div class="layui-inline">
                                <button class="layui-btn icon-btn" lay-filter="dictTbSearch" lay-submit>
                                <button class="layui-btn icon-btn" lay-filter="docTypeTableSearch" lay-submit>
                                    <i class="layui-icon">&#xe615;</i>搜索
                                </button>
                            </div>
@@ -112,6 +112,37 @@
    </div>
</div>
<!-- 单据类型表单 -->
<script type="text/html" id="docTypeEditDialog">
    <form id="docTypeEditForm" lay-filter="docTypeEditForm" class="layui-form model-form">
        <input name="dictId" type="hidden"/>
        <div class="layui-form-item">
            <label class="layui-form-label layui-form-required">类型编码:</label>
            <div class="layui-input-block">
                <input name="docId" placeholder="请输入类型编码" class="layui-input"
                       lay-verType="tips" lay-verify="required" required/>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label layui-form-required">类型名称:</label>
            <div class="layui-input-block">
                <input name="docName" placeholder="请输入类型名称" class="layui-input"
                       lay-verType="tips" lay-verify="required" required/>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">备注:</label>
            <div class="layui-input-block">
                <textarea name="memo" placeholder="请输入备注" class="layui-textarea"></textarea>
            </div>
        </div>
        <div class="layui-form-item text-right">
            <button class="layui-btn" lay-filter="docTypeEditSubmit" lay-submit>保存</button>
            <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">取消</button>
        </div>
    </form>
</script>
<script type="text/html" id="operate">
    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">详情</a>
    <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">编辑</a>