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

chenhaozhe

3 天以前 da44d82e7f19e081f3c882c1e7934728e4ab534b

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

 WebTM/views/WMSɨÂëÄ£¿é/С³µËø¶¨/Kf_TrolleyPositionBill_PDA.html

@@ -667,7 +667,7 @@
                        }
                    });

                    $("#HEquipBarCode").val("");
                    //$("#HEquipBarCode").val("");
                }
            });

@@ -916,7 +916,7 @@
                });                              

                if (sBarCode != "") {
                    $('#HCarBarCode').val("");
                    //$('#HCarBarCode').val("");
                }
                //调转到第二个页签
                element.tabChange('tab-Kf_TrolleyPositionBill_PDA', '2');
@@ -998,8 +998,46 @@
                    complete: function (XHR, TS) { XHR = null }//回收资源
                });
            }

            //#endregion

            //单据上传前判断
            function AllowLoadData(sSubStr) {
                if (HInterID == 0) {
                    layer.msg("单据内码获取失败，错误的单据内码！", { icon: 5, btn: ['确认'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }
                if (HBillNo == '') {
                    layer.msg("单据号获取失败，错误的单据号！", { icon: 5, btn: ['确认'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }
                if (sSubStr.length == 0) {
                    layer.msg("没有扫码信息，请先扫描条码，确认无误后再提交！", { icon: 5, btn: ['确认'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }

                if (table.cache['wl-table'].length >= 1) {
                    var sSubStr = JSON.stringify(table.cache['wl-table']);

                    if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
                        sSubStr = JSON.parse(sSubStr);
                        for (var i = 0; i < sSubStr.length; i++) {
                            if (sSubStr[i].HCarBarCode == "" || sSubStr[i].HCarBarCode == undefined || sSubStr[i].HCarBarCode == null) {
                                layer.msg("明细记录第" + (i + 1) + "行,小车编号不允许为空!", { icon: 5, btn: ['确认'], time: 4000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                return Result = false;
                            }
                            if ((sSubStr[i].HSPID == 0 || sSubStr[i].HSPID == undefined || sSubStr[i].HSPID == null) && (sSubStr[i].HEquipID == 0 || sSubStr[i].HEquipID == undefined || sSubStr[i].HEquipID == null)) {
                                layer.msg("明细记录第" + (i + 1) + "行,需扫码绑定仓位或机台，不允许仓位和机台信息都为空!", { icon: 5, btn: ['确认'], time: 4000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                return Result = false;
                            }
                        }
                    }
                } else {
                    layer.msg("明细记录为空，不允许提交!请扫小车条码", { icon: 5, btn: ['确认'], time: 4000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return Result = false;
                }

                return true;
            }           
            
        });

@@ -1034,23 +1072,6 @@

                HSPObj = obj;
            }
        }

        //单据上传前判断
        function AllowLoadData(sSubStr) {
            if (HInterID == 0) {
                layer.msg("单据内码获取失败，错误的单据内码！", { icon: 5, btn: ['确认'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "温馨提示" });
                return false;
            }
            if (HBillNo == '') {
                layer.msg("单据号获取失败，错误的单据号！", { icon: 5, btn: ['确认'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "温馨提示" });
                return false;
            }
            if (sSubStr.length == 0) {
                layer.msg("没有扫码信息，请先扫描条码，确认无误后再提交！", { icon: 5, btn: ['确认'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "温馨提示" });
                return false;
            }
            return true;
        }
    </script>


 WebTM/views/WMSɨÂëÄ£¿é/¿â´æ²éѯ/KF_ICInventory_WorkShopByCLD_PDA.html

@@ -428,9 +428,9 @@
                                            break;
                                        default:

                                            if (data[i].name == '仓库') {
                                            if (data[i].name == '仓库' || data[i].name == '批号') {
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 120 });
                                            } else if (data[i].name == '物料代码' || data[i].name == '物料名称' || data[i].name == '规格型号' || data[i].name == '组织') {
                                            } else if (data[i].name == '物料代码' || data[i].name == '物料名称' || data[i].name == '规格型号' || data[i].name == '组织' || data[i].name == '仓位代码' ) {
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 180 });
                                            } else {
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center' });

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú»ã±¨µ¥/Sc_Add_ICMOReportBillList.html

@@ -1620,6 +1620,7 @@
                                , "HSourceBillType": dataArray[i].单据类型
                                , 'HICMOTempID': "0"
                                , 'HRemark': ""
                                , 'HPRODUCEDATE': dataArray[i].生产日期
                            }
                        );
                    }

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillList.html

@@ -223,6 +223,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_WithdrawCheck_Flow" id="WithdrawCheck_Flow"><i class="layui-icon layui-icon-form"></i>撤回</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>反关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBillSetDate" id="set_CancelCloseBillSetDate"><i class="layui-icon layui-icon-form"></i>反关闭(设置时间)</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop" id="btn-Drop"><i class="layui-icon layui-icon-radio"></i>作废</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeDrop" id="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>反作废</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-ProcPriceRequestBills" id="btn-ProcPriceRequestBills"><i class="layui-icon layui-icon-delete"></i>多行下推(定额申请单)</button>
@@ -377,6 +378,9 @@
                        break;
                    //反关闭
                    case 'set_CancelCloseBill': set_CloseBill(2);
                        break;
                    //反关闭设置时间
                    case 'set_CancelCloseBillSetDate': set_CloseBillSetDate(2);
                        break;
                    //作废按钮        ï¼ˆ1:作废、2:反作废）
                    case 'btn-Drop':set_DropBill(1);
@@ -1601,6 +1605,97 @@
                }
            }

            //关闭  [1 å…³é—­ã€2 åå…³é—­]
            function set_CloseBillSetDate(num) {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                var HInterID = data[0].hmainid;
                if (data.length == 1) {
                    // å¼¹å‡ºå±‚
                    layer.open({
                        type: 1,
                        title: '设置时间范围',
                        area: ['500px', '300px'],
                        content: `
                        <div class="layui-form" style="padding: 20px;">
                            <div class="layui-form-item">
                            <label class="layui-form-label">开始时间</label>
                            <div class="layui-input-block">
                                <input type="date" class="layui-input" id="startTime" placeholder="请选择开始时间">
                            </div>
                            </div>
                            <div class="layui-form-item">
                            <label class="layui-form-label">结束时间</label>
                            <div class="layui-input-block">
                                <input type="date" class="layui-input" id="endTime" placeholder="请选择结束时间">
                            </div>
                            </div>
                            <div class="layui-form-item">
                            <div class="layui-input-block" style="margin-left: 0; text-align: center;">
                                <button class="layui-btn" id="confirmTime">确定</button>
                                <button class="layui-btn layui-btn-primary" id="cancelTime">取消</button>
                            </div>
                            </div>
                        </div> `,
                        success: function (layero, index) {
                            $("#startTime").val(Format(new Date(), "yyyy-MM-dd"));
                            $("#endTime").val(Format(new Date(2100, 12, 31), "yyyy-MM-dd"));
                            // ç¡®å®šæŒ‰é’®ç‚¹å‡»äº‹ä»¶
                            $('#confirmTime').on('click', function () {
                                var startTime = $('#startTime').val();
                                var endTime = $('#endTime').val();

                                if (!startTime) {
                                    layer.msg('请选择开始时间', { icon: 2 });
                                    return;
                                }

                                if (!endTime) {
                                    layer.msg('请选择结束时间', { icon: 2 });
                                    return;
                                }

                                if (new Date(endTime) < new Date(startTime)) {
                                    layer.msg('结束时间不能早于开始时间', { icon: 2 });
                                    return;
                                }
                                $.ajax({
                                    url: GetWEBURL() + '/Gy_RoutingBill/CloseSetDate',
                                    type: "GET",
                                    data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"], "HBillSubType": "", "HBeginDate": startTime, "HEndDate": endTime},
                                    success: function (result) {
                                        if (result.count == 1) {
                                            // è¿™é‡Œå¯ä»¥å¤„理获取到的时间范围
                                            layer.msg('时间范围已设置：' + startTime + ' è‡³ ' + endTime, { icon: 1 });
                                            // å…³é—­å¼¹å±‚
                                            layer.close(index);
                                            $("#btnSearch").trigger('click');
                                        } else {
                                            layer.alert(result.code + result.Message, { icon: 5 });
                                            // å…³é—­å¼¹å±‚
                                            layer.close(index);
                                        }
                                    }, error: function () {
                                        layer.alert("接口请求失败!", { icon: 5 });
                                        // å…³é—­å¼¹å±‚
                                        layer.close(index);
                                    }
                                });
                               
                            });

                            // å–消按钮点击事件
                            $('#cancelTime').on('click', function () {
                                layer.close(index);
                            });
                        },
                    })
                }
                else {
                    layer.msg("请选择一条数据!");
                }
            }

            //#region åä½œåºŸ/作废数据 [1 ä½œåºŸã€2 åä½œåºŸ]
            function set_DropBill(num) {
                var checkStatus = table.checkStatus('mainTable')

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBillList.html

@@ -2871,7 +2871,7 @@
                            //隐藏显示过滤方案的标签信息
                            document.getElementById("HFilterScheme_Now").style.display = "none";
                            //执行查询方法
                            get_FastQuery()
                            //get_FastQuery()
                            form.render("select");
                        }
                    }, error: function () {

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

@@ -279,6 +279,30 @@
                        break;
                };
            });

            table.on('sort(mainTable)', function (obj) { //注：sort æ˜¯å·¥å…·æ¡äº‹ä»¶åï¼Œtest æ˜¯ table åŽŸå§‹å®¹å™¨çš„属性 lay-filter="对应的值"
                table.reload('mainTable', {
                    initSort: obj //记录初始排序，如果不设的话，将无法标记表头的排序状态。 layui 2.1.1 æ–°å¢žå‚æ•°
                    , where: { //请求参数（注意：这里面的参数可任意定义，并非下面固定的格式）
                        field: obj.field //排序字段   åœ¨æŽ¥å£ä½œä¸ºå‚数字段  field order
                        , order: obj.type //排序方式   åœ¨æŽ¥å£ä½œä¸ºå‚数字段  field order
                    }
                });
                option.data = layui.table.cache["mainTable"];
                table.render(option);
            });

            table.on('sort(mainTable2)', function (obj) { //注：sort æ˜¯å·¥å…·æ¡äº‹ä»¶åï¼Œtest æ˜¯ table åŽŸå§‹å®¹å™¨çš„属性 lay-filter="对应的值"
                table.reload('mainTable2', {
                    initSort: obj //记录初始排序，如果不设的话，将无法标记表头的排序状态。 layui 2.1.1 æ–°å¢žå‚æ•°
                    , where: { //请求参数（注意：这里面的参数可任意定义，并非下面固定的格式）
                        field: obj.field //排序字段   åœ¨æŽ¥å£ä½œä¸ºå‚数字段  field order
                        , order: obj.type //排序方式   åœ¨æŽ¥å£ä½œä¸ºå‚数字段  field order
                    }
                });
                option2.data = layui.table.cache["mainTable2"];
                table.render(option);
            });
            //#endregion

            //#region é‡ç½®æŒ‰é’®