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

wtt

2025-11-27 f701703017053b56525feef8cdcfd113ace18560

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

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -11,7 +11,7 @@
    var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    //var WEBURL = "http://47.96.97.237/API/";          //智云服务器
   /* var WEBURL = "http://localhost:8082/LuBaoAPI/";  //余思杰本地配置*/
    var WEBURL = "http://localhost:8082/LuBaoAPI/";  //余思杰本地配置
    //var WEBURL = "http://localhost:81/API/";            // é™ˆé•å“²æœ¬åœ°é…ç½®*/
     //var WEBURL = "http://localhost:8082/LuBaoAPI/";  //李林俊本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";      //余思杰本地配置(安瑞)

 WebTM/views/Éú²ú¹ÜÀí/ÖÆÔìÖÜÆÚ±¨±í/Sc_ProductionCycleBillList.html

@@ -1247,7 +1247,7 @@
                $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
                form.render('select');

                $("#HInitTimeCycle").val("29");
                $("#HInitTimeCycle").val("3");
            }
            //#endregion


 WebTM/views/Éú²ú¹ÜÀí/Ìí¿µÈýÖÜÅŲú/JIT_DayPlanPlatForm_TK2.html

@@ -1409,10 +1409,15 @@

            if ($("#HMergeDept").val() == "是") {
                //根据车间删除没有锁定的数据
                var sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain where (HWorkShopID=102357 or HWorkShopID=102359) and HLockOrder != 1 )";
            } else {
                var sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain with(nolock) where (HWorkShopID=102357 or HWorkShopID=102359) and HLockOrder != 1 )";
            }else {
                //根据车间删除没有锁定的数据
                var sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain where HWorkShopID=" + HWorkShopID + " and HLockOrder != 1 )";
                var sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain with(nolock) where HWorkShopID=" + HWorkShopID + " and HLockOrder != 1 )";
            }

            if ($("#HWorkShopID").val() == "15035828") {
                //根据排产标记删除没有锁定的数据（配件车间）
                var sql = "delete from Sc_WorkBillSortBillSub where HLockedSub != 1 and HInterID in (select HInterID from Sc_WorkBillSortBillMain with(nolock) where HRemark = '配件订单' and HLockOrder != 1 )";
            }

            $.ajax({

 WebTM/views/ÖÊÁ¿¹ÜÀí/³ö³§¼ìÑéµ¥/QC_OutCompCheckBill.html

@@ -87,7 +87,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">源单类型</label>
                                            <label class="layui-form-label" style="width: 85px;">源单类型<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <select name="HMainSourceBillType" id="HMainSourceBillType">
                                                    <option value="1401" selected>销售订单</option>
@@ -96,7 +96,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">源单单号</label>
                                            <label class="layui-form-label" style="width: 85px;">源单单号<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="HMainSourceBillNo"
                                                    id="HMainSourceBillNo"
@@ -209,7 +209,7 @@
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label"
                                                style="width: 85px;padding: 9px 18px;">产品代码</label>
                                                style="width: 85px;padding: 9px 18px;">产品代码<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="HMaterNumber"
                                                    id="HMaterNumber" value=""
@@ -235,7 +235,7 @@
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label"
                                                style="width: 85px;padding: 9px 18px;">检验员</label>
                                                style="width: 85px;padding: 9px 18px;">检验员<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="HFirstCheckEmpName"
                                                    id="HFirstCheckEmpName"
@@ -253,7 +253,7 @@
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label"
                                                style="width: 85px;padding: 9px 18px;">检验方案</label>
                                                style="width: 85px;padding: 9px 18px;">检验方案<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="HQCSchemeName"
                                                    id="HQCSchemeName"
@@ -285,7 +285,7 @@
                                        </div>
                                        <div class="layui-inline" id="hidediv1" style="margin-left:20px;">
                                            <label class="layui-form-label"
                                                style="width: 85px;padding: 9px 18px;">工序</label>
                                                style="width: 85px;padding: 9px 18px;">工序<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="HProcName" id="HProcName"
                                                    style="background-color:#efefef4d;width: 60%;display: inline-block;"
@@ -2434,7 +2434,7 @@
                        , { field: 'HQualityStdID', title: '质量标准ID', edit: 'text', hide: true }
                        , { field: 'HQualityStdName', title: '质量标准', edit: 'text', event: 'HQualityStdName' }
                        , { field: 'HInspectMethodID', title: '检验方法ID', edit: 'text', hide: true }
                        , { field: 'HInspectMethodName', title: '检验方法', edit: 'text', event: 'HInspectMethodName' }
                        , { field: 'HInspectMethodName', title: '检验方法', edit: 'text', event: 'HInspectMethodName', style: 'white-space: nowrap; overflow: hidden;text-overflow: ellipsis;' }
                        , { field: 'HInspectBasisID', title: '检验依据ID', edit: 'text', hide: true }
                        , { field: 'HInspectBasisName', title: '检验依据', edit: 'text', event: 'HInspectBasisName' }
                        , { field: 'HQCStd', title: '检验标准', edit: 'text' }
@@ -3237,12 +3237,14 @@
                var HEntryID = $("#HEntryID").val() - 1;//数组下标
                if (UnRightQty > HAcceptQty) {
                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //不合格
                    table.cache["mainTable"][HEntryID].HResult = 2
                    $("#HInspectResultToSee").val('不合格');
                    $("#HInspectResultToSee2").val('不合格');
                    $("#HInspectResultToSee").css("background-color", "#F0D6E3");//改变检验结果输入框背景颜色
                    $("#HInspectResultToSee2").css("background-color", "#F0D6E3");//改变检验结果输入框背景颜色
                } else {
                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //合格
                    table.cache["mainTable"][HEntryID].HResult = 1
                    $("#HInspectResultToSee").val('合格');
                    $("#HInspectResultToSee2").val('合格');
                    $("#HInspectResultToSee").css("background-color", "#CEE3F2");//改变检验结果输入框背景颜色

 WebTM/views/ÖÊÁ¿¹ÜÀí/Ѳ¼ì¼Ç¼µ¥/QC_Add_Edit_PatrolProcCheckBill.html

@@ -55,7 +55,7 @@
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">检验员</label>
                                                    <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">检验员<label style="color:red"> * </label></label>
                                                    <div class="layui-input-block" style="margin-left: 77px;">
                                                        <input type="text" class="layui-input" lay-verify="HEmpName" name="HEmpName" id="HEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                        <input id="HFirstCheckEmp" name="HFirstCheckEmp" type="hidden" value="0">
@@ -79,7 +79,7 @@
                                        <div class="layui-form-item">
                                            <div class="layui-row">
                                                <div class="layui-inline">
                                                    <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">工序代码</label>
                                                    <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">工序代码<label style="color:red"> * </label></label>
                                                    <div class="layui-input-block" style="margin-left: 77px;">
                                                        <input type="text" class="layui-input" lay-verify="HMainProcNumber" name="HMainProcNumber" id="HMainProcNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                        <input id="HMainProcID" name="HMainProcID" type="hidden" value="0">
@@ -95,7 +95,7 @@
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">生产班次</label>
                                                    <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">生产班次<label style="color:red"> * </label></label>
                                                    <div class="layui-input-block" style="margin-left: 77px;">
                                                        <input type="text" class="layui-input" name="HShiftsName" id="HShiftsName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHShifts" id="btnHShifts" style="padding: 0 10px;float: right;margin-right: 3px;">

 WebTM/views/ÖÊÁ¿¹ÜÀí/Ѳ¼ì¼Ç¼µ¥/QC_Add_Edit_PatrolProcCheckBill_XW.html

@@ -38,6 +38,10 @@
                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
                                <h1 style="text-align: center; padding: 10px 0;"><b>巡检单</b></h1>
                                <div class="layui-tab-content">
                                    <ul class="layui-tab-title" lay-filter="tab-all">
                                        <li lay-id="1" style="padding:1px;" class="layui-this">基本信息</li>
                                        <li lay-id="2" style="padding:1px;">sn码信息</li>
                                    </ul>
                                    <div class="layui-tab-item layui-show">
                                        <div class="layui-form-item">
                                            <div class="layui-row">
@@ -189,6 +193,7 @@
                                                    </div>
                                                </div>
                                            </div>
                                            
                                        </div>
                                        <div class="layui-form-item">
                                            <div class="layui-row" style="display:none">
@@ -219,6 +224,75 @@
                                            </div>
                                        </div>
                                    </div>
                                    <!--制单信息-->
                                    <div class="layui-tab-item">
                                        <div class="layui-form-item">
                                            <div class="layui-row">
                                                <div class="layui-inline" style="width: 45%;">
                                                    <label class="layui-form-label" style="width: 85px;">抽检SN1</label>
                                                    <div class="layui-input-block" style="margin-left: 120px;">
                                                        <input type="text" class="layui-input" name="HQCNote1_SN" id="HQCNote1_SN" placeholder="请输入内容" onmouseover="this.title=this.value">
                                                    </div>
                                                </div>
                                                <div class="layui-inline" style="width: 45%;">
                                                    <label class="layui-form-label" style="width: 85px;">抽检SN2</label>
                                                    <div class="layui-input-block" style="margin-left: 120px;">
                                                        <input type="text" class="layui-input" name="HQCNote2_SN" id="HQCNote2_SN" placeholder="请输入内容" onmouseover="this.title=this.value">
                                                    </div>
                                                </div>
                                                <div class="layui-inline" style="width: 45%;">
                                                    <label class="layui-form-label" style="width: 85px;">抽检SN3</label>
                                                    <div class="layui-input-block" style="margin-left: 120px;">
                                                        <input type="text" class="layui-input" name="HQCNote3_SN" id="HQCNote3_SN" placeholder="请输入内容" onmouseover="this.title=this.value">
                                                    </div>
                                                </div>
                                                <div class="layui-inline" style="width: 45%;">
                                                    <label class="layui-form-label" style="width: 85px;">抽检SN4</label>
                                                    <div class="layui-input-block" style="margin-left: 120px;">
                                                        <input type="text" class="layui-input" name="HQCNote4_SN" id="HQCNote4_SN" placeholder="请输入内容" onmouseover="this.title=this.value">
                                                    </div>
                                                </div>
                                                <div class="layui-inline" style="width: 45%;">
                                                    <label class="layui-form-label" style="width: 85px;">抽检SN5</label>
                                                    <div class="layui-input-block" style="margin-left: 120px;">
                                                        <input type="text" class="layui-input" name="HQCNote5_SN" id="HQCNote5_SN" placeholder="请输入内容" onmouseover="this.title=this.value">
                                                    </div>
                                                </div>
                                                <div class="layui-inline" style="width: 45%;">
                                                    <label class="layui-form-label" style="width: 85px;">抽检SN6</label>
                                                    <div class="layui-input-block" style="margin-left: 120px;">
                                                        <input type="text" class="layui-input" name="HQCNote6_SN" id="HQCNote6_SN" placeholder="请输入内容" onmouseover="this.title=this.value">
                                                    </div>
                                                </div>
                                                <div class="layui-inline" style="width: 45%;">
                                                    <label class="layui-form-label" style="width: 85px;">抽检SN7</label>
                                                    <div class="layui-input-block" style="margin-left: 120px;">
                                                        <input type="text" class="layui-input" name="HQCNote7_SN" id="HQCNote7_SN" placeholder="请输入内容" onmouseover="this.title=this.value">
                                                    </div>
                                                </div>
                                                <div class="layui-inline" style="width: 45%;">
                                                    <label class="layui-form-label" style="width: 85px;">抽检SN8</label>
                                                    <div class="layui-input-block" style="margin-left: 120px;">
                                                        <input type="text" class="layui-input" name="HQCNote8_SN" id="HQCNote8_SN" placeholder="请输入内容" onmouseover="this.title=this.value">
                                                    </div>
                                                </div>
                                                <div class="layui-inline" style="width: 45%;">
                                                    <label class="layui-form-label" style="width: 85px;">抽检SN9</label>
                                                    <div class="layui-input-block" style="margin-left: 120px;">
                                                        <input type="text" class="layui-input" name="HQCNote9_SN" id="HQCNote9_SN" placeholder="请输入内容" onmouseover="this.title=this.value">
                                                    </div>
                                                </div>
                                                <div class="layui-inline" style="width: 45%;">
                                                    <label class="layui-form-label" style="width: 85px;">抽检SN10</label>
                                                    <div class="layui-input-block" style="margin-left: 120px;">
                                                        <input type="text" class="layui-input" name="HQCNote10_SN" id="HQCNote10_SN" placeholder="请输入内容" onmouseover="this.title=this.value">
                                                    </div>
                                                </div>
                                            </div>


                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
@@ -244,12 +318,14 @@
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>增加一行</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>复制一行</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                            </div>
                        </script>
                        <script type="text/html" id="toolbarDemo2">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine_Bad"><i class="layui-icon layui-icon-form"></i>增加一行</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine_Bad"><i class="layui-icon layui-icon-form"></i>复制一行</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>-->
                            </div>
                        </script>
                        <script type="text/html" id="xuhao">
@@ -324,6 +400,7 @@
        }

        var params = getUrlVars();

        if (typeof (params[params[0]]) == "undefined") {
            var OperationType = 1;//操作类型
            var closeType = 2;  //关闭类型
@@ -358,6 +435,7 @@

            //#region ã€åŠ¨æ€èŽ·å–模块名称】
            var HModuleType = "7506";
            var HModName = "MES_QC_PatrolProcCheckDetail_Json";
            //通过单据类型，从数据库动态获取单据模块命名,引用js文件 PageTitle.js
            var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
            $("h1").html('<b>' + HPageTitle + '</b>');
@@ -374,30 +452,40 @@
                , cols: [[ //表头
                    { type: 'checkbox', fixed: 'left', totalRowText: '合计行' }
                    , { templet: '#xuhao', title: '序号', sort: true, fixed: 'left', event: "qwe", width: 75 }
                    , { field: 'HQCNote1_SN', title: '抽检SN1', width: 185, edit: 'text', hide: true }
                    , { field: 'HQCNote2_SN', title: '抽检SN2', width: 185, edit: 'text', hide: true}
                    , { field: 'HQCNote3_SN', title: '抽检SN3', width: 185, edit: 'text', hide: true }
                    , { field: 'HQCNote4_SN', title: '抽检SN4', width: 185, edit: 'text', hide: true }
                    , { field: 'HQCNote5_SN', title: '抽检SN5', width: 185, edit: 'text', hide: true }
                    , { field: 'HQCNote6_SN', title: '抽检SN6', width: 185, edit: 'text', hide: true }
                    , { field: 'HQCNote7_SN', title: '抽检SN7', width: 185, edit: 'text', hide: true }
                    , { field: 'HQCNote8_SN', title: '抽检SN8', width: 185, edit: 'text', hide: true }
                    , { field: 'HQCNote9_SN', title: '抽检SN9', width: 185, edit: 'text', hide: true }
                    , { field: 'HQCNote10_SN', title: '抽检SN10', width: 185, edit: 'text', hide: true }
                    , { field: '检验项目分类', title: '检验项目分类', event: "", width: 120 }
                    , { field: 'HQCCheckItemID', title: '检验项目ID', edit: 'text', hide: true }
                    , { field: 'HQCCheckItemName', title: '检验项目名称', edit: 'text', width: 230 }
                    , { field: 'HQCStd', title: '检验标准', edit: 'text', event: "", width: 95, hide: true }
                    , { field: 'HQCNote1', title: '检验记录1(09:00--11:00)', width: 185, templet: '#HQCNote1' }
                    , { field: 'HQCNote1_SN', title: '抽检SN1', width: 185, edit: 'text' }
                   
                    , { field: 'HQCNote2', title: '检验记录2(11:00--13:00)', width: 185, templet: '#HQCNote2' }
                    , { field: 'HQCNote2_SN', title: '抽检SN2', width: 185, edit: 'text' }
                   
                    , { field: 'HQCNote3', title: '检验记录3(13:00--15:00)', width: 185, templet: '#HQCNote3' }
                    , { field: 'HQCNote3_SN', title: '抽检SN3', width: 185, edit: 'text' }
                    
                    , { field: 'HQCNote4', title: '检验记录4(15:00--17:00)', width: 185, templet: '#HQCNote4' }
                    , { field: 'HQCNote4_SN', title: '抽检SN4', width: 185, edit: 'text' }
                    
                    , { field: 'HQCNote5', title: '检验记录5(17:00--19:00)', width: 185, templet: '#HQCNote5' }
                    , { field: 'HQCNote5_SN', title: '抽检SN5', width: 185, edit: 'text' }
                   
                    , { field: 'HQCNote6', title: '检验记录6(18:00--20:00)', edit: 'text', width: 185, hide: true }
                    , { field: 'HQCNote6_SN', title: '抽检SN6', width: 185, edit: 'text', hide: true }
                   
                    , { field: 'HQCNote7', title: '检验记录7', edit: 'text', hide: true }
                    , { field: 'HQCNote7_SN', title: '抽检SN7', width: 185, edit: 'text', hide: true }
                  
                    , { field: 'HQCNote8', title: '检验记录8', edit: 'text', hide: true }
                    , { field: 'HQCNote8_SN', title: '抽检SN8', width: 185, edit: 'text', hide: true }
                   
                    , { field: 'HQCNote9', title: '检验记录9', edit: 'text', hide: true }
                    , { field: 'HQCNote9_SN', title: '抽检SN9', width: 185, edit: 'text', hide: true }
                   
                    , { field: 'HQCNote10', title: '检验记录10', edit: 'text', hide: true }
                    , { field: 'HQCNote10_SN', title: '抽检SN10', width: 185, edit: 'text', hide: true }
                  
                    , { field: 'HRemark', title: '备注', edit: 'text', width: 120 }
                    , { fixed: 'right', title: '操作', toolbar: '#barDemo', width: 75 }
                ]]
@@ -496,11 +584,21 @@
                                    "HQCStd": data[i].HQCStd, "HQCNote1": data[i].HQCNote1, "HQCNote2": data[i].HQCNote2, "HQCNote3": data[i].HQCNote3,
                                    "HQCNote4": data[i].HQCNote4, "HQCNote5": data[i].HQCNote5, "HQCNote6": data[i].HQCNote6, "HQCNote7": data[i].HQCNote7,
                                    "HQCNote8": data[i].HQCNote8, "HQCNote9": data[i].HQCNote9, "HQCNote10": data[i].HQCNote10, "HRemark": data[i].表体备注,
                                    "HQCNote1_SN": data[i].抽检SN码1, "HQCNote2_SN": data[i].抽检SN码2, "HQCNote3_SN": data[i].抽检SN码3, "HQCNote4_SN": data[i].抽检SN码4, "HQCNote5_SN": data[i].抽检SN码5, "HQCNote6_SN": data[i].抽检SN码6, "HQCNote7_SN": data[i].抽检SN码7
                                    , "HQCNote8_SN": data[i].抽检SN码8, "HQCNote9_SN": data[i].抽检SN码9, "HQCNote10_SN": data[i].抽检SN码10
                                   /* "HQCNote1_SN": data[i].抽检SN码1, "HQCNote2_SN": data[i].抽检SN码2, "HQCNote3_SN": data[i].抽检SN码3, "HQCNote4_SN": data[i].抽检SN码4, "HQCNote5_SN": data[i].抽检SN码5, "HQCNote6_SN": data[i].抽检SN码6, "HQCNote7_SN": data[i].抽检SN码7*/
                                    /*, "HQCNote8_SN": data[i].抽检SN码8, "HQCNote9_SN": data[i].抽检SN码9, "HQCNote10_SN": data[i].抽检SN码10*/
                                });
                            }

                         
                            $("#HQCNote1_SN").val(data[0].抽检SN码1 || '');
                            $("#HQCNote2_SN").val(data[0].抽检SN码2 || '');
                            $("#HQCNote3_SN").val(data[0].抽检SN码3 || '');
                            $("#HQCNote4_SN").val(data[0].抽检SN码4 || '');
                            $("#HQCNote5_SN").val(data[0].抽检SN码5 || '');
                            $("#HQCNote6_SN").val(data[0].抽检SN码6 || '');
                            $("#HQCNote7_SN").val(data[0].抽检SN码7 || '');
                            $("#HQCNote8_SN").val(data[0].抽检SN码8 || '');
                            $("#HQCNote9_SN").val(data[0].抽检SN码9 || '');
                            $("#HQCNote10_SN").val(data[0].抽检SN码10 || '');
                            option.data = rowdata;
                            table.render(option);
                            for (var i = 0; i < result.data.length; i++) {
@@ -542,7 +640,12 @@
                });

            }

            // åœ¨é¡µé¢åŠ è½½å®ŒæˆåŽï¼Œå¦‚果已有子表数据，同步到表头
            $(document).ready(function () {
                setTimeout(function () {
                    syncSubTableToHeader();
                }, 500);
            });
            //头工具栏事件
            var rowid = 0;
            var rows = 0;
