yusijie
2022-12-12 2680d162ceca7d0e618ad30f926bd4c99e13fd7b
Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
3个文件已修改
193 ■■■■■ 已修改文件
WebTM/views/基础资料/基础资料/Gy_StockCheckItemEdit.html 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/基础资料/InventoryAnalysis.html 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html 173 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_StockCheckItemEdit.html
@@ -8,6 +8,7 @@
    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
</head>
<body>
    <div id="layout1" class="layui-fluid">
@@ -52,7 +53,7 @@
                                                </div>
                                            </div>
                                        </div>
                                        <div class="layui-form-item">
                                        <div class="layui-form-item" hidden>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">截止日期</label>
                                                <div class="layui-input-inline">
@@ -213,9 +214,10 @@
                    $("#HOrgID").val(sessionStorage["OrganizationID"]);
                }
                $("#HNumber").val("");
                laydate.render({
                    elem: '#HEndDate'
                });
                //laydate.render({
                //    elem: '#HEndDate'
                //});
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
            }
            //编辑
            function set_EditFromGrid() {
WebTM/views/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/InventoryAnalysis.html
@@ -822,7 +822,7 @@
                var checkStatus = table.checkStatus('mainTable2')
                    , data = checkStatus.data;
                if (checkStatus.data.length >= 1) {
                    var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];
                    var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"] + ";" + $("#HName").val();
                    $('#btn-Check2').addClass("layui-btn-disabled").attr("disabled", true);
                    $.ajax({
                        type: "POST",
@@ -857,7 +857,7 @@
                var checkStatus = table.checkStatus('mainTable3')
                    , data = checkStatus.data;
                if (checkStatus.data.length >= 1) {
                    var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];
                    var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"] + ";" + $("#HName").val();
                    $('#btn-Check3').addClass("layui-btn-disabled").attr("disabled", true);
                    $.ajax({
                        type: "POST",
@@ -891,7 +891,7 @@
                var checkStatus = table.checkStatus('mainTable4')
                    , data = checkStatus.data;
                if (checkStatus.data.length >= 1) {
                    var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];
                    var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"] + ";" + $("#HName").val();
                    $('#btn-Check4').addClass("layui-btn-disabled").attr("disabled", true);
                    $.ajax({
                        type: "POST",
@@ -925,7 +925,7 @@
                var checkStatus = table.checkStatus('mainTable5')
                    , data = checkStatus.data;
                if (checkStatus.data.length >= 1) {
                    var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];
                    var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"] + ";" + $("#HName").val();
                    $('#btn-Check5').addClass("layui-btn-disabled").attr("disabled", true);
                     $.ajax({
                         type: "POST",
@@ -993,7 +993,7 @@
                var checkStatus = table.checkStatus('mainTable7')
                    , data = checkStatus.data;
                if (checkStatus.data.length >= 1) {
                    var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"];
                    var sSubStr = JSON.stringify(data) + ";" + sessionStorage["HUserName"] + ";" + sessionStorage["OrganizationID"] + ";" + $("#HName").val();
                    $('#btn-Check7').addClass("layui-btn-disabled").attr("disabled", true);
                    $.ajax({
                        type: "POST",
WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBill.html
@@ -594,6 +594,7 @@
            $("#HBarCode").focus();
            var option;
            var HModName = "Cj_StationOutBill";
            var FirstEndHProcNo = 0; // é»˜è®¤0  é¦–道工序1 æœ«é“工序2
          
            //进入页面入库按钮置灰
@@ -990,6 +991,11 @@
                                , "HCenterName": data.工作中心
                                , "HCenterID": data.HCenterID
                            });
                            if (data.首道工序 == "是") {
                                FirstEndHProcNo = 1;
                            } else if (data.末道工序 == "是") {
                                FirstEndHProcNo = 2;
                            }
                            $("#HProcNo").attr("readonly", "readonly");
                            $("#HProcNo").css("background-color", "#efefef4d");
                            layer.close(index);
@@ -1184,6 +1190,17 @@
                        if (data.count == 1) {
                            layer.close(index);
                            layer.msg("提交成功");
                           if (sessionStorage["OrganizationID"] == 100038) {
                                if (FirstEndHProcNo == 1) {
                                    //汇报
                                    GetInStorage();
                                } else if (FirstEndHProcNo == 2) {
                                    //入库
                                    BtnRK();
                                    //报废
                                    BtnBF();
                                }
                            }
                            if (result.Verify == "Y") {
                                location.replace('Cj_StationOutBill.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
                            }
@@ -1206,85 +1223,17 @@
            //汇报
            form.on('submit(btn-InStorage)', function (data) {
                var InterID = $("#HInterID").val();
                var BillNo = $("#HBillNo").val();
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/Sc_ProcessMangement/SaveICMOReportBill", //方法所在页面和方法名
                    async: true,
                    data: { "InterID": InterID, "user": sessionStorage["HUserName"], "BillNo": BillNo, "OrganizationID": sessionStorage["OrganizationID"] },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
                                var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
                                parent.layer.close(index); //再执行关闭 Â  Â  Â  Â  Â Â  Â Â Â  Â 
                            });
                        }
                        else {
                            layer.alert(data.Message, { icon: 5 });
                        }
                    },
                    error: function (err) {
                        layer.alert(err.Message, { icon: 5 });
                    }
                });
                GetInStorage();
            });
            //入库
            form.on('submit(btn-RK)', function (data) {
                var BillNo = $("#HBillNo").val();
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/Sc_ProcessMangement/SaveProcdutInBill", //方法所在页面和方法名
                    async: true,
                    data: { "BillNo": BillNo},
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
                                var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
                                parent.layer.close(index); //再执行关闭 Â  Â  Â  Â  Â Â  Â Â Â  Â 
                            });
                        }
                        else {
                            layer.alert(data.Message, { icon: 5 });
                        }
                    },
                    error: function (err) {
                        layer.alert(err.Message, { icon: 5 });
                    }
                });
                BtnRK();
            });
            //报废
            form.on('submit(btn-BF)', function (data) {
                var BillNo = $("#HBillNo").val();
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/Sc_ProcessMangement/SaveBFBill", //方法所在页面和方法名
                    async: true,
                    data: { "BillNo": BillNo },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
                                var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
                                parent.layer.close(index); //再执行关闭 Â  Â  Â  Â  Â Â  Â Â Â  Â 
                            });
                        }
                        else {
                            layer.alert(data.Message, { icon: 5 });
                        }
                    },
                    error: function (err) {
                        layer.alert(err.Message, { icon: 5 });
                    }
                });
                BtnBF();
            });
            //列设置
