Merge branch 'xgmasrs' of https://gitee.com/luxiaotao1123/zy-asrs into xgmasrs

luxiaotao1123

2021-08-26 37286cd9b177e9a1b8f28bfbc054c8cfedec6a5e

 src/main/webapp/views/waitMatin/waitMatin.html

@@ -56,6 +56,55 @@
        </a>
    </span>
</script>
<!-- 表单弹窗 -->
<script type="text/html" id="editDialog">
    <form id="editForm" lay-filter="editForm" class="layui-form model-form">
        <input name="experimentTypeId" type="hidden"/>
        <div class="layui-form-item">
            <label class="layui-form-label">单据编号：</label>
            <div class="layui-input-block">
                <input name="experimentTypeName" placeholder="输入单据编号" type="text" class="layui-input" maxlength="20" lay-verType="tips" lay-verify="required"/>
            </div>
        </div>
        <div class="layui-form-item" style="position: relative;">
            <label class="layui-form-label">单据明细：</label>
            <div class="layui-input-block">
                <table id="formSSXMTable" lay-filter="formSSXMTable"></table>
            </div>
            <button class="layui-btn layui-btn-sm icon-btn" id="demoEDeCourseAddBtnComment"
                    style="position: absolute; left: 20px;top: 60px;padding: 0 5px;" type="button">
                <i class="layui-icon">&#xe654;</i>添加明细
            </button>
        </div>
        <div class="layui-form-item text-right">
            <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">取消</button>
            <button class="layui-btn" lay-filter="eCourseEditSubmit" lay-submit>保存</button>
        </div>
    </form>
</script>
<!-- 表单弹窗 -->
<script type="text/html" id="eCourseCouEditDialog">
    <form id="eCourseCouEditForm" lay-filter="eCourseCouEditForm" class="layui-form model-form">
        <input name="experimentId" type="hidden"/>
<!--        <div class="layui-form-item">-->
<!--            <label class="layui-form-label">物料编码：</label>-->
<!--            <div class="layui-input-block">-->
<!--                <input name="experimentName" placeholder="请输入物料编码" type="text" class="layui-input" maxlength="20" lay-verType="tips" lay-verify="required"/>-->
<!--            </div>-->
<!--        </div>-->
        <div class="layui-form-item">
            <label class="layui-form-label">物料 - 多选</label>
            <div class="layui-input-block">
                <div id="mat" name="mat">
                </div>
            </div>
        </div>
        <div class="layui-form-item text-right">
            <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">取消</button>
            <button class="layui-btn" lay-filter="eCourseCouEditSubmit" lay-submit>保存</button>
        </div>
    </form>
</script>