@@ -551,8 +654,9 @@
                    , data = checkStatus.data;;
                var AddRow = table.cache['mainTable'];
                var NewRow = {
                    "HQCCheckItemID": 0, "HQCStd": " ", "HQCNote1": " ", "HQCNote2": " ", "HQCNote3": "  ", "HQCNote4": "  ", "HQCNote5": " ", "HQCNote6": " ", "HQCNote7": " ", "HQCNote8": " ", "HQCNote9": " ", "HQCNote10": " ", "HRemark": " ", "HQCNote1_SN": "", "HQCNote2_SN": "", "HQCNote3_SN": "", "HQCNote4_SN": "", "HQCNote5_SN": "", "HQCNote6_SN": "", "HQCNote7_SN": ""
                    , "HQCNote8_SN": "", "HQCNote9_SN": "", "HQCNote10_SN": ""};
                    "HQCCheckItemID": 0, "HQCStd": " ", "HQCNote1": " ", "HQCNote2": " ", "HQCNote3": "  ", "HQCNote4": "  ", "HQCNote5": " ", "HQCNote6": " ", "HQCNote7": " ", "HQCNote8": " ", "HQCNote9": " ", "HQCNote10": " ", "HRemark": " "
                    , "HQCNote1_SN": $("#HQCNote1_SN").val() || '', "HQCNote2_SN": $("#HQCNote2_SN").val() || '', "HQCNote3_SN": $("#HQCNote3_SN").val() || '', "HQCNote4_SN": $("#HQCNote4_SN").val() || '', "HQCNote5_SN": $("#HQCNote5_SN").val() || '', "HQCNote6_SN": $("#HQCNote6_SN").val() || '', "HQCNote7_SN": $("#HQCNote7_SN").val() || '', "HQCNote8_SN": $("#HQCNote8_SN").val() || '', "HQCNote9_SN": $("#HQCNote9_SN").val() || '', "HQCNote10_SN": $("#HQCNote10_SN").val() || ''
                };
                switch (obj.event) {
                    case 'btn-AddLine':
                        //table.cache["mainTable"].push(AddRow[rows]);
@@ -578,6 +682,10 @@
                            table.render(option);//将数据渲染到表格上
                            //layer.alert(copyrow);
                        }
                        break;
                    //列设置
                    case 'set_HideColumn':
                        get_HideColumn();
                        break;
                }
            });
