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

wtt

2024-10-28 07cf94734c36d4eae6ddbc4dd338bf5af81a2193

 WebTM/views/Éú²ú¹ÜÀí/ÖÊÁ¿»ã±¨µ¥/Sc_QualityReportBillSumSave.html

@@ -35,9 +35,7 @@
                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
                    <div style="padding: 2px; ">
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">保存</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">退出</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">审核</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">反审核</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">退出</button>                      
                    </div>
                    <div class="layui-tab" lay-filter="tab-POStockInBill">
                        <h1 style="text-align: center; padding: 10px 0;"><b>不良采集批量保存</b></h1>
@@ -52,8 +50,8 @@
                                    <div class="layui-row">
                                        <div class="layui-col-xs4  layui-inline">
                                            <label class="layui-form-label">单据号<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline" >
                                                <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HBillNo_bak" lay-verify="HBillNo_bak" id="HBillNo_bak" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
                                            </div>
                                        </div>
@@ -80,6 +78,13 @@
                                                <input type="hidden" name="HProcID" id="HProcID" value="0">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline" style="display:none">
                                            <label class="layui-form-label">计量单位</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HUnitName" id="HUnitName" value="" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" class="layui-input" name="HUnitID" id="HUnitID" value="0" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
@@ -98,14 +103,14 @@
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label"><span style="color:red;">*</span>生产资源</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HSourceName" id="HSourceName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
                                                <input type="text" class="layui-input" name="HSourceName" id="HSourceName" onmouseover="this.title=this.value" style="float: left; background-color: #efefef4d; display: inline-block;" readonly>
                                                <input type="hidden" name="HSourceID" id="HSourceID" value="0">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label"><span style="color:red;">*</span>生产班组</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HGroupName" id="HGroupName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
                                                <input type="text" class="layui-input" name="HGroupName" id="HGroupName" style="float: left; background-color: #efefef4d; display: inline-block;" readonly>
                                                <input type="hidden" name="HGroupID" id="HGroupID" value="0">
                                            </div>
                                        </div>
@@ -218,6 +223,7 @@
    </script>
    <script>
        var HMaterID = "";        // ç‰©æ–™ID
        var HMaterNumber = "";        // ç‰©æ–™ä»£ç 
        var HMaterName = "";      // ç‰©æ–™åç§°
        var HGroupID = "";        // ç­ç»„ID
        var HGroupName = "";      // ç­ç»„名称
@@ -231,14 +237,17 @@
        var HProcExchBillNo = "";     // å·¥åºæµè½¬å¡å·
        var HProcID = "";           //工序
        var HProcNo = "";           //工序名称
        var HUnitID = "";           //计量单位id
        var HUnitName = "";           //计量单位
        var HInterID = "";
        var HBillNo = "";
        var HBillNo_bak = "";
       

        var edit = function (data) {
            HInterID = data[0].HInterID;
            HBillNo = data[0].HBillNo;
            HBillNo_bak = data[0].HBillNo;
            HMaterID = data[0].HMaterID;
            HMaterNumber = data[0].HMaterNumber;
            HMaterName = data[0].HMaterName;
            HProcID = data[0].HProcID;
            HProcNo = data[0].HProcNo;
@@ -246,6 +255,8 @@
            HGroupName = data[0].HGroupName;
            HSourceID = data[0].HSourceID;
            HSourceName = data[0].HSourceName;
            HUnitID = data[0].HUnitID;
            HUnitName = data[0].HUnitName;
            HICMOInterID = data[0].HICMOInterID
            HICMOEntryID = data[0].HICMOEntryID;
            HICMOBillNo = data[0].HICMOBillNo
@@ -307,8 +318,9 @@

                OperationType = 1;
                $("#HInterID").val(HInterID),
                $("#HBillNo").val(HBillNo),
                $("#HMaterID").val(HMaterID);
                $("#HBillNo_bak").val(HBillNo_bak),
                $("#HMaterID").val(HMaterID); 
                $("#HMaterNumber").val(HMaterNumber); 
                $("#HMaterName").val(HMaterName);
                $("#HProcID").val(HProcID);
                $("#HProcNo").val(HProcNo);
@@ -316,6 +328,8 @@
                $("#HGroupName").val(HGroupName);
                $("#HSourceID").val(HSourceID);
                $("#HSourceName").val(HSourceName);
                $("#HUnitID").val(HUnitID);
                $("#HUnitName").val(HUnitName);
                $("#HICMOInterID").val(HICMOInterID);
                $("#HICMOEntryID").val(HICMOEntryID);
                $("#HICMOBillNo").val(HICMOBillNo);
@@ -326,14 +340,6 @@
                $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
                //初始化项目阶段表
                get_InitGrid();

              
                //初始化制单人和制单时间

                //$("#HGroupID").val(sessionStorage["HGroupID"]); //根据登录用户带出班组ID
                //$("#HGroupName").val(sessionStorage["HGroup"]); //根据登录用户带出班组               
                //$("#HSourceID").val(sessionStorage["HSourceID"]); //根据登录用户带出班组ID
                //$("#HSourceName").val(sessionStorage["HSource"]); //根据登录用户带出班组

            }
           
