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

yusijie

2023-01-21 a54118da6fd23eb5b8b433ce748290cda562f5ca

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

 WebTM/views/É豸¹ÜÀí/Sb_EquipMaintainBillEdit.html

@@ -324,8 +324,11 @@
                                option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HQty": "0", "HRemark": "" }];
                                table.render(option);
                                table.render(option1);
                                $("#HEquipMaintainRuleInterID").val(BYData[0].HInterID);
                                $("#HEquipMaintainRuleInterNo").val(BYData[0].HBillNo)
                                if (BYData.length != 0) {
                                    $("#HEquipMaintainRuleInterID").val(BYData[0].HInterID);
                                    $("#HEquipMaintainRuleInterNo").val(BYData[0].HBillNo)
                                }
                               
                                if (BYData.length != 0)  //表体数据为空时
                                {
                                    buttonArr = [];//清空数组

 WebTM/views/É豸¹ÜÀí/É豸µµ°¸/Gy_EquipFileMainEdit.html

@@ -927,7 +927,7 @@
                        $("#HLogo").val(d.data[0].品牌);
                        $("#HSourceID").val(d.data[0].HSourceID);
                        $("#HSourceName").val(d.data[0].HSourceName);

                        form.render("select");
                    }
                });
            }

 WebTM/views/³µ¼ä¹ÜÀí/ίÍ⹤Ðò½ÓÊÕµ¥/Cj_StationEntrustOutBill.html

@@ -495,6 +495,7 @@
                            "HMoney": data.HMoney,
                            "HWasterQty": data.HWasterQty,
                            "HInnerBillNo": data.HInnerBillNo,
                            "HSendBillNo": data.HInnerBillNo,
                            "HWWWorkOrderBillNo": data.HWWWorkOrderBillNo,
                            "HRemark": data.HRemark,
                            "HPieceQty": data.HPieceQty,