@@ -1647,9 +1755,43 @@
                    }
                });
            })
            // åŒæ­¥è¡¨å¤´SN码到子表
            function syncHeaderToSubTable() {
                var tableData = table.cache['mainTable'];
                if (tableData && tableData.length > 0) {
                    for (var i = 0; i < tableData.length; i++) {
                        tableData[i].HQCNote1_SN = $("#HQCNote1_SN").val() || '';
                        tableData[i].HQCNote2_SN = $("#HQCNote2_SN").val() || '';
                        tableData[i].HQCNote3_SN = $("#HQCNote3_SN").val() || '';
                        tableData[i].HQCNote4_SN = $("#HQCNote4_SN").val() || '';
                        tableData[i].HQCNote5_SN = $("#HQCNote5_SN").val() || '';
                    }
                    table.reload('mainTable', {
                        data: tableData
                    });
                }
            }

            // åŒæ­¥å­è¡¨SN码到表头
            function syncSubTableToHeader() {
                var tableData = table.cache['mainTable'];
                if (tableData && tableData.length > 0) {
                    var firstRow = tableData[0];
                    $("#HQCNote1_SN").val(firstRow.HQCNote1_SN || '');
                    $("#HQCNote2_SN").val(firstRow.HQCNote2_SN || '');
                    $("#HQCNote3_SN").val(firstRow.HQCNote3_SN || '');
                    $("#HQCNote4_SN").val(firstRow.HQCNote4_SN || '');
                    $("#HQCNote5_SN").val(firstRow.HQCNote5_SN || '');
                    $("#HQCNote6_SN").val(firstRow.HQCNote5_SN || '');
                    $("#HQCNote7_SN").val(firstRow.HQCNote5_SN || '');
                    $("#HQCNote8_SN").val(firstRow.HQCNote5_SN || '');
                    $("#HQCNote9_SN").val(firstRow.HQCNote5_SN || '');
                    $("#HQCNote10_SN").val(firstRow.HQCNote5_SN || '');
                }
            }
            form.on('submit(Saver)', function (data) {//保存
                //debugger;
                syncHeaderToSubTable();
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sBadStr = JSON.stringify(table.cache['BadReTable']);
@@ -1684,7 +1826,125 @@
                layer.alert(sMsg, { icon: 5 });

            }
            //#region å­è¡¨1：隐藏列设置
            function get_HideColumn() {
                var colName = "";
                var contentUrl = "";
                for (var i = 1; i < option.cols[0].length - 1; i++) {
                    colName += option.cols[0][i]["title"] + ",";
                }
                var urlStr = window.document.location.pathname;//获取文件路径
                var urlLen = urlStr.split('/');
                for (var i = 0; i < urlLen.length - 4; i++) {
                    contentUrl += "../";
                }
                colName = encodeURI(colName.substring(0, colName.length - 1));//对 URI è¿›è¡Œç¼–码

                contentUrl += '基础资料/隐藏列设置/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;

                layer.open({
                    type: 2
                    , skin: "layui-layer-rim" //加上边框
                    , title: "隐藏列设置"  //标题
                    , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                    , shift: 2 //弹出动画
                    , area: ["50%", "90%"] //窗体大小
                    , maxmin: true //设置最大最小按钮是否显示
                    , content: [contentUrl, "yes"]
                    , btn: ["确定", "取消"]
                    , btn1: function (index, laero) {
                        //刷新表格数据
                        DisPlay_HideColumn();
                        //更新表格缓存的数据
                        layer.close(index);//关闭弹窗
                    }
                })
            }
            //#endregion
            //#region å­è¡¨1：显示列数据
            function DisPlay_HideColumn() {
                $.ajax({
                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                    async: false,
                    type: "GET",
                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
                    async: false,
                    success: function (data1) {
                        if (data1.data.length != 0) {
                            var dataCol = [];//数据库查询出的列数据
                            var titleData = ["HQCCheckItemID", "HInspectInstruMentID"];

                            dataCol = data1.data[0].HGridString.split(',');

                            for (var i = 0; i < option.cols[0].length - 2; i++) {
                                if (dataCol.length <= i) {
                                    break;
                                }
                                var dataCols = dataCol[i].split('|');
                                //隐藏列
                                if (dataCols[1] == 1) {
                                    option.cols[0][i + 1]["hide"] = true;
                                }
                                //设置列宽
                                if (dataCols[3] > 0) {
                                    option.cols[0][i + 1]["width"] = dataCols[3];
                                }
                                //设置内容字体大小
                                if (data1.data[0].HFontSize != 0) {
                                    option.cols[0][i + 1]["style"] += "font-size:" + data1.data[0].HFontSize + "px;";
                                } else {
                                    option.cols[0][i + 1]["style"] += "font-size:100%";
                                }
                                //显示列
                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                    option.cols[0][i + 1]["hide"] = false;
                                }
                                //字体所在位置(å·¦ å±…中 å³)
                                switch (dataCols[2]) {
                                    case "L":
                                        option.cols[0][i + 1]["align"] = "left";
                                        break;
                                    case "M":
                                        option.cols[0][i + 1]["align"] = "center";
                                        break;
                                    case "R":
                                        option.cols[0][i + 1]["align"] = "right";
                                        break;
                                }
                                //设置表格title属性显示别名
                                if (dataCols[4] != null && dataCols[4] != "") {
                                    option.cols[0][i + 1]["title"] = dataCols[4];
                                }
                            }

                            //取消冻结列
                            for (var i = 1; i < option.cols[0].length - 1; i++) {
                                if (option.cols[0][i]["fixed"] != null) {
                                    option.cols[0][i]["fixed"] = null;
                                }
                                else {
                                    break;
                                }
                            }
                            //冻结列
                            if (data1.data[0].HFixCols != 0) {
                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
                                        data1.data[0].HFixCols += 1;
                                    }
                                    option.cols[0][i + 1]["fixed"] = "left";
                                }
                            }
                            table.render(option);
                        } else {
                            table.render(option);
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                })
            }
            //#endregion
            //监听提交
            form.verify({
                numberOrEmpty: function (value, item) {

 WebTM/views/ÖÊÁ¿¹ÜÀí/¹¤Ðò¼ìÑéµ¥/QC_ProcessCheckBill.html

@@ -78,7 +78,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">生产资源</label>
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">生产资源<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HSourceID" id="HSourceID" value="0">
@@ -100,7 +100,7 @@
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">任务单号</label>
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">任务单号<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" class="layui-input" name="HICMOInterID" id="HICMOInterID" value="0" style="background-color:#efefef4d;" readonly>
@@ -136,7 +136,7 @@
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">产品代码</label>
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">产品代码<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: none;" readonly>
@@ -152,7 +152,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">检验员</label>
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">检验员<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="HFirstCheckEmpName" id="HFirstCheckEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HFirstCheckEmp" id="HFirstCheckEmp" value="0">
@@ -163,7 +163,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">检验方案</label>
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">检验方案<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="HQCSchemeName" id="HQCSchemeName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchQCScheme" id="btnSearchQCScheme" style="padding: 0 10px;float: right;margin-right: 3px;">
@@ -188,7 +188,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline" id="hidediv1">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">工序</label>
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">工序<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="HProcName" id="HProcName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HProcID" id="HProcID" value="0">
@@ -2752,7 +2752,7 @@
                        , { field: 'HQualityStdID', title: '质量标准ID', edit: 'text', hide: true }
                        , { field: 'HQualityStdName', title: '质量标准', edit: 'text', event: 'HQualityStdName' }
                        , { field: 'HInspectMethodID', title: '检验方法ID', edit: 'text', hide: true }
                        , { field: 'HInspectMethodName', title: '检验方法', edit: 'text', event: 'HInspectMethodName' }
                        , { field: 'HInspectMethodName', title: '检验方法', edit: 'text', event: 'HInspectMethodName', style: 'white-space: nowrap; overflow: hidden;text-overflow: ellipsis;' }
                        , { field: 'HInspectBasisID', title: '检验依据ID', edit: 'text', hide: true }
                        , { field: 'HInspectBasisName', title: '检验依据', edit: 'text', event: 'HInspectBasisName' }
                        , { field: 'HQCStd', title: '检验标准', edit: 'text' }
@@ -3962,12 +3962,14 @@
                var HEntryID = $("#HEntryID").val() - 1;//数组下标
                if (UnRightQty > HAcceptQty) {
                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //不合格
                    table.cache["mainTable"][HEntryID].HResult = 2
                    $("#HInspectResultToSee").val('不合格');
                    $("#HInspectResultToSee2").val('不合格');
                    $("#HInspectResultToSee").css("background-color", "#F0D6E3");//改变检验结果输入框背景颜色
                    $("#HInspectResultToSee2").css("background-color", "#F0D6E3");//改变检验结果输入框背景颜色
                } else {
                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //合格
                    table.cache["mainTable"][HEntryID].HResult = 1
                    $("#HInspectResultToSee").val('合格');
                    $("#HInspectResultToSee2").val('合格');
                    $("#HInspectResultToSee").css("background-color", "#CEE3F2");//改变检验结果输入框背景颜色

 WebTM/views/ÖÊÁ¿¹ÜÀí/À´ÁϼìÑéµ¥/QC_Add_Edit_POStockInCheckBillList.html

@@ -103,7 +103,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">源单类型</label>
                                            <label class="layui-form-label" style="width: 85px;">源单类型<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <select name="HMainSourceBillType" id="HMainSourceBillType">
                                                    <option value="1102" selected>采购订单</option>
@@ -113,7 +113,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">源单单号</label>
                                            <label class="layui-form-label" style="width: 85px;">源单单号<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="HMainSourceBillNo"
                                                    id="HMainSourceBillNo"
@@ -229,24 +229,24 @@
                                            <label class="layui-form-label" style="width: 85px;">检验SN</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HRemarkSN" id="HRemarkSN"
                                                    style="display: inline-block;">
                                                       style="display: inline-block;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label"
                                                style="width: 85px;padding: 9px 18px;">产品代码</label>
                                                   style="width: 85px;padding: 9px 18px;">产品代码<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="HMaterNumber"
                                                    id="HMaterNumber" value=""
                                                    style="background-color:#efefef4d;width: 60%;display: inline-block;"
                                                    readonly>
                                                       id="HMaterNumber" value=""
                                                       style="background-color:#efefef4d;width: 60%;display: inline-block;"
                                                       readonly>
                                                <input type="hidden" class="layui-input" name="HMaterID" id="HMaterID"
                                                    value="0"
                                                    style="background-color:#efefef4d;width: 60%;display: none;"
                                                    readonly>
                                                       value="0"
                                                       style="background-color:#efefef4d;width: 60%;display: none;"
                                                       readonly>
                                                <button class="layui-btn layuiadmin-btn-order" type="button"
                                                    lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater"
                                                    style="padding: 0 10px;float: right;margin-right: 3px;">
                                                        lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater"
                                                        style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
@@ -255,42 +255,49 @@
                                            <label class="layui-form-label" style="width: 85px;">产品名称</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HMaterName" id="HMaterName"
                                                    style="background-color:#efefef4d;display: inline-block;" readonly>
                                                       style="background-color:#efefef4d;display: inline-block;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label"
                                                style="width: 85px;padding: 9px 18px;">检验员</label>
                                                   style="width: 85px;padding: 9px 18px;">检验员<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="HFirstCheckEmpName"
                                                    id="HFirstCheckEmpName"
                                                    style="background-color:#efefef4d;width: 60%;display: inline-block;"
                                                    readonly>
                                                       id="HFirstCheckEmpName"
                                                       style="background-color:#efefef4d;width: 60%;display: inline-block;"
                                                       readonly>
                                                <input type="hidden" name="HFirstCheckEmp" id="HFirstCheckEmp"
                                                    value="0">
                                                       value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button"
                                                    lay-submit="" lay-filter="btnSearchHFirstCheckEmp"
                                                    id="btnSearchHFirstCheckEmp"
                                                    style="padding: 0 10px;float: right;margin-right: 3px;">
                                                        lay-submit="" lay-filter="btnSearchHFirstCheckEmp"
                                                        id="btnSearchHFirstCheckEmp"
                                                        style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label"
                                                style="width: 85px;padding: 9px 18px;">检验方案</label>
                                                   style="width: 85px;padding: 9px 18px;">检验方案<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="HQCSchemeName"
                                                    id="HQCSchemeName"
                                                    style="background-color:#efefef4d;width: 60%;display: inline-block;"
                                                    readonly>
                                                       id="HQCSchemeName"
                                                       style="background-color:#efefef4d;width: 60%;display: inline-block;"
                                                       readonly>
                                                <input type="hidden" name="HQCSchemeID" id="HQCSchemeID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button"
                                                    lay-submit="" lay-filter="btnSearchQCScheme" id="btnSearchQCScheme"
                                                    style="padding: 0 10px;float: right;margin-right: 3px;">
                                                        lay-submit="" lay-filter="btnSearchQCScheme" id="btnSearchQCScheme"
                                                        style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>

                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">收货数量</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HQty" id="HQty"
                                                    style="background-color:#efefef4d;" readonly value="0">
                                            </div>
                                        </div>
                                    </div>
@@ -311,7 +318,7 @@
                                        </div>
                                        <div class="layui-inline" id="hidediv1" style="margin-left:20px;">
                                            <label class="layui-form-label"
                                                style="width: 85px;padding: 9px 18px;">工序</label>
                                                style="width: 85px;padding: 9px 18px;">工序<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="HProcName" id="HProcName"
                                                    style="background-color:#efefef4d;width: 60%;display: inline-block;"
@@ -2475,6 +2482,7 @@

                    },
                    success: function (layero, index) {
                        btnSearchCheckSampleScheme

                    }
                });
@@ -2482,6 +2490,8 @@

            //表体信息抽样方案弹窗
            form.on('submit(btnSearchCheckSampleScheme)', function () {
                var nowindex = $("#HEntryID").val()-1;
                var inspectMethod = table.cache["mainTable"][nowindex].HAnalysisMethod;
                //页面层-自定义
                layer.open({
                    type: 2,
@@ -2491,7 +2501,7 @@
                    shift: 2,
                    area: ['90%', '90%'],
                    maxmin: true,
                    content: ['../../../views/Baseset/基础资料/Gy_SampleSchemeListView.html', 'yes'],
                    content: ['../../../views/Baseset/基础资料/Gy_SampleSchemeListView.html?', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {

@@ -2558,7 +2568,7 @@

            //#region ã€é€‰æ£€éªŒæ–¹æ¡ˆèŽ·å–表体检验项目信息】
            function get_CheckItem() {
                var HBatchQty = $("#HProcExchQty").val() == 0 ? $("#HICMOQty").val() : $("#HProcExchQty").val();
                var HBatchQty = $("#HQty").val() == 0 ? $("#HICMOQty").val() : $("#HQty").val();
                $.ajax({
                    url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
                    type: "GET",
@@ -2582,6 +2592,7 @@
                                        "HInspectMethodID": data[i]["HInspectMethodID"], "HInspectMethodName": data[i]["检验方法"], "HInspectBasisID": data[i]["HInspectBasisID"], "HInspectBasisName": data[i]["检验依据"],
                                    }
                                );
         
                                SampleNum.push(data[0].样本量);
                            }

@@ -3149,7 +3160,7 @@
                        , { field: 'HQualityStdName', title: '质量标准', edit: 'text', event: "HQualityStdID" },

                        , { field: 'HInspectMethodID', title: 'HInspectMethodID', edit: 'text', hide: true },
                        , { field: 'HInspectMethodName', title: '检验方法', edit: 'text', event: "HInspectMethodID" },
                        , { field: 'HInspectMethodName', title: '检验方法', edit: 'text', event: "HInspectMethodID", style: 'white-space: nowrap; overflow: hidden;text-overflow: ellipsis;'},

                        , { field: 'HInspectBasisID', title: 'HInspectBasisID', edit: 'text', hide: true },
                        , { field: 'HInspectBasisName', title: '检验依据', edit: 'text', event: "HInspectBasisID" },
@@ -4317,12 +4328,14 @@
                var HEntryID = $("#HEntryID").val() - 1;//数组下标
                if (UnRightQty > HAcceptQty) {
                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //不合格
                    table.cache["mainTable"][HEntryID].HResult = 2
                    $("#HInspectResultToSee").val('不合格');
                    $("#HInspectResultToSee2").val('不合格');
                    $("#HInspectResultToSee").css("background-color", "#F0D6E3");//改变检验结果输入框背景颜色
                    $("#HInspectResultToSee2").css("background-color", "#F0D6E3");//改变检验结果输入框背景颜色
                } else {
                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //合格
                    table.cache["mainTable"][HEntryID].HResult = 1
                    $("#HInspectResultToSee").val('合格');
                    $("#HInspectResultToSee2").val('合格');
                    $("#HInspectResultToSee").css("background-color", "#CEE3F2");//改变检验结果输入框背景颜色
@@ -4934,6 +4947,7 @@
                            $("#HMainSourceEntryID").val(res.data[0].HEntryID)
                            $("#HQCSchemeName").val(res.data[0].检验方案名称);
                            $("#HQCSchemeID").val(res.data[0].检验方案ID);
                            $("#HQty").val(res.data[0].实收数量);
                            //获取表体检验项目信息
                            get_CheckItem();
                        }

 WebTM/views/ÖÊÁ¿¹ÜÀí/¼ìÑé·½°¸µ¥/QC_Add_CheckProject.html

@@ -274,6 +274,8 @@
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>增加一行</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>复制一行</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_up"><i class="layui-icon layui-icon-form"></i>上一行</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_under"><i class="layui-icon layui-icon-form"></i>下一行</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                            </div>
                        </script>
@@ -319,7 +321,7 @@
        <select name="HCompareSymbol" lay-filter="HCompareSymbol" id="HCompareSymbol{{d.LAY_TABLE_INDEX+1}}">
            <option value="1" selected="selected">=</option>
            <option value="2">></option>
            <option value="3=">>=</option>
            <option value="3">>=</option>
            <option value="4"><</option>
            <option value="5"><=</option>
            <option value="6"><></option>
@@ -457,6 +459,14 @@
                        break;
                    //列设置
                    case 'set_HideColumn':get_HideColumn();
                        break;
                    //上一行
                    case 'btn_up':
                        btn_up();
                        break;
                    //下一行
                    case 'btn_under':
                        btn_under();
                        break;
                }
            });
@@ -1157,7 +1167,7 @@
                    , { field: 'HQualityStdID', title: '质量标准ID', edit: 'text', hide: true }
                    , { field: 'HQualityStdName', title: '质量标准', edit: 'text', event: 'HQualityStdName' }
                    , { field: 'HInspectMethodID', title: '检验方法ID', edit: 'text', hide: true }
                    , { field: 'HInspectMethodName', title: '检验方法', edit: 'text', event: 'HInspectMethodName' }
                    , { field: 'HInspectMethodName', title: '检验方法', edit: 'text', event: 'HInspectMethodName', style: 'white-space: nowrap; overflow: hidden;text-overflow: ellipsis;' }
                    , { field: 'HInspectInstruMentID', title: '检验仪器ID', edit: 'text', hide: true }
                    , { field: 'HInspectInstruMentName', title: '检验仪器', edit: 'text', event: 'HInspectInstruMentName' }
                    , { field: 'HInspectBasisID', title: '检验依据ID', edit: 'text', hide: true }
@@ -1599,7 +1609,66 @@
                    form.render('checkbox');
                }
            }
            //#region å­è¡¨1 ä¸Šç§»
            function btn_up() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (data.length == 1) {
                    var tables = [];
                    //获取表格的全部行
                    var rowList = table.cache['mainTable'];
                    for (var i = 0; i < rowList.length; i++) {          //遍历表格的行
                        if (rowList[i].LAY_CHECKED == true) {           //获取选中行的位置
                            //如果是第一行上移，则失败并提醒
                            if (i == 0) {
                                layer.msg("第一行数据无法上移！");
                                return;
                            }
                            tables.push(option.data[i - 1]);
                            data[0].LAY_CHECKED = true;
                            option.data[i - 1] = data[0];
                            option.data[i] = tables[0];
                            table.render(option);
                            CheckedSet_tableSub();
                            break;
                        }
                    }
                } else {
                    layer.msg("请选择一行数据！");
                }
            }
            //#endregion
            //#region å­è¡¨1 ä¸‹ç§»
            function btn_under() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (data.length == 1) {
                    var tables = [];
                    //获取表格的全部行
                    var rowList = table.cache['mainTable'];
                    for (var i = 0; i < rowList.length; i++) {          //遍历表格的行
                        if (rowList[i].LAY_CHECKED == true) {           //获取选中行的位置
                            //如果是最后一行下移，则失败并提醒
                            if (i == option.data.length - 1) {
                                layer.msg("最后一行数据无法下移！");
                                return;
                            }


                            tables.push(option.data[i + 1]);
                            data[0].LAY_CHECKED = true;
                            option.data[i + 1] = data[0];
                            option.data[i] = tables[0];
                            table.render(option);
                            CheckedSet_tableSub();
                            break;
                        }
                    }
                } else {
                    layer.msg("请选择一行数据！");
                }
            }
            //#endregion
            //表格行内事件删除
            function set_GridDelete(obj) {
                var data = obj.data;

 WebTM/views/ÖÊÁ¿¹ÜÀí/¼ìÑé·½°¸µ¥/QC_CheckProjectList.html

@@ -59,6 +59,13 @@
                                            </select>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">物料代码</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input ForFilteringSchemes" name="HMatrerNumber" id="HMatrerNumber" style="width:190px;">
                                            <input type="hidden" class="layui-input ForFilteringSchemes" name="HMatrerID" id="HMatrerID" style="width:190px;">
                                        </div>
                                    </div>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                    </button>
@@ -565,6 +572,8 @@
                var HProject = $("#HProject").val();//项目号
                var HQCCheckProjectName = $("#HQCCheckProjectName").val();
                var HOrgID = $("#HOrgID").val(); //组织
                var HMatrerNumber = $("#HMatrerNumber").val(); //物料
                var HMatrerID = $("#HMatrerID").val(); //物料
                //任意字段过滤
                var ColName = $("#ColName").val();//复选框
                var Comparator = $("#Comparator").val()
@@ -661,6 +670,9 @@
                    sWhere += " and ç‰©æ–™åç§° = '" + HName + "'";
                    sWhere += " and å·¥åºåç§° = '" + HProcName + "'";
                }
                if (HMatrerNumber != "") {
                    sWhere += " and ç‰©æ–™ä»£ç  ='" + HMatrerNumber + "'";
                }
                addSWhereByOpenType();
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
@@ -671,6 +683,7 @@
            function set_ClearQuery() {
                $("#HBillNo").val("");
                $("#HProject").val("");
                $("#HMatrerNumber").val("");
                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
                $("#HDate1").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
                $("#HDate2").val(Format(new Date(), "yyyy-MM-dd"));

 WebTM/views/ÖÊÁ¿¹ÜÀí/Ê×¼þ¼ìÑéµ¥/QC_Add_Edit_FirstPieceCheckBill.html

@@ -40,6 +40,7 @@
            margin-left: -15px;
            margin-right: -15px;
        }

    </style>