@@ -349,16 +355,10 @@

            //#region è§¦å‘事件：包括form.on(){}格式的所有点击事件、选择事件等

            //#region å¼¹çª—选择触发事件
         
            //#endregion

            //#region æ“ä½œæŒ‰é’®è§¦å‘事件
            //#region ä¿å­˜æäº¤
            form.on('submit(btnSave)', function (data) {//提交
                if (AllowLoadData(data)) {
                    set_AddNew(data);
                }
                set_AddNew(data);
            });
            //#endregion

@@ -385,18 +385,22 @@
                var NewRow =
                {
                    "HInterID": $("#HInterID").val(),
                    "HBillNo_bak": $("#HBillNo").val(),
                    "HBillNo_bak": $("#HBillNo_bak").val(),
                    "HMaterID": $("#HMaterID").val(),
                    "HMaterName": $("#HMaterName").val(),
                    "HUnitID": $("#HUnitID").val(),
                    "HUnitName": $("#HUnitName").val(),
                    "HBadReasonID": "",
                    "HBadReasonNumber": "",
                    "HBadReasonHName": "",
                    "HEmpID": $("#HMaker").val(sessionStorage["HEmpID"]),
                    "HEmpID": sessionStorage["HEmpID"],
                    "HCheckMan": $("#HMaker").val(),
                    "HGroupID": $("#HGroupID").val(),
                    "HGroupName": $("#HGroupName").val(),
                    "HGroupName": HGroupName,
                    "HSourceID": $("#HSourceID").val(),
                    "HSourceName": $("#HSourceName").val(),
                    "HProcID": $("#HProcID").val(),
                    "HProcName": $("#HProcNo").val(),
                    "HQty": "",
                    "HSourceInterID": $("#HICMOInterID").val(),
                    "HSourceEntryID": $("#HICMOEntryID").val(),
@@ -534,8 +538,10 @@
                        , { field: 'HBillNo_bak', title: '单据号', hide: true }
                        , { field: 'HMaterID', title: '物料id', hide: true }
                        , { field: 'HMaterName', title: '物料名称', style: 'background-color: #f9f9f9;' }
                        , { field: 'HUnitID', title: '计量单位id', hide: true }
                        , { field: 'HUnitName', title: '计量单位', style: 'background-color: #f9f9f9;' }
                        , { field: 'HBadReasonID', title: '不良原因id', hide: true }
                        , { field: 'HBadReasonNumber', title: '不良原因代码', event: "HBadReasonNumber"}
                        , { field: 'HBadReasonNumber', title: '不良原因代码', edit: 'text' , event: "HBadReasonNumber"}
                        , { field: 'HBadReasonHName', title: '不良原因', style: 'background-color: #f9f9f9;' }
                        , { field: 'HEmpID', title: '检验员id', hide: true }
                        , { field: 'HCheckMan', title: '检验员', event: "HCheckMan" }
@@ -543,6 +549,8 @@
                        , { field: 'HGroupName', title: '生产班组', event: "HGroupName" }
                        , { field: 'HSourceID', title: '生产资源id', hide: true }
                        , { field: 'HSourceName', title: '生产资源', event: "HSourceName" }
                        , { field: 'HProcID', title: '工序id', hide: true }
                        , { field: 'HProcName', title: '工序', event: "HSourceName" }
                        , { field: 'HQty', title: '不良数量', edit: 'text' }
                        , { field: 'HSourceInterID', title: '源单内码', hide: true, style: 'background-color: #f9f9f9;' }     
                        , { field: 'HSourceEntryID', title: '源单子内码', hide: true, style: 'background-color: #f9f9f9;' }   
@@ -563,18 +571,22 @@
                var rowdata = [
                    {
                        "HInterID": $("#HInterID").val(),
                        "HBillNo_bak": $("#HBillNo").val(),
                        "HBillNo_bak": $("#HBillNo_bak").val(),
                        "HMaterID": $("#HMaterID").val(),
                        "HMaterName": $("#HMaterName").val(),
                        "HUnitID": $("#HUnitID").val(),
                        "HUnitName": $("#HUnitName").val(),
                        "HBadReasonID": "",
                        "HBadReasonNumber": "",
                        "HBadReasonHName": "",
                        "HEmpID": $("#HMaker").val(sessionStorage["HEmpID"]),
                        "HEmpID": sessionStorage["HEmpID"],
                        "HCheckMan": $("#HMaker").val(),
                        "HGroupID": $("#HGroupID").val(),
                        "HGroupName": $("#HGroupName").val(),
                        "HGroupName": HGroupName,
                        "HSourceID": $("#HSourceID").val(),
                        "HSourceName": $("#HSourceName").val(),
                        "HProcID": $("#HProcID").val(),
                        "HProcName": $("#HProcNo").val(),
                        "HQty": "",
                        "HSourceInterID": $("#HICMOInterID").val(),
                        "HSourceEntryID": $("#HICMOEntryID").val(),
@@ -633,7 +645,7 @@
                var index = layer.load();
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "Sc_MESTransFerWorkBill/SaveOA_AndengFlowRuleBill",
                    url: GetWEBURL() + "Sc_QualityReportBill/SaveSc_QualityReportBillSub",
                    async: true,
                    data: { "msg": sMainSub },
                    dataType: "json",
@@ -656,27 +668,7 @@
                });
            }
            //#endregion

          


            //#region éžç©ºéªŒè¯
            function AllowLoadData(data) {
                //#region è¡¨å¤´æ•°æ®æ£€éªŒ
                if ($("#HBillNo").val() == "") {
                    layer.msg("单据号不能为空!");
                    return false;
                }

              

                //#endregion


                return true;
            }
            //#endregion

           

            //#region å­è¡¨ï¼šåˆ é™¤æŒ‡å®šè¡Œ
            function set_GridDelete(obj) {
@@ -708,6 +700,7 @@
                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                    if (event.key == "F7") {
                        if (obj.event == "HBadReasonNumber") {
                            var HProcName = obj.data.HProcName;
                            layer.open({
                                type: 2
                                , skin: "layui-layer-rim"                           //加上边框
@@ -716,7 +709,7 @@
                                , shift: 2                                          //弹出动画
                                , area: ["90%", "90%"]                              //窗体大小
                                , maxmin: true                                      //设置最大最小按钮是否显示
                                , content: ['../../基础资料/生产基础资料/Gy_BadReason.html', "yes"]
                                , content: ['../../基础资料/生产基础资料/Gy_BadReason.html?Type=BadReason&HProcName=' + HProcName, "yes"]
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调