@@ -1656,7 +1605,7 @@
            })
            //#endregion
            //#region åå®¡æ ¸æ–¹æ³•
            // åå®¡æ ¸æ–¹æ³•
            function set_AbandonCheck() {
                var wait = layer.load();
                $.ajax({
@@ -1679,6 +1628,86 @@
                });
            }
            //汇报
            function GetInStorage() {
                var InterID = $("#HInterID").val();
                var BillNo = $("#HBillNo").val();
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/Sc_ProcessMangement/SaveICMOReportBill", //方法所在页面和方法名
                    async: true,
                    data: { "InterID": InterID, "user": sessionStorage["HUserName"], "BillNo": BillNo, "OrganizationID": sessionStorage["OrganizationID"] },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
                                var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
                                parent.layer.close(index); //再执行关闭 Â  Â  Â  Â  Â Â  Â Â Â  Â 
                            });
                        }
                        else {
                            layer.alert(data.Message, { icon: 5 });
                        }
                    },
                    error: function (err) {
                        layer.alert(err.Message, { icon: 5 });
                    }
                });
            }
            //入库
            function BtnRK() {
                var BillNo = $("#HBillNo").val();
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/Sc_ProcessMangement/SaveProcdutInBill", //方法所在页面和方法名
                    async: true,
                    data: { "BillNo": BillNo },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
                                var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
                                parent.layer.close(index); //再执行关闭 Â  Â  Â  Â  Â Â  Â Â Â  Â 
                            });
                        }
                        else {
                            layer.alert(data.Message, { icon: 5 });
                        }
                    },
                    error: function (err) {
                        layer.alert(err.Message, { icon: 5 });
                    }
                });
            }
            //报废
            function BtnBF() {
                var BillNo = $("#HBillNo").val();
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/Sc_ProcessMangement/SaveBFBill", //方法所在页面和方法名
                    async: true,
                    data: { "BillNo": BillNo },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
                                var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
                                parent.layer.close(index); //再执行关闭 Â  Â  Â  Â  Â Â  Â Â Â  Â 
                            });
                        }
                        else {
                            layer.alert(data.Message, { icon: 5 });
                        }
                    },
                    error: function (err) {
                        layer.alert(err.Message, { icon: 5 });
                    }
                });
            }
            //隐藏列设置
            function get_HideColumn() {
                var colName = "";