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

yxj

2023-04-13 ed3b1ca9bd7571e336d5d83d48a69e03e87ccf00

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת/MES_StationInBill_PDA_QiaoYi.html

@@ -364,6 +364,7 @@
            <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
        </script>
    </div>-->
                                <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                            </div>
                            <ul class="layui-tab-title">
                                <li class="layui-this">单据信息</li>
@@ -619,7 +620,7 @@

            //#region ä¿å­˜åŽæµè§ˆæ–¹æ³•
            function ReRoadBillMain() {
                location.replace('MES_StationInBill_PDA.html?OperationType=4&linterid=' + $("#HInterID").val() + '&HSouceBillType=');
                location.replace('MES_StationInBill_PDA_QiaoYi.html?OperationType=4&linterid=' + $("#HInterID").val() + '&HSouceBillType=');
            }
            //#endregion

@@ -1084,42 +1085,24 @@
                                        data: { "HProcExchHinteID": HProcExchHinteID },
                                        success: function (data1) {
                                            if (data1.count == 1) {
                                                var data = [];
                                                var col = [];
                                                //给空的数组赋值
                                                for (var key in data1.list) {
                                                    data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });

                                                option = {
                                                    elem: '#mainTable',
                                                    type: "GET",
                                                    data: data1.data,
                                                    //, cellMinWidth: 80
                                                    //toolbar: '#toolbarDemo'
                                                    limit: 50,
                                                    cols: [[
                                                        { field: '流水号', title: '流水号' }
                                                        , { field: '工序名称', title: '工序名称' }
                                                        , { field: '进站数量', title: '进站数量' }
                                                        , { field: '工艺参数', title: '工艺参数' }
                                                    ]]
                                                    , height: 500
                                                }
                                                //在列表左边添加勾选框
                                                col.push({ type: 'checkbox', fixed: 'left' });
                                                for (var i = 0; i < data.length; i++) {
                                                    // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                                    if ($.inArray(data[i].name, titleData) > -1) {
                                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                                    }
                                                    else {
                                                        switch (data[i].Type) {
                                                            //int
                                                            case 'DateTime':
                                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                                                break;
                                                            default:
                                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                                        }
                                                    }
                                                }
                                                table.render(option)
                                            }
                                            option = {
                                                elem: '#mainTable',
                                                url: GetWEBURL() + "/Cj_StationEntrustInBill/DisBillEntryList",
                                                type: "GET",
                                                //, cellMinWidth: 80
                                                toolbar: '#toolbarDemo'
                                                , where: { HProcExchHinteID: HProcExchHinteID }
                                                , cols: [col]
                                                , height: 500
                                            }
                                            table.render(option)
                                        }
                                    })
                                    break;