@@ -665,6 +666,7 @@
                $.ajax({
                    url: GetWEBURL() + "/Cj_StationEntrustInBill/txtHBarCode_KeyDown",
                    type: "GET",
                    async: false,
                    data: { "HBarCode": HBarCode },
                    success: function (result) {
                        if (result.count == 1) {
@@ -973,20 +975,29 @@

            //选择供应商
            form.on('submit(HSupID-BT)', function () {
                var HStockInOrgID = sessionStorage["OrganizationID"];
                layer.open({
                    type: 2
                    , area: ['80%', '80%']
                    , title: '供应商列表'
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式，-1不开启
                    , content: ['../../Baseset/基础资料/Gy_SupplierList.html?HOrgID=' + HStockInOrgID + '', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '供应商列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['90%', '90%'],
                    maxmin: true,
                    content: ['../../../../views/基础资料/采购基础资料/Gy_Supplier.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {
                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index];
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }

                        $("#HSupID").val(checkStatus.data[0].HItemID);
                        $("#HSupName").val(checkStatus.data[0].供应商名称);
                        layer.close(layer.index);
                    }
                })
                });
            });

            //选择操作员

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

@@ -854,37 +854,55 @@
                var HEmpName7 = $("#HEmpName7").val();
                var HEmpName8 = $("#HEmpName8").val();

                var HEmpNumber1 = $("#HEmpNumber1").val();
                var HEmpNumber2 = $("#HEmpNumber2").val();
                var HEmpNumber3 = $("#HEmpNumber3").val();
                var HEmpNumber4 = $("#HEmpNumber4").val();
                var HEmpNumber5 = $("#HEmpNumber5").val();
                var HEmpNumber6 = $("#HEmpNumber6").val();
                var HEmpNumber7 = $("#HEmpNumber7").val();
                var HEmpNumber8 = $("#HEmpNumber8").val();

                var HMaker = "";
                var HEmpNum = "";
                if (HEmpName1 != "")
                {
                    HMaker = HMaker + "," + HEmpName1;
                    HEmpNum = HEmpNum + "," + HEmpNumber1;
                }
                if (HEmpName2 != "") {
                    HMaker = HMaker + "," + HEmpName2;
                    HEmpNum = HEmpNum + "," + HEmpNumber2;
                }
                if (HEmpName3 != "") {
                    HMaker = HMaker + "," + HEmpName3;
                    HEmpNum = HEmpNum + "," + HEmpNumber3;
                }
                if (HEmpName4 != "") {
                    HMaker = HMaker + "," + HEmpName4;
                    HEmpNum = HEmpNum + "," + HEmpNumber4;
                }
                if (HEmpName5 != "") {
                    HMaker = HMaker + "," + HEmpName5;
                    HEmpNum = HEmpNum + "," + HEmpNumber5;
                }
                if (HEmpName6 != "") {
                    HMaker = HMaker + "," + HEmpName6;
                    HEmpNum = HEmpNum + "," + HEmpNumber6;
                }
                if (HEmpName7 != "") {
                    HMaker = HMaker + "," + HEmpName7;
                    HEmpNum = HEmpNum + "," + HEmpNumber7;
                }
                if (HEmpName8 != "") {
                    HMaker = HMaker + "," + HEmpName8;
                    HEmpNum = HEmpNum + "," + HEmpNumber8;
                }

                var HBillNo = $("#HMainBillNo").val();
                //sSubStr = table.cache["mainTable1"];
                var sSubStr = JSON.stringify(num);
                var sSubStr = sSubStr + ';' + HBillNo + ';' + HMaker;
                var sSubStr = sSubStr + ';' + HBillNo + ';' + HMaker + ';' + HEmpNum;
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "/Cj_StationOutBill/AddBill_Mul",
@@ -1238,34 +1256,42 @@
        function GetHWorkerValue(obj) {
            $("#HEmpName1").val(obj[0].HName);
            $("#HEmpID1").val(obj[0].HItemID);
            $("#HEmpNumber1").val(obj[0].HNumber);
        }
        function GetHWorkerValue2(obj) {
            $("#HEmpName2").val(obj[0].HName);
            $("#HEmpID2").val(obj[0].HItemID);
            $("#HEmpNumber2").val(obj[0].HNumber);
        }
        function GetHWorkerValue3(obj) {
            $("#HEmpName3").val(obj[0].HName);
            $("#HEmpID3").val(obj[0].HItemID);
            $("#HEmpNumber3").val(obj[0].HNumber);
        }
        function GetHWorkerValue4(obj) {
            $("#HEmpName4").val(obj[0].HName);
            $("#HEmpID4").val(obj[0].HItemID);
            $("#HEmpNumber4").val(obj[0].HNumber);
        }
        function GetHWorkerValue5(obj) {
            $("#HEmpName5").val(obj[0].HName);
            $("#HEmpID5").val(obj[0].HItemID);
            $("#HEmpNumber5").val(obj[0].HNumber);
        }
        function GetHWorkerValue6(obj) {
            $("#HEmpName6").val(obj[0].HName);
            $("#HEmpID6").val(obj[0].HItemID);
            $("#HEmpNumber6").val(obj[0].HNumber);
        }
        function GetHWorkerValue7(obj) {
            $("#HEmpName7").val(obj[0].HName);
            $("#HEmpID7").val(obj[0].HItemID);
            $("#HEmpNumber7").val(obj[0].HNumber);
        }
        function GetHWorkerValue8(obj) {
            $("#HEmpName8").val(obj[0].HName);
            $("#HEmpID8").val(obj[0].HItemID);
            $("#HEmpNumber8").val(obj[0].HNumber);
        }
    </script>
</body>

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

@@ -1054,7 +1054,7 @@
                                shift: 2,
                                area: ['90%', '90%'],
                                maxmin: true,
                                content: ['../../../views/Baseset/基础资料/Gy_SupplierList.html', 'yes'],
                                content: ['../../../../views/基础资料/采购基础资料/Gy_Supplier.html', 'yes'],
                                btn: ['确定', '取消']
                                , btn1: function (index, layero) {
                                    //按钮【按钮一】的回调
@@ -1064,9 +1064,9 @@
                                        return layer.msg('请选择数据');
                                    }
                                    obj.update({
                                        HSupName: checkStatus.data[0].HName
                                        HSupName: checkStatus.data[0].供应商名称
                                        , HSupID: checkStatus.data[0].HItemID
                                        , HSupNumber: checkStatus.data[0].HNumber
                                        , HSupNumber: checkStatus.data[0].供应商代码
                                    });
                                    layer.close(layer.index);
                                }
@@ -1081,7 +1081,7 @@
                            layer.open({
                                type: 2,
                                skin: 'layui-layer-rim', //加上边框
                                title: '供应商列表',
                                title: '部门列表',
                                closeBtn: 1,
                                shift: 2,
                                area: ['90%', '90%'],