</head>
<body>
@@ -59,7 +60,7 @@
                        <!-- æ ‡é¢˜ï¼Œä½¿ç”¨ç»å¯¹å®šä½ä½¿å…¶åœ¨çˆ¶å®¹å™¨å†…居中 -->
                        <h1 style="position: absolute; left: 50%; transform: translateX(-50%); z-index: 0; text-align: center; width: fit-content; margin: 0; padding: 0 10px;"><b>首件检验单</b></h1>
                    </div>
                    <div class="layui-tab" lay-filter="tab-POStockInBill">                       
                    <div class="layui-tab" lay-filter="tab-POStockInBill">
                        <ul class="layui-tab-title" lay-filter="tab-all">
                            <li lay-id="1" style="padding:1px;" class="layui-this">基本信息</li>
                            <li lay-id="2" style="padding:1px;">制单信息</li>
@@ -83,7 +84,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">生产资源</label>
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">生产资源<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchSource" id="btnSearchSource" style="padding: 0 10px;float: right;margin-right: 3px;">
@@ -105,7 +106,7 @@
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">任务单号</label>
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">任务单号<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" class="layui-input" name="HICMOInterID" id="HICMOInterID" value="0" style="background-color:#efefef4d;" readonly>
@@ -122,7 +123,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">产品代码</label>
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">产品代码<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: none;" readonly>
@@ -138,7 +139,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline" id="hidediv2">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">流转卡号</label>
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">流转卡号<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" class="layui-input" name="HProcExchInterID" id="HProcExchInterID" value="0" style="background-color:#efefef4d;" readonly>
@@ -174,7 +175,8 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">检验员</label>
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">检验员<label style="color:red"> * </label></label>

                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="HFirstCheckEmpName" id="HFirstCheckEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HFirstCheckEmp" id="HFirstCheckEmp" value="0">
