Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

YL

2021-11-05 c66f140b65802469b204c516dcdf31a368963b5f

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_MouldProdMoveBill.html

@@ -148,7 +148,21 @@
                            </div>
                        </div>

                        <div class="layui-tab layui-tab-card" lay-filter="TabTest">
                            <ul class="layui-tab-title">
                                <li class="layui-this">明细信息</li>
                                <li>汇总信息</li>
                            </ul>
                            <div class="layui-tab-content">
                                <div class="layui-tab-item layui-show">
                        <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                                </div>
                                <div class="layui-tab-item">
                                    <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
                                </div>
                            </div>
                        </div>

                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">

@@ -258,6 +272,27 @@
                ]]
                , limit: 500 //每页默认显示的数量
            };
            var option1 = {
                elem: '#mainTable1'
                , height: 500
                //,url: '/demo/table/user/' //数据接口
                , page: true //开启分页
                , cols: [
                    { type: 'checkbox', fixed: 'left' }
                    , { templet: '#xuhao', title: '序号', sort: true, fixed: 'left', event: "qwe", width: 100 }
                    , { field: '物料代码', title: '物料代码', edit: 'text', event: 'HMaterCode', width: 100 }
                    , { field: '物料名称', title: '物料名称', edit: 'text', width: 100 }
                    , { field: '规格型号', title: '规格型号', edit: 'text', width: 100 }
                    , { field: '单据号', title: '单据号', edit: 'text', width: 100 }
                    , { field: '批次', title: '批次', edit: 'text', width: 100 }
                    , { field: '实发数量', title: '实发数量', edit: 'text', width: 100 }
                    , { field: 'HSCWHID', title: 'HSCWHID', edit: 'text', width: 100, hide: true }
                    , { field: '调出仓库代码', title: '调出仓库代码', edit: 'text', event: 'HWHCode', width: 120 }
                    , { field: '调出仓库', title: '调出仓库', edit: 'text', width: 120 }
                    , { field: '表体备注', title: '备注', edit: 'text', width: 100 }
                ]
                , limit: 500 //每页默认显示的数量
            };
            //判断是否新增
            if (OperationType == 1) {
                //初始加载表格{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": "  ", "HSQProcName": "   ","HProcID":0, "HZRProcName": "  ", "HMRBChecker": "  ", "HRemark": "  ", "HPSProcName": "  ", "HCloseMan": "   " }
@@ -275,8 +310,10 @@
                        //console.log(result);
                        //console.log('gouba' + result);
                        if (result.count == 1) {
                            option.data = result.data;
                            option.data = result.list[0];
                            table.render(option);
                            option1.data = result.list[1];
                            table.render(option1);

                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });