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

yusijie

2026-01-19 6a9fa2b8b34af2f93ebfb8934431c9037b11cd79

 WebTM/views/ÎïÁ÷¹ÜÀí/ÔËÊ䶨λ/Add_Edit_WL_YayBill.html

@@ -1204,47 +1204,7 @@

            //#endregion
            //#region é€‰æ‹©æºå•èµ‹ç»™å­è¡¨
            //#region é€‰æ‹©æºå•
            function get_checkMainSource() {
                var HOrgID = $("#HOrgID").val();
                var url = "../../销售管理/发货通知单/Xs_SeOutStockBillList.html?openType=2&HOrgID=" + HOrgID;


                layer.open({
                    type: 2//弹窗类型
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['90%', '90%']//大小
                    , title: '源单列表'//标题
                    , shift: 2//弹出动画
                    , content: [url, 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        var HCusID = $("#HCusID").val();//判断客户
                        if (HCusID == 0 || HCusID == '') {
                            HCusID = checkStatus.data[0]["HCusID"];
                            $("#HCusID").val(checkStatus.data[0]["HCusID"]); 
                            $("#HCusName").val(checkStatus.data[0]["客户"]);
                        }
                        for (var i = 0; i < checkStatus.data.length; i++) {
                            if (checkStatus.data[i]["HCusID"] != HCusID) {
                                layer.msg("下推失败!已经选中的记录中存在不同客户!");
                                layer.close(index);
                                return;
                            }
                        }

                        setInitBySeOutStockBill(checkStatus)
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            }
            //#endregion
         
            //#region é€‰æ‹©æºå•
            function get_checkMainSource() {
                var HOrgID = $("#HOrgID").val();
@@ -1285,6 +1245,10 @@
                            layer.close(index);
                            return;
                        }
                        $("#HMainSourceInterID").val(checkStatus.data[0]["hmainid"]);
                        $("#HMainSourceEntryID").val(checkStatus.data[0]["hsubid"]);
                        $("#HMainSourceBillNo").val(checkStatus.data[0]["单据号"]);
                        $("#HMainSourceBillType").val(checkStatus.data[0]["HBillType"]);
                        appendInitBySeOutStockBill(checkStatus);
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
@@ -1619,6 +1583,7 @@
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"];
                console.log("json为", sMainSub)
                //对数据进行验证
                if (AllowLoadData(sSubStr)) {
                    $.ajax(
@@ -1781,6 +1746,10 @@
                                , "HDate": formatDate(data.日期)
                                , "HInnerBillNo": data.内部单据号
                                , "HOrgID": data.HOrgID
                                , "HMainSourceInterID": data.HMainSourceInterID
                                , "HMainSourceEntryID": data.HMainSourceEntryID
                                , "HMainSourceBillType": data.HMainSourceBillType
                                , "HMainSourceBillNo": data.HMainSourceBillNo


                                , "HCusID": data.HCheckEmp
@@ -1790,7 +1759,7 @@
                                , "HEndAddr": data.目的地
                                , "HEndAddrName": data.目的地名称
                                , "HPickAddr": data.提货地址
                                , "HArriverAddr": data.提货地址
                                , "HArriverAddr": data.到货方式
                                , "HTransType": data.运输方式
                                , "HCarTypeID": data.车型ID
                                , "HCarTypeName": data.车型名称