@@ -184,7 +186,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">检验方案</label>
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">检验方案<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="HQCSchemeName" id="HQCSchemeName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HQCSchemeID" id="HQCSchemeID" value="0">
@@ -194,7 +196,7 @@

                                            </div>
                                        </div>
                                    </div>                                  
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">批号</label>
@@ -708,7 +710,7 @@
            var rowdata = [];
            var option = [];
            var HDeptID = "";//部门id èŽ·å–班次
            var HCenterID = "";//工作中心id èŽ·å–班次           
            var HCenterID = "";//工作中心id èŽ·å–班次

            var rowdata_Value = [];
            var option_Value = [];
@@ -815,12 +817,11 @@

                    //客户为斯莫尔，进入按照质检方案表头上的物料绑定带出默认方案
                    if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
                        (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "杭州斯莫尔磁性材料有限公司"))
                    {
                        (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "杭州斯莫尔磁性材料有限公司")) {
                        //自动带出检验方案
                        GetCheckItemID();
                    }
                    

                }
                //工序进站接收单列表首检
                else if (HSouceBillType == 3790) {
@@ -1102,7 +1103,7 @@
                    , data = checkStatus.data;
                //新增行表格数据
                var NewRow = {
                    "HQCCheckItemID": "", "检验项目代码": "","检验项目": "", "HInspectInstruMentID": "0", "检验仪器代码": "", "检验仪器": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
                    "HQCCheckItemID": "", "检验项目代码": "", "检验项目": "", "HInspectInstruMentID": "0", "检验仪器代码": "", "检验仪器": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
                    "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
                    "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
                    "HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "",
@@ -1151,7 +1152,7 @@
            //#endregion

            //退出按钮
            form.on('submit(btn-Exit)', function (data) {                
            form.on('submit(btn-Exit)', function (data) {
                sWhere = " and hmainid = " + $("#HInterID").val();
                $.ajax({
                    url: GetWEBURL() + "/QC_FirstPieceCheckBill/QC_FirstPieceCheckBillList",
@@ -1338,7 +1339,7 @@
                                            , æ£€éªŒé¡¹ç›®ä»£ç : checkStatus.data[0].代码
                                            , HQCCheckItemID: checkStatus.data[0].HItemID
                                            , HResult: HResult
                                        });                                       
                                        });
                                        $('#HResult' + rowIndex + '').find("option[value='" + HResult + "']").attr("selected", true);
                                        form.render('select');
                                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
@@ -1353,14 +1354,15 @@
                                            }
                                        }
                                        //将批量选择的数据写入数组（多选行）
                                        for (var i = 0; i < checkStatus.data.length; i++) {                                          
                                        for (var i = 0; i < checkStatus.data.length; i++) {
                                            buttonArr.push({
                                                "检验项目": checkStatus.data[i].名称, "检验项目代码": checkStatus.data[i].代码, "HQCCheckItemID": checkStatus.data[i].HItemID, "HResult": 1,
                                                "HInspectInstruMentID": "0", "检验仪器代码": "", "检验仪器": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "",
                                                "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
                                                "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
                                                "HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "",
                                                "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""});
                                                "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
                                            });
                                        }

                                        table.reload("mainTable", {
@@ -1378,7 +1380,7 @@
                                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                                    }

                                   

                                }
                                , btn2: function (index, layero) {
                                    //按钮【按钮二】的回调
@@ -1392,7 +1394,7 @@
                                            æ£€éªŒé¡¹ç›®ä»£ç : OptionData[0].代码,
                                            HQCCheckItemID: OptionData[0].HItemID,
                                            HResult: 1
                                        });                                      
                                        });
                                        $('#HResult' + rowIndex + '').find("option[value='" + 1 + "']").attr("selected", true);
                                        form.render('select');
                                        OptionData = [];