<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
@@ -66,13 +115,14 @@
    var pageCurr;
    layui.config({
        base: baseUrl + "/static/layui/lay/modules/"
    }).use(['layer', 'form', 'table', 'util', 'admin'], function () {
    }).use(['layer', 'form', 'table', 'util', 'admin', 'xmSelect'], function () {
        var $ = layui.jquery;
        var layer = layui.layer;
        var form = layui.form;
        var table = layui.table;
        var util = layui.util;
        var admin = layui.admin;
        var xmSelect = layui.xmSelect;

        // 渲染表格
        var insTb = table.render({
@@ -200,14 +250,14 @@
            admin.open({
                type: 1,
                title: (expTpe ? '修改' : '添加') + '单据',
                content: $('#eCourseEditDialog').html(),
                content: $('#editDialog').html(),
                area: '700px',
                success: function (layero, dIndex) {
                    $(layero).children('.layui-layer-content').css('overflow', 'visible');
                    var url = expTpe ? '../../json/ok.json' : '../../json/ok.json';
                    var isExpAdd = expTpe ? false : true;
                    // 回显数据
                    form.val('eCourseEditForm', expTpe);
                    form.val('editForm', expTpe);
                    // 表单提交事件
                    form.on('submit(eCourseEditSubmit)', function (data) {
                        if (isExpAdd) {
@@ -224,7 +274,7 @@
                        layer.load(2);
                        $.get(url, data.field, function (res) {
                            layer.closeAll('loading');
                            if (res.code == 200) {
                            if (res.code === 200) {
                                layer.close(dIndex);
                                insTb.reload({page: {curr: 1}});
                                layer.msg(res.msg, {icon: 1});
@@ -244,12 +294,9 @@
                        cellMinWidth: 100,
                        cols: [[
                            {type: 'numbers'},
                            {field: 'experimentName', title: '项目名称', sort: true},
                            {
                                field: 'createTime', title: '创建时间', sort: true, templet: function (d) {
                                    return util.toDateString(d.createTime);
                                }
                            },
                            {field: 'matNo', title: '物料编码'},
                            {field: 'matName', title: '物料名称', width: 160},
                            {field: 'qty', title: '数量'},
                            {align: 'center', title: '操作', toolbar: '#eCourseCouTbBar', minWidth: 120, width: 120}
                        ]],
                        done: function () {
@@ -268,9 +315,9 @@
                    table.on('tool(formSSXMTable)', function (obj) {
                        var data = obj.data;
                        var layEvent = obj.event;
                        if (layEvent == 'edit') {
                        if (layEvent === 'edit') {
                            showEditModel2(data);
                        } else if (layEvent == 'del') {
                        } else if (layEvent === 'del') {
                            layer.confirm('确定要删除吗？', {
                                shade: .1,
                                skin: 'layui-layer-admin'
@@ -278,7 +325,7 @@
                                layer.close(i);
                                if (isExpAdd) {  // 前端处理删除
                                    for (var j = 0; j < xxDataList.length; j++) {
                                        if (xxDataList[j].experimentId = data.experimentId) {
                                        if (xxDataList[j].experimentId === data.experimentId) {
                                            xxDataList.splice(j, 1);
                                        }
                                    }
@@ -289,7 +336,7 @@
                                        experimentId: data.experimentId
                                    }, function (res) {
                                        layer.closeAll('loading');
                                        if (res.code == 200) {
                                        if (res.code === 200) {
                                            layer.msg(res.msg, {icon: 1});
                                            insTb.reload({page: {curr: 1}});
                                            insTbSSXM.reload({page: {curr: 1}});
@@ -306,12 +353,12 @@
                        showEditModel2();
                    });

                    // 显示表单弹窗
                    // 显示添加明细表单弹窗
                    function showEditModel2(exp) {
                        admin.open({
                            type: 1,
                            offset: '150px',
                            title: (exp ? '修改' : '添加') + '项目',
                            title: (exp ? '修改' : '添加') + '明细',
                            content: $('#eCourseCouEditDialog').html(),
                            success: function (layero, dIndex) {
                                $(layero).children('.layui-layer-content').css('overflow', 'visible');
@@ -323,21 +370,21 @@
                                    if (isExpAdd) {  // 前端处理添加、修改
                                        if (exp) {  // 前端修改
                                            for (var i = 0; i < xxDataList.length; i++) {
                                                if (xxDataList[i].experimentName == data.field.experimentName && xxDataList[i].experimentId != data.field.experimentId) {
                                                if (xxDataList[i].experimentName === data.field.experimentName && xxDataList[i].experimentId !== data.field.experimentId) {
                                                    layer.msg('实验项目名称已存在', {icon: 2});
                                                    return false;
                                                }
                                            }
                                            layer.close(dIndex);
                                            for (var j = 0; j < xxDataList.length; j++) {
                                                if (xxDataList[j].experimentId == data.field.experimentId) {
                                                if (xxDataList[j].experimentId === data.field.experimentId) {
                                                    xxDataList[j].experimentName = data.field.experimentName;
                                                }
                                            }
                                            insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
                                        } else {  // 前端添加
                                            for (var i = 0; i < xxDataList.length; i++) {
                                                if (xxDataList[i].experimentName == data.field.experimentName) {
                                                if (xxDataList[i].experimentName === data.field.experimentName) {
                                                    layer.msg('实验项目名称已存在', {icon: 2});
                                                    return false;
                                                }
@@ -354,7 +401,7 @@
                                        }
                                        $.get(url, {json: JSON.stringify(data.field)}, function (res) {
                                            layer.closeAll('loading');
                                            if (res.code == 200) {
                                            if (res.code === 200) {
                                                layer.close(dIndex);
                                                insTbSSXM.reload({page: {curr: 1}});
                                                layer.msg(res.msg, {icon: 1});
@@ -365,6 +412,36 @@
                                    }
                                    return false;
                                });
                                // 渲染物料选择
                                var matXmSelect = xmSelect.render({
                                    el: '#mat',
                                    // radio: true,
                                    autoRow: true,
                                    toolbar: { show: true },
                                    filterable: true,
                                    remoteSearch: true,
                                    remoteMethod: function(val, cb, show){
                                        $.ajax({
                                            url: baseUrl+"/mat/all/get/kv",
                                            headers: {'token': localStorage.getItem('token')},
                                            data: {
                                                condition: val
                                            },
                                            method: 'POST',
                                            success: function (res) {
                                                if (res.code === 200){
                                                    cb(res.data)
                                                } else {
                                                    cb([]);
                                                    layer.msg(res.msg, {icon: 2});
                                                }
                                            }
                                        });
                                    }
                                })
                                // 弹窗不出现滚动条
                                $(layero).children('.layui-layer-content').css('overflow', 'visible');
                                layui.form.render('select');
                            }
                        });
                    }
@@ -385,7 +462,7 @@
                    experimentTypeId: experimentTypeId
                }, function (res) {
                    layer.closeAll('loading');
                    if (res.code == 200) {
                    if (res.code === 200) {
                        layer.msg(res.msg, {icon: 1});
                        insTb.reload({page: {curr: 1}});
                    } else {