@@ -1439,8 +1441,8 @@
                                        obj.update({
                                            æ£€éªŒä»ªå™¨ä»£ç : OptionData[0].检验仪器代码,
                                            æ£€éªŒä»ªå™¨: OptionData[0].检验仪器名称,
                                            HInspectInstruMentID: OptionData[0].HItemID                                         
                                        });                                       
                                            HInspectInstruMentID: OptionData[0].HItemID
                                        });
                                        OptionData = [];
                                    }
                                }
@@ -1710,12 +1712,23 @@
            //#endregion

            //保存
            function set_SaveBill(data) {
            async function set_SaveBill(data) {
                //赋值最后一个选中行的数据给option.data
                //Assignment(LastIndex, LastIndex);
                //保存最后一次点击行的检验值
                set_SaveValue($("#HEntryID").val());

                try {
                    var rownum = $("#HEntryID").val();

                    rowFun = table.cache["mainTable"][rownum].HAnalysisMethod;
                    if (rowFun == "")
                        throw error
                    await set_SaveValue($("#HEntryID").val(), rowFun);
                } catch (error) {
                   
                    layer.msg('用户取消了检验值保存');
                    return;
                }
                if ($("#HICMOQty").val() == "" || $("#HICMOQty").val() <= 0) {
                    layer.msg("任务单数量不能为空且不能小于等于0！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
@@ -1776,12 +1789,12 @@
                    data: { "sMainSub": sMainSub },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) {                          
                        if (data.count == 1) {
                            layer.close(index);
                            layer.msg("提交成功");
                            $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//保存按钮
                            $('#set_CheckBill').removeClass("layui-btn-disabled").removeAttr("disabled").addClass("layui-btn-normal");
                            if (isOpenBox=="1") {
                            if (isOpenBox == "1") {
                                layer.open({
                                    type: 2,
                                    skin: 'layui-layer-rim',
@@ -1920,8 +1933,8 @@
                                        "HAnalysisMethod": data[i].分析方法 == "定性分析" ? 1 : (data[i].分析方法 == "定量分析" ? 2 : 3), "HKeyInspect": data[i].重点检查 == "否" ? false : true,
                                        "HSampleSchemeID": data[i].HSampleSchemeID, "HUnitID": data[i].HUnitID,
                                        "HInspectVal": data[i].检测值, "HTargetVal": data[i].目标值, "HUpLimit": data[i].上限值, "HDownLimit": data[i].下限值, "HUpOffSet": data[i].上偏差, "HDownOffSet": data[i].下偏差, "HSampleDamageQty": data[i].样本破坏数,
                                        "HSampleSchemeName": data[i].抽样方案名称, "HSampleQty": data[i].样本量, "HSampleDamageQty": data[i].样本破坏数, "HAcceptQty": data[i].允许数, "HInspectionLevel": 0, "HRejectQty": data[i].拒绝数,                        
                                        "HStrictness": 0, "HSampleUnRightQty": data[i].样本不合格数, "HAQL": data[i].AQL, "HSamplingType": data[i].抽样类型, "HStrictness": data[i].严格度, "HCompareSymbol": data[i].比较符, "HQualityStdID": data[i].HQualityStdID, "HQualityStdName": data[i].质量标准, "HInspectMethodID": data[i].HInspectMethodID, "HInspectMethodName": data[i].检验方法, "HInspectBasisID": data[i].HInspectBasisID, "HInspectBasisName": data[i].检验依据,"HCompareSymbol":data[i].比较符
                                        "HSampleSchemeName": data[i].抽样方案名称, "HSampleQty": data[i].样本量, "HSampleDamageQty": data[i].样本破坏数, "HAcceptQty": data[i].允许数, "HInspectionLevel": 0, "HRejectQty": data[i].拒绝数,
                                        "HStrictness": 0, "HSampleUnRightQty": data[i].样本不合格数, "HAQL": data[i].AQL, "HSamplingType": data[i].抽样类型, "HStrictness": data[i].严格度, "HCompareSymbol": data[i].比较符, "HQualityStdID": data[i].HQualityStdID, "HQualityStdName": data[i].质量标准, "HInspectMethodID": data[i].HInspectMethodID, "HInspectMethodName": data[i].检验方法, "HInspectBasisID": data[i].HInspectBasisID, "HInspectBasisName": data[i].检验依据, "HCompareSymbol": data[i].比较符

                                    }
                                )
@@ -2029,7 +2042,7 @@
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../../生产管理/作业指导书/Gy_SOPBill_Video.html?OperationType=5&HMaterID=' + HMaterID + '&HSourceNo=&HSourceEntryID=&HProcID=' + HProcID +'&HType=SIP'
                        , content: '../../生产管理/作业指导书/Gy_SOPBill_Video.html?OperationType=5&HMaterID=' + HMaterID + '&HSourceNo=&HSourceEntryID=&HProcID=' + HProcID + '&HType=SIP'
                        , resize: false,
                        end: function () {
                        }
@@ -2037,7 +2050,7 @@
                        }
                    })
                }
                

            });

            //#region ã€è¡¨ä½“放大镜】
@@ -2348,7 +2361,7 @@
                            $("tr[data-index = " + (result.data.length - 1) + "] ").attr({ "style": "background:#ceedfa;color:black" });

                            trindex = result.data.length - 1;
                            $("#HEntryID").val() - 1                            
                            $("#HEntryID").val() - 1

                            //携带出抽样方案
                            ReturnSampleScheme(data);
@@ -2376,7 +2389,7 @@
                $("#HDownLimit").val(data[data.length - 1].下限值);
                //比较符
                $("#HComparator").val(data[data.length - 1].比较符);
                


                if ($("#HEntryID").val() - 1 >= 0) {
                    option.data[$("#HEntryID").val() - 1].HSampleSchemeID = data[data.length - 1].HSampleSchemeID;
@@ -2801,7 +2814,7 @@
                        , { field: 'HQualityStdID', title: '质量标准ID', edit: 'text', hide: true }
                        , { field: 'HQualityStdName', title: '质量标准', edit: 'text', event: 'HQualityStdName' }
                        , { field: 'HInspectMethodID', title: '检验方法ID', edit: 'text', hide: true }
                        , { field: 'HInspectMethodName', title: '检验方法', edit: 'text', event: 'HInspectMethodName' }
                        , { field: 'HInspectMethodName', title: '检验方法', edit: 'text', event: 'HInspectMethodName', style: 'white-space: nowrap; overflow: hidden;text-overflow: ellipsis;' }
                        , { field: 'HInspectBasisID', title: '检验依据ID', edit: 'text', hide: true }
                        , { field: 'HInspectBasisName', title: '检验依据', edit: 'text', event: 'HInspectBasisName' }
                        , { field: 'HKeyInspect', title: '重点检查', templet: '#HKeyInspect', unresize: false }
@@ -2812,7 +2825,7 @@
                        , { field: 'HTargetVal', title: '目标值' }
                        , { field: 'HUpLimit', title: '上限值' }
                        , { field: 'HDownLimit', title: '下限值' }
                        , { field: 'HCompareSymbol', title: '比较符'}
                        , { field: 'HCompareSymbol', title: '比较符' }
                        , { field: 'HMax', title: '最大值', edit: 'text', totalRow: true }
                        , { field: 'HMin', title: '最小值', edit: 'text', totalRow: true }
                        , { field: 'HAvg', title: '平均值', edit: 'text', totalRow: true }
@@ -3107,6 +3120,9 @@

            //#region ã€åŒå‡»æ£€éªŒé¡¹ç›®è¡Œäº‹ä»¶ã€‘
            table.on('rowDouble(mainTable)', function (obj) {



                $("#HInspectResultToSee").css("background-color", "");//去除检验结果输入框背景颜色
                $("#HInspectResultToSee2").css("background-color", "");//去除检验结果输入框背景颜色

@@ -3117,6 +3133,11 @@
                var nowindex = $(obj.tr).attr("data-index");
                editIndex = Number(nowindex) + Number(1);
                LastIndex = nowindex;
                //#region

                //#endregion



                if (option_Check.length > 0) {
                    $("[name='HEntryID']").attr("value", Number(nowindex) + Number(1));
@@ -3127,7 +3148,7 @@
                    $("#HUpLimit").val(option_Check[nowindex].上限值);
                    $("#HDownLimit").val(option_Check[nowindex].下限值);
                    $("#HComparator").val(option_Check[nowindex].比较符)
                }                
                }


                //选中行改变颜色
@@ -3136,14 +3157,15 @@
                var rowIndex = Number($(obj.tr).attr("data-index")) + Number(1);
                //把检验值数据存到数组
                //createArr(rowIndex);

                var rowFun = table.cache["mainTable"][nowindex].HAnalysisMethod;
                //获取单元格检验值数据

                var table_value = table.cache['ValueTable'];

                if (OperationType == 3) {
                    set_SaveValue(Number(nowindex) + Number(1));
                    set_SaveValue(Number(nowindex) + Number(1), rowFun);
                } else {
                    set_SaveValue(dataindex + 1);
                    set_SaveValue(dataindex + 1, rowFun);
                }
                //赋值与回显
                if ($("#HSampleSchemeID").val() != "0") {
@@ -3571,7 +3593,7 @@
                        HStatus: $("#HStatus").val(), //状态
                        HSampleSchemeID: $("#HSampleSchemeID").val(), //抽样方案ID
                        HSampleSchemeName: $("#HSampleSchemeName").val(), //抽样方案
                       //HCompareSymbol: $("#HCompareSymbol").val(),
                        //HCompareSymbol: $("#HCompareSymbol").val(),
                        HUnitID: $("#HUnitID").val(), //单位ID
                        HUnit: $("#HUnit").val(), //单位
                        HInspectVal: $("#HInspectVal").val(), //检验值
@@ -3649,7 +3671,7 @@

                    $("#HSampleSchemeID").val(0);
                    $("#HSampleSchemeName").val("");
                   //HCompareSymbol: $("#HCompareSymbol").val();
                    //HCompareSymbol: $("#HCompareSymbol").val();
                    $("#HUnitID").val(0);
                    $("#HUnit").val("");
                    $("#HInspectVal").val("");
@@ -3697,7 +3719,7 @@
                            HStatus: $("#HStatus").val(), //状态
                            HSampleSchemeID: option.data[nowindex].HSampleSchemeID, //抽样方案ID
                            HSampleSchemeName: option.data[nowindex].HSampleSchemeName, //抽样方案
                           //HCompareSymbol: $("#HCompareSymbol").val(),
                            //HCompareSymbol: $("#HCompareSymbol").val(),
                            HUnitID: option.data[nowindex].HUnitID, //单位ID
                            HUnit: option.data[nowindex].HUnit,//单位
                            HInspectVal: option.data[nowindex].HInspectVal, //检验值
@@ -3859,8 +3881,8 @@
                    $("#HUnitID").val(maindata[nowindex].HUnitID);
                    $("#HUnit").val(maindata[nowindex].HUnit);
                    $("#HInspectVal").val(maindata[nowindex].HInspectVal);
                    $("#HTargetVal").val(maindata[nowindex].HTargetVal == "" ? (option_Check.length > 0 ? option_Check[nowindex].目标值 : "") : maindata[nowindex].HTargetVal );
                    $("#HUpLimit").val(maindata[nowindex].HUpLimit == "" ? (option_Check.length > 0 ? option_Check[nowindex].上限值 : "") : maindata[nowindex].HUpLimit );
                    $("#HTargetVal").val(maindata[nowindex].HTargetVal == "" ? (option_Check.length > 0 ? option_Check[nowindex].目标值 : "") : maindata[nowindex].HTargetVal);
                    $("#HUpLimit").val(maindata[nowindex].HUpLimit == "" ? (option_Check.length > 0 ? option_Check[nowindex].上限值 : "") : maindata[nowindex].HUpLimit);
                    $("#HDownLimit").val(maindata[nowindex].HDownLimit == "" ? (option_Check.length > 0 ? option_Check[nowindex].下限值 : "") : maindata[nowindex].HDownLimit);
                    $("#HComparator").val(maindata[nowindex].HCompareSymbol == "" ? (option_Check.length > 0 ? option_Check[nowindex].比较符 : "=") : maindata[nowindex].HCompareSymbol);
                    $("#HUpOffSet").val(maindata[nowindex].HUpOffSet);
@@ -3949,20 +3971,20 @@
                            var HAcceptQty = $("#HAcceptQty").val();//允许数
                            //var HEntryID = OperationType == 3 ? editIndex : $("#HEntryID").val() - 1;
                            if (UnRightQty > HAcceptQty) {
                                $("#HResult" + (Number(HEntryID) )).val(2); //不合格
                                $("#HResult" + (Number(HEntryID))).val(2); //不合格
                                $("#HInspectResultToSee").val('不合格');
                                $("#HInspectResultToSee2").val('不合格');
                                $("#HInspectResultToSee").css("background-color", "#F0D6E3");//改变检验结果输入框背景颜色
                                $("#HInspectResultToSee2").css("background-color", "#F0D6E3");//改变检验结果输入框背景颜色
                            } else {
                                $("#HResult" + (Number(HEntryID) )).val(1); //合格
                                $("#HResult" + (Number(HEntryID))).val(1); //合格
                                $("#HInspectResultToSee").val('合格');
                                $("#HInspectResultToSee2").val('合格');
                                $("#HInspectResultToSee").css("background-color", "#CEE3F2");//改变检验结果输入框背景颜色
                                $("#HInspectResultToSee2").css("background-color", "#CEE3F2");//改变检验结果输入框背景颜色
                            }

                            form.render('select');                            
                            form.render('select');
                        } else {
                            option_Value.data = [{
                                "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
@@ -3993,14 +4015,16 @@
                $("#HSampleUnRightQty2").val(UnRightQty);
                var HAcceptQty = $("#HAcceptQty").val();//允许数
                var HEntryID = $("#HEntryID").val() - 1;//数组下标
                if (UnRightQty > HAcceptQty) {
                if (UnRightQty > HAcceptQty) {    
                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //不合格
                    table.cache["mainTable"][HEntryID].HResult = 2
                    $("#HInspectResultToSee").val('不合格');
                    $("#HInspectResultToSee2").val('不合格');
                    $("#HInspectResultToSee").css("background-color", "#F0D6E3");//改变检验结果输入框背景颜色
                    $("#HInspectResultToSee2").css("background-color", "#F0D6E3");//改变检验结果输入框背景颜色
                } else {
                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //合格
                    table.cache["mainTable"][HEntryID].HResult = 1
                    $("#HInspectResultToSee").val('合格');
                    $("#HInspectResultToSee2").val('合格');
                    $("#HInspectResultToSee").css("background-color", "#CEE3F2");//改变检验结果输入框背景颜色
@@ -4209,51 +4233,148 @@

                form.render('select');
            }
            //保存按钮
            form.on('submit(btnSave)', function (data) {
                set_SaveBill(data);
            });
            //检验值保存 - è¿”回Promise
            function set_SaveValue(dataindex, rowFun) {
                return new Promise((resolve, reject) => {
                    var hasEmptyRow = false;
                    var emptyRowNumbers = [];

            //检验值保存
            function set_SaveValue(dataindex) {
                if (OperationType == 3) {
                    EchoValue();
                }
                for (let i = 0; i < table.cache['ValueTable'].length; i++) {
                    if (table.cache['ValueTable'][i].HInSpectValueB == "" || table.cache['ValueTable'][i].HInSpectValueB == null) {
                        table.cache['ValueTable'][i].HInSpectValueB = 0
                    for (let i = 0; i < table.cache['ValueTable'].length; i++) {
                        var row = table.cache['ValueTable'][i];
                        if (rowFun == 2) {
                            if (
                                (!row.HInSpectValue || row.HInSpectValue === "")) {
                                hasEmptyRow = true;
                                emptyRowNumbers.push(i + 1);
                            }
                        }
                    }
                    if (table.cache['ValueTable'][i].HInSpectValueT == "" || table.cache['ValueTable'][i].HInSpectValueT == null) {
                        table.cache['ValueTable'][i].HInSpectValueT = 0
                    }
                    if (table.cache['ValueTable'][i].HInSpectValue == "" || table.cache['ValueTable'][i].HInSpectValue == null) {
                        table.cache['ValueTable'][i].HInSpectValue = 0
                    }
                }
                var sValueTable = JSON.stringify(table.cache['ValueTable']);
                var HInterID = $("#HInterID").val();
                var HEntryID = dataindex;
                var msg = sValueTable + ";" + HInterID + ";" + HEntryID

                var index = layer.load();
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "/QC_FirstPieceCheckBill/set_SaveValue",
                    async: true,
                    data: { "msg": msg },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) {

                    if (hasEmptyRow) {
                        var confirmMsg = "检验值表格中存在空行（第 " + emptyRowNumbers.join(", ") + " è¡Œï¼‰ï¼Œæ˜¯å¦ç»§ç»­ä¿å­˜ï¼Ÿ";
                        layer.confirm(confirmMsg, {
                            icon: 3,
                            title: '提示',
                            btn: ['确认保存', '取消保存']
                        }, function (index) {

                            layer.close(index);
                            //$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//保存按钮
                        }
                        else {
                            proceedWithSave(dataindex).then(resolve).catch(reject);
                        }, function (index) {
                            ////获取上次所在行下标
                            //var dataindex = $("#HEntryID").val() - 1;
                            layer.close(index);
                            layer.msg("检验值保存错误！" + data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                    },
                    error: function (err) {
                        layer.close(index);
                        layer.msg("检验值保存错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            //EchoValue();
                            layer.msg('已取消保存，请完善数据后重新操作', { icon: 2 });
                            //reject(new Error('用户取消了保存'));
                        });
                    } else {

                        proceedWithSave(dataindex).then(resolve).catch(reject);
                    }
                });
            }


            function proceedWithSave(dataindex) {
                return new Promise((resolve, reject) => {
                    if (OperationType == 3) {
                        EchoValue();
                    }

                    
                    for (let i = 0; i < table.cache['ValueTable'].length; i++) {
                        if (table.cache['ValueTable'][i].HInSpectValueB == "" || table.cache['ValueTable'][i].HInSpectValueB == null) {
                            table.cache['ValueTable'][i].HInSpectValueB = 0
                        }
                        if (table.cache['ValueTable'][i].HInSpectValueT == "" || table.cache['ValueTable'][i].HInSpectValueT == null) {
                            table.cache['ValueTable'][i].HInSpectValueT = 0
                        }
                        if (table.cache['ValueTable'][i].HInSpectValue == "" || table.cache['ValueTable'][i].HInSpectValue == null) {
                            table.cache['ValueTable'][i].HInSpectValue = 0
                        }
                    }

                    var sValueTable = JSON.stringify(table.cache['ValueTable']);
                    var HInterID = $("#HInterID").val();
                    var HEntryID = dataindex;
                    var msg = sValueTable + ";" + HInterID + ";" + HEntryID

                    var index = layer.load();
                    $.ajax({
                        type: "POST",
                        url: GetWEBURL() + "/QC_FirstPieceCheckBill/set_SaveValue",
                        async: true,
                        data: { "msg": msg },
                        dataType: "json",
                        success: function (data) {
                            layer.close(index);
                            if (data.count == 1) {
                                layer.msg('检验值保存成功', { icon: 1 });
                                resolve(); // æˆåŠŸæ—¶resolve
                            } else {
                                layer.msg("检验值保存错误！" + data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                reject(new Error("检验值保存错误：" + data.Message));
                            }
                        },
                        error: function (err) {
                            layer.close(index);
                            layer.msg("检验值保存错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            reject(new Error("检验值保存错误：" + err));
                        }
                    });
                });
            }
            //检验值保存
            //function set_SaveValue(dataindex) {
            //    if (OperationType == 3) {
            //        EchoValue();
            //    }
            //    for (let i = 0; i < table.cache['ValueTable'].length; i++) {
            //        if (table.cache['ValueTable'][i].HInSpectValueB == "" || table.cache['ValueTable'][i].HInSpectValueB == null) {
            //            table.cache['ValueTable'][i].HInSpectValueB = 0
            //        }
            //        if (table.cache['ValueTable'][i].HInSpectValueT == "" || table.cache['ValueTable'][i].HInSpectValueT == null) {
            //            table.cache['ValueTable'][i].HInSpectValueT = 0
            //        }
            //        if (table.cache['ValueTable'][i].HInSpectValue == "" || table.cache['ValueTable'][i].HInSpectValue == null) {
            //            table.cache['ValueTable'][i].HInSpectValue = 0
            //        }
            //    }

            //    var sValueTable = JSON.stringify(table.cache['ValueTable']);
            //    var HInterID = $("#HInterID").val();
            //    var HEntryID = dataindex;
            //    var msg = sValueTable + ";" + HInterID + ";" + HEntryID

            //    var index = layer.load();
            //    $.ajax({
            //        type: "POST",
            //        url: GetWEBURL() + "/QC_FirstPieceCheckBill/set_SaveValue",
            //        async: false,
            //        data: { "msg": msg },
            //        dataType: "json",
            //        success: function (data) {
            //            if (data.count == 1) {
            //                layer.close(index);
            //                //$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//保存按钮
            //            }
            //            else {
            //                layer.close(index);
            //                layer.msg("检验值保存错误！" + data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            //            }
            //        },
            //        error: function (err) {
            //            layer.close(index);
            //            layer.msg("检验值保存错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            //        }
            //    });
            //}

            //根据生产资源或者 å·¥åº æŸ¥è¯¢ç”Ÿäº§å·¥å•ä¿¡æ¯
            function get_ICMOBillStatusList() {
@@ -4518,7 +4639,7 @@
                        url: GetWEBURL() + "/Web/GetCheckItemID",
                        type: "GET",
                        async: false,
                        data: { "HName": HName, "HProName": HProName,"HSourceID": HSourceID },
                        data: { "HName": HName, "HProName": HProName, "HSourceID": HSourceID },
                        success: function (result) {
                            if (result.code == 1) {
                                $("#HQCSchemeID").val(result.data[0].hmainid);
@@ -4571,7 +4692,7 @@
                            var LoadData = data.data;
                            $("#HShiftsID").val(LoadData[0].HInterID); //当前工序ID
                            $("#HShiftsName").val(LoadData[0].班次); //当前工序
                        }                      
                        }
                    },
                    error: function (err) {
                        layer.alert(err, { icon: 5 });
@@ -4655,7 +4776,7 @@
                    success: function (data1) {
                        if (data1.data.length != 0) {
                            var dataCol = [];//数据库查询出的列数据
                            var titleData = ["HQCCheckItemID","HInspectInstruMentID"];
                            var titleData = ["HQCCheckItemID", "HInspectInstruMentID"];

                            dataCol = data1.data[0].HGridString.split(',');

@@ -4677,7 +4798,7 @@
                                    option.cols[0][i + 1]["style"] += "font-size:" + data1.data[0].HFontSize + "px;";
                                } else {
                                    option.cols[0][i + 1]["style"] += "font-size:100%";
                                }                              
                                }
                                //显示列
                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                    option.cols[0][i + 1]["hide"] = false;
@@ -4776,9 +4897,9 @@
            $("#HShiftsID").val(obj[0].HInterID);
        }
        //工序
        function GetProcessValue (obj) {
        function GetProcessValue(obj) {
            $("#HProcName").val(obj[0].工序名称);
            $("#HProcID").val(obj[0].HItemID);                      
            $("#HProcID").val(obj[0].HItemID);
        }
        //计量单位
        function GetHUnitListValue(obj) {
@@ -4798,7 +4919,7 @@
            $("#HDownLimit").val(obj.检测值名称);
        }
        //检验项目
        function GetCheckItemValue   (obj) {
        function GetCheckItemValue(obj) {
            OptionData = obj;
        }
        //检验仪器

 WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾_СÎÀ/Cj_ProcessItemStationPlatform_UnbindList.html

@@ -506,10 +506,10 @@
                    sWhere += " and DSN like '%" + HBarcode_SN + "%'";
                }
                if (HBarcode_ZB) {
                    sWhere += " and æ ˆæ¿ç  like '%" + HBarcode_ZB + "%'";
                    sWhere += "and  ç®¡åˆ¶åºå· like 'P%' and ç®¡åˆ¶åºå· like '%XXX' and ç®¡åˆ¶åºå·='" + HBarcode_ZB+"'";
                }
                if (HBarcode_ZX) {
                    sWhere += " and ä¸­ç®±ç  like '%" + HBarcode_ZX + "%'";
                    sWhere += "and ç®¡åˆ¶åºå· like 'MZXH%' and ç®¡åˆ¶åºå·='" + HBarcode_ZX+"'";
                }

                get_Display(sWhere);
@@ -533,7 +533,8 @@
                $("#ColName2").val("0");
                $("#Comparator2").val("0");
                form.render('select');

                
                get_FastQuery("")
                sWhere = "";
            }
            //#endregion

 WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/Mes_OrderProcFlowAllReport_TK.html

@@ -327,12 +327,12 @@
            }

            //加载网格
            function get_Display(txtHOrderProcNo, txtHMaterNumber, check, txtHDeptName, sWhere) {
            function get_Display(HDate1,HDate2,txtHOrderProcNo, txtHMaterNumber, check, txtHDeptName, sWhere) {
                var wait = layer.load();//遮罩
                $.ajax({
                    url: GetWEBURL() + '/Mes_OrderProcFlowAllReport/OrderProcFlowAllReportList_Tk',
                    type: "GET",
                    data: {"txtHOrderProcNo": txtHOrderProcNo, "txtHMaterNumber": txtHMaterNumber, "check": check, "txtHDeptName": txtHDeptName, "sWhere": sWhere },
                    data: { "HDate1": HDate1, "HDate2": HDate2,"txtHOrderProcNo": txtHOrderProcNo, "txtHMaterNumber": txtHMaterNumber, "check": check, "txtHDeptName": txtHDeptName, "sWhere": sWhere },
                    success: function (data1) {
                        var col = [];
                        if (data1.count == 1) {
@@ -385,7 +385,8 @@
            function get_FastQuery() {
                var HDate1 = $("#HDate1").val();
                var HDate2 = $("#HDate2").val();
                sWhere = "and å·¥åºå®Œå·¥æ—¥æœŸ1 >='" + HDate1 + "' and å·¥åºå®Œå·¥æ—¥æœŸ1<='" + HDate2 + "'";
                sWhere = "";
                //sWhere = "and å·¥åºå®Œå·¥æ—¥æœŸ1 >='" + HDate1 + "' and å·¥åºå®Œå·¥æ—¥æœŸ1<='" + HDate2 + "'";
                var txtHOrderProcNo = $("#txtHOrderProcNo").val();//订单跟踪号
                var txtHMaterNumber = $("#txtHMaterNumber").val(); //物料
                var txtHDeptName = $("#txtHDeptName").val(); //物料
@@ -469,7 +470,7 @@
                    sWhere += " and " + ColName2 + " " + com2;
                }

                get_Display(txtHOrderProcNo, txtHMaterNumber, check, txtHDeptName, sWhere);
                get_Display(HDate1,HDate2,txtHOrderProcNo, txtHMaterNumber, check, txtHDeptName, sWhere);
                //sWhere = "'" + HDate1 + "','" + HDate2 + "','" + txtHOrderProcNo + "','" + txtHMaterNumber + "','" + check + "'" + ",'" + txtHDeptName + "'";
                //调用接口后清空sWhere缓存
                sWhere = "";