From b1ebd7f72c771aedf26a02ac468b99b81aac3e2e Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 11 八月 2023 14:05:23 +0800
Subject: [PATCH] 首件,工序检验单

---
 WebTM/views/Baseset/基础资料/Gy_InspectInstruMentList.html      |  118 ++
 WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html             | 2178 ++++++++++++++++++++++++++++++++++++++++
 WebTM/views/质量管理/工序检验单/QC_ProcessCheckBillList.html         |   87 +
 WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html |  651 ++++++-----
 WebTM/views/质量管理/首件检验单/QC_FirstPieceCheckBillList.html      |  127 +
 WebTM/WebTM.csproj                                          |    1 
 6 files changed, 2,808 insertions(+), 354 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 7e7b87c..3040285 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -118,6 +118,7 @@
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_ClassTimePrjList.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_EquipFileBillMainList.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_GetProcNoList.html" />
+    <Content Include="views\Baseset\鍩虹璧勬枡\Gy_InspectInstruMentList.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_InspectValueList.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_LineCenter.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_MaterialList_LSQP.html" />
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectInstruMentList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectInstruMentList.html"
new file mode 100644
index 0000000..8d6d4a6
--- /dev/null
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_InspectInstruMentList.html"
@@ -0,0 +1,118 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>妫�楠屼华鍣ㄥ垪琛�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-card">
+            <div class="layui-card-body" style="padding: 15px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">杩囨护鍒�</label>
+                            <div class="layui-input-inline">
+                                <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" class="layui-input">
+                            </div>
+                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">蹇�熸煡璇�</button>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <table class="layui-hide" id="mainTable"></table>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script>
+        //寮曠敤鐨勫崟鎹強妯″潡锛氶浠舵楠屽崟銆�
+        layui.use(['table', 'form', 'layer'], function () {
+            var table = layui.table
+            , form = layui.form
+            , layer = layui.layer;
+
+            var titleData = ["HItemID", "HUSEORGID","HCREATEORGID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+            form.on('submit(HQuery)', function () {
+                //var sMainStr = JSON.stringify(table.cache['mainTable']);
+                RoadQuery($('#Value').val());
+            });
+            RoadQuery($('#Value').val());
+
+            ///鍔犺浇鏄剧ず鏁版嵁
+            function RoadQuery(Where) {
+                var ajaxLoad = layer.load();
+                var Value = Where;
+                if (Value == null) {
+                    Value = '';
+                }
+
+                $.ajax({
+                    url: GetWEBURL() + '/Web/GetGy_InspectInstruMent',
+                    type: "GET",
+                    data: { "InspectInstruMent": Value, "OrganizationID": sessionStorage["OrganizationID"] },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            var data = [];
+                            var col = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                             //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left' });
+                            for (var i = 0; i < data.length; i++) {
+                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //锟斤拷锟斤拷id锟斤拷
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                    }
+                                }
+                            }
+
+                            //鍔ㄦ�佹樉绀哄垪鍚�
+                            option = {
+                                elem: '#mainTable'
+                                , toolbar: '#toolbarDemo'
+                                , cols: [col]
+                                , data: data1.data
+                                , height: 'full-50'
+                                , page: true
+                                , cellMinWidth: 90
+                                , limit: 50
+                                , limits: [50, 500, 5000, 20000]
+                            }
+
+                            table.render(option);
+                            layer.close(ajaxLoad);
+                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            };
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
index afe3d87..e2ecbad 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
@@ -184,8 +184,8 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label">鍒ゆ柇缁撹</label>
                                             <div class="layui-input-block">
-                                                <input type="radio" name="HCheckerResult" id="HCheckerResult" value="鍚堟牸" title="鍚堟牸" checked>
-                                                <input type="radio" name="HCheckerResult" id="HCheckerResult" value="涓嶅悎鏍�" title="涓嶅悎鏍�">
+                                                <input type="radio" name="HCheckerResult" id="HCheckerResult" value="true" title="鍚堟牸" checked>
+                                                <input type="radio" name="HCheckerResult" id="HCheckerResult" value="false" title="涓嶅悎鏍�">
                                             </div>
                                         </div>
                                     </div>
@@ -266,11 +266,337 @@
                             </div>
                         </div>
                     </div>
-                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                    <!--<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>-->
+                    <div class="layui-tab layui-tab-card">
+                        <ul class="layui-tab-title">
+                            <li class="layui-this">妫�楠岄」鐩�</li>
+                            <li>鎶芥牱妫�楠�</li>
+                            <li>妫�娴嬪��</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <div class="layui-tab-item layui-show">
+                                <!--妫�楠岄」鐩�-->
+                                <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                            </div>
+                            <div class="layui-tab-item">
+                                <!--鎶芥牱妫�楠�-->
+                                <!--<div class="layui-row" style="margin-bottom:15px;margin-left:30px">
+                                    <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_FirstRow" id="btn_FirstRow"><span style="font-weight:bold">棣栬</span></button>
+                                    <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_PreviousRow" id="btn_PreviousRow"><i class="layui-icon layui-icon-prev"></i></button>
+                                    <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_NextRow" id="btn_NextRow"><i class="layui-icon layui-icon-next"></i></button>
+                                    <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_LastRow" id="btn_LastRow"><span style="font-weight:bold">鏈</span></button>
+                                </div>-->
+                                <div class="layui-row">
+                                    <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="HEntryID" id="HEntryID" value="0" style="background-color:#efefef4d;" readonly>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">妫�楠岄」鐩�</label>
+                                        <div class="layui-input-block" style="margin-left: 77px;">
+                                            <input type="text" class="layui-input" name="HQCCheckItemName" id="HQCCheckItemName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchCheckItemID" id="btnSearchCheckItemID" name="btnSearchCheckItemID" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                            </button>
+                                            <input type="hidden" name="HQCCheckItemID" id="HQCCheckItemID" value="0">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-row" style="margin-top:5px;">
+                                    <div class="layui-inline" style="border-bottom:2px solid #9C9C9C;width:260px;margin-left:30px">
+                                        <label class="layui-form-label" style="width: 65px;height:5px;box-shadow:inset 95px 0px 5px 1px #9C9C9C;">
+                                            <span style="text-align:center;margin-right:2.8px;color:white">鎶芥牱鏂规</span>
+                                        </label>
+                                    </div>
+                                    <div class="layui-inline" style="border-bottom:2px solid #9C9C9C;width:260px;margin-left:70px">
+                                        <label class="layui-form-label" style="width: 65px;height:5px;box-shadow:inset 95px 0px 5px 1px #9C9C9C;">
+                                            <span style="text-align:center;margin-right:2.8px;color:white">鎶芥牱妫�楠�</span>
+                                        </label>
+                                    </div>
+                                </div>
+                                <div class="layui-row" style="margin-top:5px;">
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鎶芥牱鏂规</label>
+                                        <div class="layui-input-block" style="margin-left: 77px;">
+                                            <input type="text" class="layui-input" name="HSampleSchemeName" id="HSampleSchemeName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchCheckSampleScheme" id="btnSearchCheckSampleScheme" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                            </button>
+                                            <input type="hidden" name="HSampleSchemeID" id="HSampleSchemeID" value="0">
+                                        </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="HSampleQty" id="HSampleQty" style="background-color:#efefef4d;" readonly>
+                                        </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="HSampleDamageQty" id="HSampleDamageQty" style="">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-row" style="margin-top:5px;">
+                                    <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="HSamplingType" id="HSamplingType" style="background-color:#efefef4d;" readonly>
+                                        </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="HAcceptQty" id="HAcceptQty" style="background-color:#efefef4d;" value="0" readonly>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 70px;">妫�楠岀粨鏋�</label>
+                                        <div class="layui-input-block" style="margin-left: 100px;">
+                                            <input type="text" class="layui-input" name="HInspectResultToSee" id="HInspectResultToSee" value="" style="" readonly>
+                                        </div>
+                                    </div>
+                                    <!--<div class="layui-inline">
+                                        <label class="layui-form-label">妫�楠岀粨鏋�</label>
+                                        <div class="layui-input-block">
+                                            <select name="HResult" lay-filter="HResult" style="width:190px;">
+                                                <option value="鍚堟牸" selected="selected">鍚堟牸</option>
+                                                <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+                                            </select>
+                                        </div>
+                                    </div>-->
+                                </div>
+                                <div class="layui-row" style="margin-top:5px;">
+                                    <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="HInspectionLevel" id="HInspectionLevel" style="background-color:#efefef4d;" readonly>
+                                        </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="HRejectQty" id="HRejectQty" style="background-color:#efefef4d;" readonly>
+                                        </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="checkbox" name="HKeyInspect" id="HKeyInspect" value="false" lay-skin="primary" lay-filter="HKeyInspect">
+                                        </div>
+                                    </div>-->
+                                </div>
+                                <div class="layui-row" style="margin-top:5px;">
+                                    <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="HStrictness" id="HStrictness" style="background-color:#efefef4d;" readonly>
+                                        </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="HSampleUnRightQty" id="HSampleUnRightQty" style="" value="0">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-row" style="margin-top:5px;">
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">AQL</label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="text" class="layui-input" name="HAQL" id="HAQL" style="background-color:#efefef4d;" readonly>
+                                        </div>
+                                    </div>
+                                </div>
+                                <!--<table class="layui-hide" id="samplingTable" lay-filter="samplingTable"></table>-->
+                            </div>
+                            <div class="layui-tab-item" style="height:590px">
+                                <!--妫�娴嬪��-->
+                                <!--<div class="layui-row" style="margin-bottom:15px;margin-left:30px">
+                                    <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_FirstRow" id="btn_FirstRow"><span style="font-weight:bold">棣栬</span></button>
+                                    <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_PreviousRow" id="btn_PreviousRow"><i class="layui-icon layui-icon-prev"></i></button>
+                                    <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_NextRow" id="btn_NextRow"><i class="layui-icon layui-icon-next"></i></button>
+                                    <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn_LastRow" id="btn_LastRow"><span style="font-weight:bold">鏈</span></button>
+                                </div>-->
+                                <div class="left" style="width:50%;height:450px;float:left;">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 70px;">椤圭洰搴忓彿</label>
+                                            <div class="layui-input-block" style="margin-left: 100px;">
+                                                <input type="text" class="layui-input" name="HEntryID" id="HEntryID" value="0" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 70px;">妫�楠岄」鐩�</label>
+                                            <div class="layui-input-block" style="margin-left: 45px;">
+                                                <input type="text" class="layui-input" name="HQCCheckItemName" id="HQCCheckItemName" style="background-color:#efefef4d;width: 53%;float:left;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchCheckItemID" id="btnSearchCheckItemID" name="btnSearchCheckItemID" style="float: left;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                                <input type="hidden" name="HQCCheckItemID" id="HQCCheckItemID" value="0">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top:5px;">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 70px;">鏍锋湰閲�</label>
+                                            <div class="layui-input-block" style="margin-left: 100px;">
+                                                <input type="text" class="layui-input" name="HSampleQty2" id="HSampleQty2" value="0" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 70px;">妫�楠岀粨鏋�</label>
+                                            <div class="layui-input-block" style="margin-left: 100px;">
+                                                <input type="text" class="layui-input" name="HInspectResultToSee2" id="HInspectResultToSee2" value="" style="" readonly>
+                                            </div>
+                                        </div>
+                                        <!--<div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 70px !important;">妫�楠岀粨鏋�</label>
+                                            <div class="layui-input-block" style="margin-left: 100px; width: 182px">
+                                                <select name="HInspectResult" lay-filter="HInspectResult">
+                                                    <option value="鍚堟牸" selected="selected">鍚堟牸</option>
+                                                    <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+                                                </select>
+                                            </div>
+                                        </div>-->
+                                    </div>
+                                    <div class="layui-row" style="margin-top:5px;">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 70px;">涓嶅悎鏍兼暟</label>
+                                            <div class="layui-input-block" style="margin-left: 100px;">
+                                                <input type="text" class="layui-input" name="HSampleUnRightQty2" id="HSampleUnRightQty2" value="0" style="">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 70px;">淇濈暀灏忔暟浣�</label>
+                                            <div class="layui-input-block" style="margin-left: 100px;">
+                                                <input type="text" class="layui-input" name="HResDec" id="HResDec" value="2" style="" onfocus="this.select();">
+                                            </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="checkbox" name="HKeyInspect" id="HKeyInspect2" value="false" lay-skin="primary" lay-filter="HKeyInspect">
+                                            </div>
+                                        </div>-->
+                                    </div>
+                                    <div class="layui-row" style="margin-top:5px;">
+                                        <div class="layui-inline" style="border-bottom:2px solid #9C9C9C;width:290px;margin-left:10px">
+                                            <label class="layui-form-label" style="width: 65px;height:5px;box-shadow:inset 95px 0px 5px 1px #9C9C9C;">
+                                                <span style="text-align:center;margin-right:2.8px;color:white">鎸囨爣</span>
+                                            </label>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top:5px;">
+                                        <!--<div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 70px !important;">鍒嗘瀽鏂规硶</label>
+                                            <div class="layui-input-block" style="margin-left: 100px; width: 182px">
+                                                <select name="HAnalysisMethod" lay-filter="HAnalysisMethod">
+                                                    <option value="鍚堟牸" selected="selected">鍚堟牸</option>
+                                                    <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+                                                </select>
+                                            </div>
+                                        </div>-->
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 70px !important;">鐘舵��</label>
+                                            <div class="layui-input-block" style="margin-left: 100px; width: 182px">
+                                                <select name="HStatus" lay-filter="HStatus" id="HStatus">
+                                                    <option value="1" selected="selected">鍚堟牸</option>
+                                                    <option value="2">涓嶅悎鏍�</option>
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top:5px;">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 70px !important;">姣旇緝绗�</label>
+                                            <div class="layui-input-block" style="margin-left: 100px; width: 182px">
+                                                <select name="HComparator" lay-filter="HComparator" id="HComparator">
+                                                    <option value="=" selected="selected">=</option>
+                                                    <option value=">">></option>
+                                                    <option value=">=">>=</option>
+                                                    <option value="<"><</option>
+                                                    <option value="<="><=</option>
+                                                    <option value="<>"><></option>
+                                                    <option value="between">between</option>
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 70px;">鍗曚綅</label>
+                                            <div class="layui-input-block" style="margin-left: 45px;">
+                                                <input type="text" class="layui-input" name="HUnit" id="HUnit" style="background-color:white;width: 53%;float:left;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchUnit" id="btnSearchUnit" style="float: left;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                                <input type="hidden" name="HUnitID" id="HUnitID" value="0">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top:5px;">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 70px;">妫�楠屽��</label>
+                                            <div class="layui-input-block" style="margin-left: 45px;">
+                                                <input type="text" class="layui-input" name="HInspectVal" id="HInspectVal" style="background-color:white;width: 53%;float:left;" onfocus="this.select();" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchInspectValB" id="btnSearchInspectValB" style="float: left;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                                <input type="hidden" name="HInspectValB" id="HInspectValB" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 70px;">鐩爣鍊�</label>
+                                            <div class="layui-input-block" style="margin-left: 45px;">
+                                                <input type="text" class="layui-input" name="HTargetVal" id="HTargetVal" style="background-color:white;width: 53%;float:left;" onfocus="this.select();" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchTargetValB" id="btnSearchTargetValB" style="float: left;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                                <input type="hidden" name="HTargetValB" id="HTargetValB" value="0">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top:5px;">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 70px;">涓婇檺鍊�</label>
+                                            <div class="layui-input-block" style="margin-left: 100px;">
+                                                <input type="text" class="layui-input" name="HUpLimit" id="HUpLimit" value="0" style="background-color:#efefef4d;" onfocus="this.select();" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 70px;">涓嬮檺鍊�</label>
+                                            <div class="layui-input-block" style="margin-left: 100px;">
+                                                <input type="text" class="layui-input" name="HDownLimit" id="HDownLimit" value="0" style="background-color:#efefef4d;" onfocus="this.select();" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-top:5px;">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 70px;">涓婂亸宸�</label>
+                                            <div class="layui-input-block" style="margin-left: 100px;">
+                                                <input type="text" class="layui-input" name="HUpOffSet" id="HUpOffSet" value="0" style="background-color:#efefef4d;" onfocus="this.select();" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 70px;">涓嬪亸宸�</label>
+                                            <div class="layui-input-block" style="margin-left: 100px;">
+                                                <input type="text" class="layui-input" name="HDownOffSet" id="HDownOffSet" value="0" style="background-color:#efefef4d;" onfocus="this.select();" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="right" style="width:50%;height:450px;float:left;">
+                                    <table class="layui-hide" id="ValueTable" lay-filter="ValueTable"></table>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
                     <script type="text/html" id="toolbarDemo">
                         <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-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>-->
                         </div>
                     </script>
                     <!--闅愯棌瀛楁-->
@@ -292,9 +618,30 @@
     <script type="text/html" id="HResult">
         <select name="HResult" lay-filter="HResult" id="HResult{{d.LAY_TABLE_INDEX+1}}">
             <option value="">璇烽�夋嫨</option>
-            <option value="鍚堟牸">鍚堟牸</option>
-            <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+            <option value="1">鍚堟牸</option>
+            <option value="2">涓嶅悎鏍�</option>
         </select>
+    </script>
+    <!--琛屼笅鎷夐�夋嫨(妫�楠岀粨鏋�)-->
+    <script type="text/html" id="HInSpectResult">
+        <select name="HInSpectResult" lay-filter="HInSpectResult" id="HInSpectResult{{d.LAY_TABLE_INDEX+1}}">
+            <option value="">璇烽�夋嫨</option>
+            <option value="1">鍚堟牸</option>
+            <option value="2">涓嶅悎鏍�</option>
+        </select>
+    </script>
+    <!--琛屼笅鎷夐�夋嫨(鍒嗘瀽鏂规硶)-->
+    <script type="text/html" id="HAnalysisMethod">
+        <select name="HAnalysisMethod" lay-filter="HAnalysisMethod" id="HAnalysisMethod{{d.LAY_TABLE_INDEX+1}}">
+            <option value="">璇烽�夋嫨</option>
+            <option value="1">瀹氭�у垎鏋�</option>
+            <option value="2">瀹氶噺鍒嗘瀽</option>
+            <option value="3">鍏朵粬鍒嗘瀽</option>
+        </select>
+    </script>
+    <!--澶嶉�夋锛堥噸鐐规鏌ワ級-->
+    <script type="text/html" id="HKeyInspect">
+        <input type="checkbox" value="{{d.HKeyInspect}}" lay-skin="primary" id="HKeyInspect{{d.LAY_TABLE_INDEX+1}}" lay-filter="HKeyInspect" {{ d.HKeyInspect == 1 ? 'checked' : '' }}>
     </script>
     <script src="../../../layuiadmin/layui/layui.js"></script>
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
@@ -317,6 +664,18 @@
             //鍏敤鍙橀噺
             var rowdata = [];
             var option = [];
+
+            var rowdata_Value = [];
+            var option_Value = [];
+            var option_Check = [];//鐢ㄦ潵瀛樺偍妫�楠岄」鐩�
+            var Array = []; //鍏ㄥ眬鍙橀噺锛屾渶澶栭潰鐨勪竴灞傛暟缁�,瀛樺偍妫�娴嬪��
+            var checkobj = ""; //澶嶉�夋
+            var trindex = ""; //榛樿閫変腑琛屼笅鏍�
+            var SummaryIndex = []; //閫変腑琛屼笅鏍囨眹鎬�
+            var LastIndex = 0; //鏈�鍚庨�変腑涓�琛岀殑涓嬫爣
+            var isFristClick = true; //鏄惁棣栨鐐瑰嚮琛�
+            var isHavingCount = false; //妫�楠屽�艰〃鏍兼槸鍚︽湁鏁版嵁
+            var UnRightQty_isFied = 0; //鐢ㄤ簬鍒ゆ柇鏄惁鍚堟牸//妫�楠屽�艰〃鏍间笉鍚堟牸鏁伴噺姹囨��
 
             //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
             //if (sessionStorage.login != "login") {
@@ -380,7 +739,7 @@
                 });
             }
             else if (OperationType == 2) {
-                if (HICMOEntryID < 0 || HICMOEntryID == "" ) {
+                if (HICMOEntryID < 0 || HICMOEntryID == "") {
                     layer.alert("鐢熶骇浠诲姟鍗曞瓙鍐呯爜閿欒锛屾棤娉曞伐搴忔锛�", { icon: 5 });
                     $('#btn-AddNew').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂鏂板鎸夐挳绂佺敤
                     $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂淇濆瓨鎸夐挳绂佺敤
@@ -421,6 +780,9 @@
                 RoadBillMain(linterid);
                 //RoadBillSub(linterid);
             }
+
+            $("[name='btnSearchCheckItemID']").addClass("layui-btn-disabled").attr("disabled", true);//绂佺敤妫�楠岄」鐩斁澶ч暅
+
             //鍒濆鍖栬〃鏍�
             set_InitGrid();
 
@@ -465,7 +827,7 @@
                 $.ajax({
                     url: GetWEBURL() + '/Cj_StationOutBill/get_Display',
                     type: "GET",
-                    data: { "sWhere": " and hmainid = " + linterid, "user": sessionStorage["HUserName"]},
+                    data: { "sWhere": " and hmainid = " + linterid, "user": sessionStorage["HUserName"] },
                     success: function (result) {
                         var data = result.data[0];
                         if (result.count == 1) {
@@ -638,11 +1000,150 @@
                             });
                         }
 
+                        if (obj.event == 'HInspectInstruMentID') {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '妫�楠屼华鍣ㄥ垪琛�',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true,
+                                content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_InspectInstruMentList.html', 'yes'],
+                                btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        妫�楠屼华鍣�: checkStatus.data[0].妫�楠屼华鍣ㄥ悕绉�
+                                        , HInspectInstruMentID: checkStatus.data[0].HItemID
+                                    });
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+
                         obj.event = "";
                         return false;
 
                     }
                 })
+            });
+
+            //琛屽唴浜嬩欢--妫�楠屽��
+            table.on('tool(ValueTable)', function (obj) {
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    if (event.key == "F7") {
+                        if (obj.event == 'HInSpectValueB_Open') {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '妫�楠屽�煎垪琛�',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true,
+                                content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_InspectValueList.html', 'yes'],
+                                btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HInSpectValueB: checkStatus.data[0].妫�楠屽�煎悕绉�
+                                    });
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                    var DXValue = checkStatus.data[0].妫�楠屽�煎悕绉�; //瀹氭�ф娴嬪��
+                                    var MBValue = $("#HTargetVal").val(); //鐩爣鍊�
+
+                                    if (Number(DXValue) == Number(MBValue)) { //瀹氭�ф娴嬪�� = 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+                                        obj.update({
+                                            HInSpectResult: 1
+                                        });
+                                        $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+                                    } else {
+                                        obj.update({
+                                            HInSpectResult: 2
+                                        });
+                                        $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+                                    }
+                                    form.render('select');
+
+                                    addUnRightQty();//缁熻涓嶅悎鏍兼暟閲�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+
+                        obj.event = "";
+                        return false;
+                    }
+                })
+            });
+
+            table.on('edit(ValueTable)', function (obj) { //娉細edit鏄浐瀹氫簨浠跺悕锛宼est鏄痶able鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+                var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+                    , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+                    , field = obj.field; //寰楀埌瀛楁
+
+                var MBValue = $("#HTargetVal").val();//鐩爣鍊�
+                var HComparator = $("#HComparator").val();//姣旇緝绗�
+
+                switch (field) {
+                    //瀹氭�ф娴�
+                    case "HInSpectValueB":
+
+                        break;
+                    //瀹氶噺妫�娴�
+                    case "HInSpectValue":
+                        Qualified_Value(HComparator, MBValue, value, obj);
+                        addUnRightQty();
+                        break;
+                    //鍏朵粬妫�娴�
+                    case "HInSpectValueT":
+                        if (Number(value) == Number(MBValue)) { //鍏朵粬妫�娴嬪�� = 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+                            obj.update({
+                                HInSpectResult: 1
+                            });
+                            $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+                        } else {
+                            obj.update({
+                                HInSpectResult: 2
+                            });
+                            $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+                        }
+                        form.render('select');
+                        addUnRightQty();
+                        break;
+                }
             });
 
             //淇濆瓨鎸夐挳
@@ -652,6 +1153,11 @@
 
             //淇濆瓨
             function set_SaveBill(data) {
+                //璧嬪�兼渶鍚庝竴涓�変腑琛岀殑鏁版嵁缁檕ption.data
+                Assignment(LastIndex, LastIndex);
+                //淇濆瓨鏈�鍚庝竴娆$偣鍑昏鐨勬楠屽��
+                set_SaveValue($("#HEntryID").val());
+
                 if ($("#HICMOQty").val() == "" || $("#HICMOQty").val() <= 0) {
                     layer.msg("浠诲姟鍗曟暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return;
@@ -671,10 +1177,33 @@
                         layer.msg("绗�" + indexRow + "琛岋紝妫�楠岄」鐩笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         return;
                     }
+
+                    if (sSubTable[i].HSampleSchemeID == '') {
+                        sSubTable[i].HSampleSchemeID = 0
+                    }
+                    if (sSubTable[i].HSampleQty == '') {
+                        sSubTable[i].HSampleQty = 0
+                    }
+                    if (sSubTable[i].HSampleDamageQty == '') {
+                        sSubTable[i].HSampleDamageQty = 0
+                    }
+                    if (sSubTable[i].HAcceptQty == '') {
+                        sSubTable[i].HAcceptQty = 0
+                    }
+                    if (sSubTable[i].HRejectQty == '') {
+                        sSubTable[i].HRejectQty = 0
+                    }
+                    if (sSubTable[i].HSampleUnRightQty == '') {
+                        sSubTable[i].HSampleUnRightQty = 0
+                    }
+                    if (sSubTable[i].HUnitID == '') {
+                        sSubTable[i].HUnitID = 0
+                    }
                 }
                 var sMainStr = JSON.stringify(data.field);
                 var sSubStr = JSON.stringify(table.cache['mainTable']);
-                var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
+                var sSubValue = JSON.stringify(table.cache['ValueTable']);
+                var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"] + ';' + sSubValue;
                 var index = layer.load();
                 $.ajax({
                     type: "POST",
@@ -722,6 +1251,20 @@
                 })
             }
 
+            //#region  鏃堕棿杞崲
+            function formatDate(date) {
+                var d = new Date(date),
+                    month = '' + (d.getMonth() + 1),
+                    day = '' + d.getDate(),
+                    year = d.getFullYear();
+
+                if (month.length < 2) month = '0' + month;
+                if (day.length < 2) day = '0' + day;
+
+                return [year, month, day].join('-');
+            }
+            //#endregion
+
             //琛ㄥご淇℃伅妫�楠屾柟妗堝脊绐�
             form.on('submit(btnSearchCheckProject)', function () {
                 //椤甸潰灞�-鑷畾涔�
@@ -761,14 +1304,280 @@
                 });
             });
 
+            //琛ㄤ綋淇℃伅妫�楠岄」鐩脊绐�
+            form.on('submit(btnSearchCheckItemID)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '妫�楠岄」鐩垪琛�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    maxmin: true,
+                    content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CheckItem.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HQCCheckProjectID").val(checkStatus.data[0].HItemID);
+                        $("#HQCCheckProjectName").val(checkStatus.data[0].鏂规鍚嶇О);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //琛ㄤ綋淇℃伅鍗曚綅寮圭獥
+            form.on('submit(btnSearchUnit)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鍗曚綅鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    maxmin: true,
+                    content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HUnitID").val(checkStatus.data[0].HItemID);
+                        $("#HUnit").val(checkStatus.data[0].HName);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //琛ㄤ綋淇℃伅妫�楠屽�煎脊绐�
+            form.on('submit(btnSearchInspectValB)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '妫�楠屽�煎垪琛�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    maxmin: true,
+                    content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_InspectValueList.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HInspectValB").val(checkStatus.data[0].hmainid);
+                        $("#HInspectVal").val(checkStatus.data[0].妫�楠屽�煎悕绉�);
+
+                        //==================================鍒ゅ畾鏄惁鍚堟牸,鍙湁瀹氭�у垎鏋愬彲浠ラ�夋嫨妫�楠屽�笺�佺洰鏍囧��==================================
+                        var HComparator = $("#HComparator").val(); //姣旇緝绗�
+                        var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+                        var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+
+                        Qualified(HComparator, HEntryID, HAnalysisMethod);
+
+                        form.render('select');
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //琛ㄤ綋淇℃伅鐩爣鍊煎脊绐�
+            form.on('submit(btnSearchTargetValB)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鐩爣鍊煎垪琛�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    maxmin: true,
+                    content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_InspectValueList.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HTargetValB").val(checkStatus.data[0].hmainid);
+                        $("#HTargetVal").val(checkStatus.data[0].妫�楠屽�煎悕绉�);
+                        $("#HUpLimit").val(checkStatus.data[0].妫�楠屽�煎悕绉�);
+                        $("#HDownLimit").val(checkStatus.data[0].妫�楠屽�煎悕绉�);
+
+                        //==================================鍒ゅ畾鏄惁鍚堟牸,鍙湁瀹氭�у垎鏋愬彲浠ラ�夋嫨妫�楠屽�笺�佺洰鏍囧��==================================
+                        var HComparator = $("#HComparator").val(); //姣旇緝绗�
+                        var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+                        var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+
+                        Qualified(HComparator, HEntryID, HAnalysisMethod);
+
+                        form.render('select');
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //琛ㄤ綋淇℃伅鎶芥牱鏂规寮圭獥
+            form.on('submit(btnSearchCheckSampleScheme)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鎶芥牱鏂规鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    maxmin: true,
+                    content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_SampleSchemeListView.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HSampleSchemeID").val(checkStatus.data[0].hmainid);
+                        $("#HSampleSchemeName").val(checkStatus.data[0].鎶芥牱鏂规鍚嶇О);
+                        $("#HSamplingType").val(checkStatus.data[0].鎶芥牱绫诲瀷);
+                        $("#HInspectionLevel").val(checkStatus.data[0].妫�楠屾按骞�);
+                        $("#HStrictness").val(checkStatus.data[0].涓ユ牸搴�);
+                        $("#HAQL").val(checkStatus.data[0].AQL);
+                        $("#HSampleQty").val(checkStatus.data[0].鏍锋湰閲�);
+                        $("#HSampleQty2").val(checkStatus.data[0].鏍锋湰閲�);
+                        $("#HAcceptQty").val(checkStatus.data[0].鍏佽鏁�);
+
+                        $("#HRejectQty").val(checkStatus.data[0].鎷掔粷鏁�);
+                        $("#HUpLimit").val(checkStatus.data[0].涓婇檺鍊�);
+                        $("#HDownLimit").val(checkStatus.data[0].涓嬮檺鍊�);
+
+                        rowdata_Value = [];
+                        for (let i = 1; i <= checkStatus.data[0].鏍锋湰閲�; i++) {
+                            rowdata_Value.push({
+                                "HSEQ": i, "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": "", "rowNum": $("#HEntryID").val()
+                            });
+                        }
+                        option_Value.data = rowdata_Value;
+                        table.render(option_Value);
+
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+            //#endregion
+
             function get_CheckItem() {
                 $.ajax({
                     url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
                     type: "GET",
                     data: { "CheckProjectID": $("#HQCCheckProjectID").val() },
                     success: function (result) {
-                        option.data = result.data;
+                        //option.data = result.data;
+                        //table.render(option);
+                        var rowdata = [];
+                        var data = result.data;
+                        for (var i = 0; i < result.data.length; i++) {
+                            //瀛愯〃  璧嬪��
+                            rowdata.push({
+                                "HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": 0, "妫�楠屼华鍣�": "","HQCStd": data[i]["HQCStd"], "HUnit": data[i]["HUnit"], "HQCNote": "", "HAnalysisMethod": data[i]["HAnalysisMethod"], "HResult": data[i]["HResult"],
+                                "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
+                                "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '',
+                                "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
+                                "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
+                            });
+                        }
+
+                        option.data = rowdata;
                         table.render(option);
+
+                        for (var i = 1; i <= result.data.length; i++) {
+                            //$('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
+                            $('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true);
+                        }
+                        form.render('select');
+
+                        option_Check = result.data;
+
+                        $("[name='HEntryID']").attr("value", result.data.length);
+                        $("[name='HQCCheckItemID']").attr("value", result.data[result.data.length - 1].HQCCheckItemID);
+                        $("[name='HQCCheckItemName']").attr("value", result.data[result.data.length - 1].妫�楠岄」鐩�);
+                        //榛樿閫変腑鏈�鍚庝竴琛�
+                        $("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").dblclick();
+                        //$("tr[data-index = " + (result.data.length - 1) + "] .layui-form-checkbox").addClass('layui-form-checked');
+                        $("tr[data-index = " + (result.data.length - 1) + "] ").attr({ "style": "background:#ceedfa;color:black" });
+
+                        trindex = result.data.length - 1;
+                        $("#HEntryID").val() - 1
                     }
                 })
             }
@@ -979,23 +1788,58 @@
                 $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
                 //鍒濆琛ㄦ牸鏁版嵁
                 rowdata = [{
-                    "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HQCStd": "", "HResult": "",
-                    "HRemark": ""
+                    "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": '',
+                    "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
+                    "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
                 }];
                 option = {
                     elem: '#mainTable'
-                    , toolbar: '#toolbarDemo'
+                    //, toolbar: '#toolbarDemo'
                     , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
                     , height: 'full-50'
                     , cellMinWidth: 150
                     , cols: [[ //琛ㄥご
                         { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                        , { type: 'numbers', title: '搴忓彿', totalRow: true }
                         , { field: 'HQCCheckItemID', title: 'HQCCheckItemID', hide: true }
                         , { field: '妫�楠岄」鐩�', title: '妫�楠岄」鐩�', edit: 'text', event: 'HQCCheckItemID' }
-                        , { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
-                        , { field: 'HQCRelValue', title: '妫�楠岃褰�', edit: 'text' }
+                        , { field: 'HInspectInstruMentID', title: 'HInspectInstruMentID', hide: true }
+                        , { field: '妫�楠屼华鍣�', title: '妫�楠屼华鍣�', edit: 'text', event: 'HInspectInstruMentID' }
                         , { field: 'HResult', title: '缁撹', templet: '#HResult' }
-                        , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
+                        , { field: 'HAnalysisMethod', title: '鍒嗘瀽鏂规硶', templet: '#HAnalysisMethod', event: 'HAnalysisMethod' }
+                        , { field: 'HKeyInspect', title: '閲嶇偣妫�鏌�', templet: '#HKeyInspect', unresize: false }
+                        , { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
+                        , { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
+                        , { field: 'HUnit', title: '鍗曚綅', edit: 'text' }
+                        , { field: 'HQCNote', title: '妫�楠岃褰�', edit: 'text' }
+                        , { field: 'HMax', title: '鏈�澶у��', edit: 'text' }
+                        , { field: 'HMin', title: '鏈�灏忓��', edit: 'text' }
+                        , { field: 'HAvg', title: '骞冲潎鍊�', edit: 'text', totalRow: true }
+                        //, { field: 'HRemark', title: '澶囨敞', edit: 'text' }
+
+                        , { field: 'HSampleSchemeID', title: '鎶芥牱鏂规ID', edit: 'text', hide: true }
+                        , { field: 'HSampleSchemeName', title: '鎶芥牱鏂规', edit: 'text', hide: true }
+                        , { field: 'HSampleQty', title: '鏍锋湰閲�', edit: 'text', hide: true }
+                        , { field: 'HSampleDamageQty', title: '鏍锋湰鐮村潖鏁�', edit: 'text', hide: true }
+                        , { field: 'HSamplingType', title: '鎶芥牱绫诲瀷', edit: 'text', hide: true }
+                        , { field: 'HAcceptQty', title: '鍏佽鏁�', edit: 'text', hide: true }
+                        , { field: 'HInspectionLevel', title: '妫�楠屾按骞�', edit: 'text', hide: true }
+                        , { field: 'HRejectQty', title: '鎷掔粷鏁�', edit: 'text', hide: true }
+                        , { field: 'HStrictness', title: '涓ユ牸搴�', edit: 'text', hide: true }
+                        , { field: 'HSampleUnRightQty', title: '鏍锋湰涓嶅悎鏍兼暟', edit: 'text', hide: true }
+                        , { field: 'HAQL', title: 'AQL', edit: 'text', hide: true }
+                        , { field: 'HStatus', title: '鐘舵��', edit: 'text', hide: true }
+                        , { field: 'xxx', title: '姣旇緝绗�', edit: 'text', hide: true }
+                        , { field: 'HUnitID', title: '鍗曚綅ID', edit: 'text', hide: true }
+                        , { field: 'HUnit', title: '鍗曚綅', edit: 'text', hide: true }
+                        , { field: 'HInspectVal', title: '妫�楠屽��', edit: 'text', hide: true }
+                        , { field: 'HTargetVal', title: '鐩爣鍊�', edit: 'text', hide: true }
+                        , { field: 'HUpLimit', title: '涓婇檺鍊�', edit: 'text', hide: true }
+                        , { field: 'HDownLimit', title: '涓嬮檺鍊�', edit: 'text', hide: true }
+                        , { field: 'HUpOffSet', title: '涓婂亸宸�', edit: 'text', hide: true }
+                        , { field: 'HDownOffSet', title: '涓嬪亸宸�', edit: 'text', hide: true }
                         , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
                     ]]
                     , done: function (res, curr, count) {
@@ -1020,6 +1864,48 @@
                 //鍔犺浇绌鸿〃鏍�
                 option.data = rowdata;
                 table.render(option);
+
+                //鍒濆琛ㄦ牸鏁版嵁
+                rowdata_Value = [{
+                    "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
+                }];
+                option_Value = {
+                    elem: '#ValueTable'
+                    //, toolbar: '#toolbarDemo_Value'
+                    , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+                    , height: 'full-50'
+                    , cellMinWidth: 150
+                    , cols: [[ //琛ㄥご
+                        { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                        , { field: 'HSEQ', title: '搴忓彿' }
+                        , { field: 'HInSpectResult', title: '妫�楠岀粨鏋�', templet: '#HInSpectResult' }
+                        , { field: 'HInSpectValueB', title: '妫�娴嬪�硷紙瀹氭�э級', edit: 'text', event: 'HInSpectValueB_Open' }
+                        , { field: 'HInSpectValue', title: '妫�娴嬪�硷紙瀹氶噺锛�', edit: 'text' }
+                        , { field: 'HInSpectValueT', title: '妫�娴嬪�硷紙鍏朵粬锛�', edit: 'text' }
+                        //, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+                    ]]
+                    , done: function (res, curr, count) {
+                        option_Value.data = res.data;
+                        //鍘绘帀涓嬫媺妗嗗け鐒︿簨浠跺惁鍒欏湪涓嬫媺妗嗛噷杈撳叆鍊�
+                        $('.layui-form-select').find('input').unbind("blur");
+                        //琛ㄦ牸閲嶈浇鍥炴樉涓嬫媺妗嗛噷鐨勬暟鎹�
+                        $('tr').each(function (e) {
+                            var $cr = $(this);
+                            var dataIndex = $cr.attr("data-index");
+                            $.each(option_Value.data, function (index, value) {
+                                if (value.LAY_TNDEX == dataIndex) {
+                                    $cr.find('input').val(value.HInSpectResult);
+                                }
+                            });
+                        });
+                    }
+                    , text: {
+                        none: '鏃犳暟鎹紒'
+                    }
+                };
+                //鍔犺浇绌鸿〃鏍�
+                option_Value.data = rowdata_Value;
+                table.render(option_Value);
             }
 
             //琛岄�夋嫨澶勭悊锛堢粨璁猴級
@@ -1032,7 +1918,1265 @@
                         value.HResult = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
                     }
                 });
+
+                //閫夋嫨鐨剆elect瀵硅薄鍊硷紱
+                var selectValue = data.value;
+                if (selectValue == 1) {
+                    selectValue = "鍚堟牸"
+                    $("#HInspectResultToSee").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                    $("#HInspectResultToSee2").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                } else {
+                    selectValue = "涓嶅悎鏍�"
+                    $("#HInspectResultToSee").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                    $("#HInspectResultToSee2").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                }
+                $("#HInspectResultToSee").val(selectValue);
+                $("#HInspectResultToSee2").val(selectValue);
+                //$("#HInSpectResult" + Guid).val(selectValue);
+                //$("[name='HResult']").val(selectValue);
+
+                //$("[name='HInspectResult']").val(selectValue);
+                form.render('select');
+
+                LastResult();
             });
+
+            //鍒ゆ柇琛ㄥご鍒ゆ柇缁撹鏄惁鍚堟牸
+            function LastResult() {
+                var HQty = 0;//琛ㄤ綋琛屼笉鍚堟牸鏁伴噺
+                for (let i = 0; i < table.cache['mainTable'].length; i++) {
+                    if (table.cache['mainTable'][i].HResult == 2) {
+                        HQty++;
+                    }
+                }
+                if (HQty > 0) {
+                    document.querySelectorAll("[name='HCheckerResult']")[0].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��                   
+                    $("input:radio[name=HCheckerResult][value=" + false + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+                } else {
+                    document.querySelectorAll("[name='HCheckerResult']")[1].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
+                    $("input:radio[name=HCheckerResult][value=" + true + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+                }
+                form.render('radio');
+            }
+
+            //琛岄�夋嫨澶勭悊锛堟楠岀粨鏋滐級
+            form.on('select(HInSpectResult)', function (data) {
+                //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+                var elem = data.othis.parents('tr');
+                var dataindex = elem.attr("data-index");
+                $.each(option_Value.data, function (index, value) {
+                    if (value.LAY_TABLE_INDEX == dataindex) {
+                        value.HInSpectResult = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                    }
+                });
+
+                //寰幆妫�楠屽�艰〃鏍兼暟鎹紝鑾峰彇涓嶅悎鏍兼暟閲�
+                var HValueTable = table.cache["ValueTable"];
+                var UnRightQty = 0;//妫�楠屽�艰〃鏍间笉鍚堟牸鏁伴噺姹囨��
+
+                for (let i = 0; i < HValueTable.length; i++) {
+                    if (HValueTable[i].HInSpectResult == 2) {
+                        UnRightQty++;
+                    }
+                }
+                UnRightQty_isFied = UnRightQty;
+                $("#HSampleUnRightQty").val(UnRightQty);
+                $("#HSampleUnRightQty2").val(UnRightQty);
+                var HAcceptQty = $("#HAcceptQty").val();//鍏佽鏁�
+                var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+                if (UnRightQty > HAcceptQty) {
+                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                    $("#HInspectResultToSee").val('涓嶅悎鏍�');
+                    $("#HInspectResultToSee2").val('涓嶅悎鏍�');
+                    $("#HInspectResultToSee").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                    $("#HInspectResultToSee2").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                } else {
+                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                    $("#HInspectResultToSee").val('鍚堟牸');
+                    $("#HInspectResultToSee2").val('鍚堟牸');
+                    $("#HInspectResultToSee").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                    $("#HInspectResultToSee2").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                }
+                form.render('select');
+            });
+
+            //琛岄�夋嫨澶勭悊锛堝垎鏋愭柟娉曪級
+            form.on('select(HAnalysisMethod)', function (data) {
+                //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+                var elem = data.othis.parents('tr');
+                var dataindex = elem.attr("data-index");
+                $.each(option.data, function (index, value) {
+                    if (value.LAY_TABLE_INDEX == dataindex) {
+                        value.HAnalysisMethod = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                    }
+                });
+                //闅愯棌妫�娴嬪�煎瓧娈�
+                IsHide(data.value);
+            });
+
+            //琛岄�夋嫨澶勭悊锛堢姸鎬侊級
+            form.on('select(HStatus)', function (data) {
+                var HComparator = $("#HComparator").val(); //姣旇緝绗�
+                var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+                var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+
+                Qualified(HComparator, HEntryID, HAnalysisMethod)
+            });
+
+            ////鐩戝惉涓嬫媺妗嗙紪杈�
+            //form.on('select(HInspectResult)', function (data) {
+            //    //鑾峰彇褰撳墠琛宼r瀵硅薄
+            //    var elem = data.othis.parents('tr');
+            //    //绗竴鍒楃殑鍊兼槸Guid锛屽彇guid鏉ュ垽鏂�
+            //    var Guid = elem.first().find('td').eq(1).text();
+            //    //閫夋嫨鐨剆elect瀵硅薄鍊硷紱
+            //    var selectValue = data.value;
+            //    //$("#HInSpectResult" + Guid).val(selectValue);
+            //    $("[name='HResult']").val(selectValue);
+            //    form.render('select');
+            //})
+
+            //鐩戝惉涓嬫媺妗嗙紪杈�--姣旇緝绗�
+            form.on('select(HComparator)', function (data) {
+                //鑾峰彇褰撳墠琛宼r瀵硅薄
+                var elem = data.othis.parents('tr');
+                //绗竴鍒楃殑鍊兼槸Guid锛屽彇guid鏉ュ垽鏂�
+                var Guid = elem.first().find('td').eq(1).text();
+                //閫夋嫨鐨剆elect瀵硅薄鍊硷紱
+                var selectValue = data.value;
+
+                var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+                var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+                //鍒ゅ畾濡傛灉鏄畾閲忓垎鏋�
+                if (HAnalysisMethod == 2) {
+                    if (selectValue.toString() != '=' && selectValue.toString() != 'between') {
+                        $("#HUpLimit").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓婇檺鍊艰緭鍏ユ鑳屾櫙棰滆壊
+                        $("#HDownLimit").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓嬮檺鍊艰緭鍏ユ鑳屾櫙棰滆壊
+                        $("#HUpOffSet").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓婂亸宸緭鍏ユ鑳屾櫙棰滆壊
+                        $("#HDownOffSet").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓嬪亸宸緭鍏ユ鑳屾櫙棰滆壊
+                    } else if (selectValue.toString() == 'between') {
+                        $("#HUpOffSet").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓婂亸宸緭鍏ユ鑳屾櫙棰滆壊
+                        $("#HDownOffSet").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓嬪亸宸緭鍏ユ鑳屾櫙棰滆壊
+                        $("#HTargetVal").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉鐩爣鍊艰緭鍏ユ鑳屾櫙棰滆壊
+                        $("#HUpLimit").attr("readOnly", false).css("background-color", ""); //涓婇檺鍊兼敼涓哄彲缂栬緫
+                        $("#HDownLimit").attr("readOnly", false).css("background-color", ""); //涓嬮檺鍊兼敼涓哄彲缂栬緫
+                    } else if (selectValue.toString() == '=') {
+                        $("#HUpLimit").attr("readOnly", false).css("background-color", ""); //涓婇檺鍊兼敼涓哄彲缂栬緫
+                        $("#HDownLimit").attr("readOnly", false).css("background-color", ""); //涓嬮檺鍊兼敼涓哄彲缂栬緫
+                        $("#HUpOffSet").attr("readOnly", false).css("background-color", ""); //涓婂亸宸敼涓哄彲缂栬緫
+                        $("#HDownOffSet").attr("readOnly", false).css("background-color", ""); //涓嬪亸宸敼涓哄彲缂栬緫
+                        $("#HInspectVal").attr("readOnly", false).css("background-color", ""); //妫�楠屽�兼敼涓哄彲缂栬緫
+                        $("#HTargetVal").attr("readOnly", false).css("background-color", ""); //鐩爣鍊兼敼涓哄彲缂栬緫
+                        $('#btnSearchInspectValB').addClass("layui-btn-disabled").attr("disabled", true);//妫�楠屽�兼寜閽�
+                        $('#btnSearchTargetValB').addClass("layui-btn-disabled").attr("disabled", true);//鐩爣鍊兼寜閽�
+                        $("#HComparator").attr("disabled", false); //姣旇緝绗︽敼涓哄彲缂栬緫
+                        form.render("select");
+                    }
+                }
+
+
+                form.render('select');
+            })
+
+            //鏄惁閲嶇偣妫�鏌�
+            form.on('checkbox(HKeyInspect)', function (data) {
+                //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+                var elem = data.othis.parents('tr');
+                var dataindex = elem.attr("data-index");
+                $.each(option.data, function (index, value) {
+                    if (value.LAY_TABLE_INDEX == dataindex) {
+                        value.HKeyInspect = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                    }
+                });
+            });
+
+            //#region銆愬弻鍑绘楠岄」鐩浜嬩欢銆�
+            table.on('rowDouble(mainTable)', function (obj) {
+                $("#HInspectResultToSee").css("background-color", "");//鍘婚櫎妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                $("#HInspectResultToSee2").css("background-color", "");//鍘婚櫎妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+
+                //鑾峰彇涓婃鎵�鍦ㄨ涓嬫爣
+                var dataindex = $("#HEntryID").val() - 1;
+
+                //鑾峰彇褰撳墠鐐瑰嚮琛屼笅鏍�
+                var nowindex = $(obj.tr).attr("data-index");
+                LastIndex = nowindex;
+
+                $("[name='HEntryID']").attr("value", Number(nowindex) + Number(1));
+                //$("[name='HQCCheckItemID']").attr("value", option_Check[nowindex].HQCCheckItemID);
+                //$("[name='HQCCheckItemName']").attr("value", option_Check[nowindex].妫�楠岄」鐩�);
+
+                //閫変腑琛屾敼鍙橀鑹�
+                check_row(obj);
+                //鑾峰彇褰撳墠閫変腑琛屽彿
+                var rowIndex = Number($(obj.tr).attr("data-index")) + Number(1);
+                //鎶婃楠屽�兼暟鎹瓨鍒版暟缁�
+                //createArr(rowIndex);
+
+                //鑾峰彇鍗曞厓鏍兼楠屽�兼暟鎹�
+                var table_value = table.cache['ValueTable'];
+
+                set_SaveValue(dataindex + 1);
+                if (isHavingCount == false) {
+                    //鍒锋柊妫�楠屽�艰〃鏍�
+                    option_Value.data = [{
+                        "HSEQ": "0", "HInSpectResult": "", "HInSpectValueB": "", "HInSpectValueT": "", "HInSpectValue": ""
+                    }];
+                    table.render(option_Value);
+                }
+                //璧嬪�间笌鍥炴樉
+                Assignment(nowindex, dataindex);
+                if (isFristClick != true) {
+                    //if ($(this).parents('.layui-table').prevObject.context.cells[5].getAttribute('data-field') == 'HAnalysisMethod') {
+                    //console.log('aaa');
+
+                    //    return;
+                    //}
+                    //淇濆瓨妫�楠屽��
+                } else {
+                    isFristClick = false;
+                }
+            });
+            //#endregion
+
+
+            //#region銆愭枃鏈鐩戝惉锛屽厜鏍囩Щ寮�鏃惰Е鍙戙��
+
+            //[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--妫�楠屽��
+            $("#HInspectVal").blur(function () {
+                var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+                var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+                var HComparator = $("#HComparator").val(); //姣旇緝绗�
+                //瀹氶噺鍒嗘瀽
+                if (HAnalysisMethod == 2) {
+                    Qualified(HComparator, HEntryID, HAnalysisMethod);  //鍒ゆ柇鏄惁鍚堟牸
+                }
+                //鍏朵粬鍒嗘瀽
+                if (HAnalysisMethod == 3) {
+                    Qualified(HComparator, HEntryID, HAnalysisMethod);  //鍒ゆ柇鏄惁鍚堟牸
+                }
+            })
+
+            //[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--鐩爣鍊�
+            $("#HTargetVal").blur(function () {
+                var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+                var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+                var HComparator = $("#HComparator").val(); //姣旇緝绗�
+                //====================璧嬪��/浼犲��===========================
+                var HTargetVal = $("#HTargetVal").val();//鐩爣鍊�
+
+                //瀹氶噺鍒嗘瀽
+                if (HAnalysisMethod == 2) {
+                    $("#HUpLimit").val(HTargetVal) //涓婇檺鍊�
+                    $("#HDownLimit").val(HTargetVal) //涓嬮檺鍊�
+                    Qualified(HComparator, HEntryID, HAnalysisMethod);  //鍒ゆ柇鏄惁鍚堟牸
+                }
+                //鍏朵粬鍒嗘瀽
+                if (HAnalysisMethod == 3) {
+                    Qualified(HComparator, HEntryID, HAnalysisMethod);  //鍒ゆ柇鏄惁鍚堟牸
+                }
+            })
+
+            //[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--涓婇檺鍊�
+            $("#HUpLimit").blur(function () {
+                var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+                var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+                var HComparator = $("#HComparator").val(); //姣旇緝绗�
+                var HResDec = $("#HResDec").val(); //淇濈暀灏忔暟浣�
+                //====================璧嬪��/浼犲��===========================
+                var HTargetVal = $("#HTargetVal").val();//鐩爣鍊�
+                var HUpLimit = $("#HUpLimit").val();//涓婇檺鍊�
+
+                //瀹氶噺鍒嗘瀽
+                if (HAnalysisMethod == 2) {
+                    $("#HUpOffSet").val((Number(HUpLimit) - Number(HTargetVal)).toFixed(HResDec)) //涓婂亸宸�
+                    Qualified(HComparator, HEntryID, HAnalysisMethod);  //鍒ゆ柇鏄惁鍚堟牸
+                }
+            })
+
+            //[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--涓嬮檺鍊�
+            $("#HDownLimit").blur(function () {
+                var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+                var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+                var HComparator = $("#HComparator").val(); //姣旇緝绗�
+                var HResDec = $("#HResDec").val(); //淇濈暀灏忔暟浣�
+                //====================璧嬪��/浼犲��===========================
+                var HTargetVal = $("#HTargetVal").val();//鐩爣鍊�
+                var HDownLimit = $("#HDownLimit").val();//涓嬮檺鍊�
+
+                //瀹氶噺鍒嗘瀽
+                if (HAnalysisMethod == 2) {
+                    $("#HDownOffSet").val((Number(HDownLimit) - Number(HTargetVal)).toFixed(HResDec)) //涓嬪亸宸�
+                    Qualified(HComparator, HEntryID, HAnalysisMethod);  //鍒ゆ柇鏄惁鍚堟牸
+                }
+            })
+
+            //[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--涓婂亸宸�
+            $("#HUpOffSet").blur(function () {
+                var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+                var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+                var HComparator = $("#HComparator").val(); //姣旇緝绗�
+                var HResDec = $("#HResDec").val(); //淇濈暀灏忔暟浣�
+                //====================璧嬪��/浼犲��===========================
+                var HTargetVal = $("#HTargetVal").val();//鐩爣鍊�
+                var HUpOffSet = $("#HUpOffSet").val();//涓婂亸宸�
+
+                //瀹氶噺鍒嗘瀽
+                if (HAnalysisMethod == 2) {
+                    $("#HUpLimit").val((Number(HUpOffSet) + Number(HTargetVal)).toFixed(HResDec)) //涓婇檺鍊�
+                    Qualified(HComparator, HEntryID, HAnalysisMethod);  //鍒ゆ柇鏄惁鍚堟牸
+                }
+            })
+
+            //[ 鍒ゅ畾妫�楠屾槸鍚﹀悎鏍� ]鐩戝惉鏂囨湰妗嗙紪杈�--涓嬪亸宸�
+            $("#HDownOffSet").blur(function () {
+                var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+                var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
+                var HComparator = $("#HComparator").val(); //姣旇緝绗�
+                var HResDec = $("#HResDec").val(); //淇濈暀灏忔暟浣�
+                //====================璧嬪��/浼犲��===========================
+                var HTargetVal = $("#HTargetVal").val();//鐩爣鍊�
+                var HDownOffSet = $("#HDownOffSet").val();//涓嬪亸宸�
+
+                //瀹氶噺鍒嗘瀽
+                if (HAnalysisMethod == 2) {
+                    Qualified(HComparator, HEntryID, HAnalysisMethod);  //鍒ゆ柇鏄惁鍚堟牸
+                    $("#HDownLimit").val((Number(HDownOffSet) + Number(HTargetVal)).toFixed(HResDec)) //涓嬮檺鍊�
+                }
+            })
+
+            //#endregion
+
+            //#region銆愬垽鏂槸鍚﹀悎鏍兼柟娉曘��
+            function Qualified(HComparator, HEntryID, HAnalysisMethod) {
+                var HInspectVal = $("#HInspectVal").val(); //妫�楠屽��
+                var HTargetVal = $("#HTargetVal").val(); //鐩爣鍊�
+                var HUpLimit = $("#HUpLimit").val() //涓婇檺鍊�
+                var HDownLimit = $("#HDownLimit").val() //涓嬮檺鍊�
+                var HUpOffSet = $("#HUpOffSet").val() //涓婂亸宸�
+                var HDownOffSet = $("#HDownOffSet").val() //涓嬪亸宸�
+                var HStatus = $("#HStatus").val() //鐘舵��
+                var HAcceptQty = $("#HAcceptQty").val();//鍏佽鏁�
+
+                //#region銆愬畾鎬у垎鏋愭柟娉曘��
+                if (HAnalysisMethod == 1) {
+                    //鐘舵�佷负鍚堟牸
+                    if (HStatus == 1) {
+                        switch (HComparator) {
+                            //瀹氭�у垎鏋�:閫氳繃妫�楠屽�煎拰鐩爣鍊艰繘琛屽垽瀹氾紝1.涓や釜鍊奸兘鐩哥瓑锛屽苟涓旂姸鎬佹槸鍚堟牸鍒欏垽瀹氬悎鏍硷紱2.涓や釜鍊奸兘鐩哥瓑锛屼絾鐘舵�佷负涓嶅悎鏍煎垯鍒ゅ畾涓嶅悎鏍硷紱
+                            case '=':
+                                if (HInspectVal == HTargetVal && Number(HAcceptQty) >= Number(UnRightQty_isFied)) { //鍒ゆ柇妫�楠屽�硷紝鐩爣鍊兼槸鍚︾浉绛�
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
+                                }
+                                break;
+                            default: break;
+                        }
+                    }
+                    else {
+                        switch (HComparator) {
+                            //瀹氭�у垎鏋�:閫氳繃妫�楠屽�煎拰鐩爣鍊艰繘琛屽垽瀹氾紝1.涓や釜鍊奸兘鐩哥瓑锛屽苟涓旂姸鎬佹槸鍚堟牸鍒欏垽瀹氬悎鏍硷紱2.涓や釜鍊奸兘鐩哥瓑锛屼絾鐘舵�佷负涓嶅悎鏍煎垯鍒ゅ畾涓嶅悎鏍硷紱
+                            case '=':
+                                if (HInspectVal == HTargetVal && Number(HAcceptQty) >= Number(UnRightQty_isFied)) { //鍒ゆ柇妫�楠屽�硷紝鐩爣鍊兼槸鍚︾浉绛�
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
+                                }
+                                break;
+                            default: break;
+                        }
+                    }
+                }
+                //#endregion
+                //#region銆愬畾閲忓垎鏋愭柟娉曘��
+                else if (HAnalysisMethod == 2) {
+                    //鐘舵�佷负鍚堟牸
+                    if (HStatus == 1) {
+                        switch (HComparator) {
+                            case '=':
+                                //姣旇緝绗︿负'='涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽��<=涓婇檺鍊兼椂鎴栬�呮楠屽��=鐩爣鍊兼椂鍒ゅ畾鍚堟牸锛�
+                                //涓婇檺鍊间负0鏃讹紝妫�楠屽��=鐩爣鍊煎垽瀹氬悎鏍硷紝
+                                //涓婇檺鍊间笉涓�0锛屾楠屽��=鐩爣鍊�&&涓婇檺鍊�>=鐩爣鍊�&&涓嬮檺鍊�<=鐩爣鍊� 鍒ゅ畾鍚堟牸
+                                if (((Number(HInspectVal) <= Number(HUpLimit) && Number(HInspectVal) >= Number(HDownLimit)) || Number(HUpLimit) == 0) && Number(HInspectVal) == Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
+                                }
+                                break;
+                            case '>':
+                                //姣旇緝绗︿负'>'涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽��>涓婇檺鍊煎垽瀹氬悎鏍硷紝鍚﹀垯涓嶅悎鏍�
+                                if (Number(HInspectVal) > Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
+                                }
+                                break;
+                            case '>=':
+                                //姣旇緝绗︿负'>='涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽��>=涓婇檺鍊煎垽瀹氬悎鏍硷紝鍚﹀垯涓嶅悎鏍�
+                                if (Number(HInspectVal) >= Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
+                                }
+                                break;
+                            case '<':
+                                //姣旇緝绗︿负'<'涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽��<涓婇檺鍊煎垽瀹氬悎鏍硷紝鍚﹀垯涓嶅悎鏍�
+                                if (Number(HInspectVal) < Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
+                                }
+                                break;
+                            case '<=':
+                                //姣旇緝绗︿负'<='涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽��<=涓婇檺鍊煎垽瀹氬悎鏍硷紝鍚﹀垯涓嶅悎鏍�
+                                if (Number(HInspectVal) <= Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
+                                }
+                                break
+                            case '<>':
+                                //姣旇緝绗︿负'<>'涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽��<>涓婇檺鍊煎垽瀹氬悎鏍硷紝鍚﹀垯涓嶅悎鏍�
+                                if ((Number(HInspectVal) < Number(HTargetVal) || Number(HInspectVal) > Number(HTargetVal)) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
+                                }
+                                break;
+                            case 'between':
+                                //姣旇緝绗︿负'between'涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽�煎湪涓嬮檺鍊间笌涓婇檺鍊间箣闂村垽瀹氬悎鏍硷紝鍚﹀垯涓嶅悎鏍�
+                                if ((Number(HInspectVal) >= Number(HDownLimit) || Number(HInspectVal) <= Number(HUpLimit)) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
+                                }
+                                break;
+                            default: break;
+                        }
+                    }
+                    else { //鐘舵�佷负涓嶅悎鏍�
+                        switch (HComparator) {
+                            case '=':
+                                //姣旇緝绗︿负'='涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽��<=涓婇檺鍊兼椂鎴栬�呮楠屽��=鐩爣鍊兼椂鍒ゅ畾涓嶅悎鏍硷紝
+                                //涓婇檺鍊间负0鏃讹紝妫�楠屽��=鐩爣鍊煎垽瀹氫笉鍚堟牸锛�
+                                //涓婇檺鍊间笉涓�0锛屾楠屽��=鐩爣鍊�&&涓婇檺鍊�>=鐩爣鍊�&&涓嬮檺鍊�<=鐩爣鍊� 鍒ゅ畾涓嶅悎鏍�
+                                if (((Number(HInspectVal) <= Number(HUpLimit) && Number(HInspectVal) >= Number(HDownLimit)) || Number(HUpLimit) == 0) && Number(HInspectVal) == Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
+                                }
+                                break;
+                            case '>':
+                                //姣旇緝绗︿负'>'涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽��>涓婇檺鍊煎垽瀹氫笉鍚堟牸锛屽惁鍒欏悎鏍�
+                                if (Number(HInspectVal) > Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
+                                }
+                                break;
+                            case '>=':
+                                //姣旇緝绗︿负'>='涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽��>=涓婇檺鍊煎垽瀹氫笉鍚堟牸锛屽惁鍒欏悎鏍�
+                                if (Number(HInspectVal) >= Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
+                                }
+                                break;
+                            case '<':
+                                //姣旇緝绗︿负'<'涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽��<涓婇檺鍊煎垽瀹氫笉鍚堟牸锛屽惁鍒欏悎鏍�
+                                if (Number(HInspectVal) < Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
+                                }
+                                break;
+                            case '<=':
+                                //姣旇緝绗︿负'<='涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽��<=涓婇檺鍊煎垽瀹氫笉鍚堟牸锛屽惁鍒欏悎鏍�
+                                if (Number(HInspectVal) <= Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
+                                }
+                                break
+                            case '<>':
+                                //姣旇緝绗︿负'<>'涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽��<>涓婇檺鍊煎垽瀹氫笉鍚堟牸锛屽惁鍒欏悎鏍�
+                                if ((Number(HInspectVal) < Number(HTargetVal) || Number(HInspectVal) > Number(HTargetVal)) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
+                                }
+                                break;
+                            case 'between':
+                                //姣旇緝绗︿负'between'涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽�煎湪涓嬮檺鍊间笌涓婇檺鍊间箣闂村垽瀹氫笉鍚堟牸锛屽惁鍒欏悎鏍�
+                                if ((Number(HInspectVal) >= Number(HDownLimit) || Number(HInspectVal) <= Number(HUpLimit)) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
+                                }
+                                break;
+                            default: break;
+                        }
+                    }
+                }
+                //#endregion
+                //#region銆愬叾浠栧垎鏋愭柟娉曘��
+                else if (HAnalysisMethod == 3) {
+                    //鐘舵�佷负鍚堟牸
+                    if (HStatus == 1) {
+                        switch (HComparator) {
+                            case '=':
+                                //姣旇緝绗︿负'='涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽�煎唴瀹逛笌鐩爣鍊煎唴瀹逛竴鑷村垽瀹氬悎鏍硷紝
+                                if (HInspectVal.toString() == HTargetVal.toString() && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
+                                }
+                                break;
+                            default: break;
+                        }
+                    }
+                    else { //鐘舵�佷负涓嶅悎鏍�
+                        switch (HComparator) {
+                            case '=':
+                                //姣旇緝绗︿负'='涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽�煎唴瀹逛笌鐩爣鍊煎唴瀹逛竴鑷村垽瀹氫笉鍚堟牸锛�
+                                if (HInspectVal.toString() == HTargetVal.toString() && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
+                                } else {
+                                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
+                                }
+                                break;
+                            default: break;
+                        }
+                    }
+                }
+                //#endregion
+
+                form.render('select');
+                //鑾峰彇琛ㄤ綋缁撹鏁版嵁璧嬪�肩粰妫�楠岀粨鏋�
+                var HEntryID = $('#HEntryID').val();
+                var HInspectResultToSee = $("#HResult" + HEntryID).val()
+                if (HInspectResultToSee == 1) {
+                    HInspectResultToSee = "鍚堟牸"
+                    $("#HInspectResultToSee").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                    $("#HInspectResultToSee2").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                } else {
+                    HInspectResultToSee = "涓嶅悎鏍�"
+                    $("#HInspectResultToSee").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                    $("#HInspectResultToSee2").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                }
+                $("#HInspectResultToSee").val(HInspectResultToSee);
+                $("#HInspectResultToSee2").val(HInspectResultToSee);
+                LastResult();
+            };
+            //#endregion
+
+            //#region銆愯祴鍊间笌鍥炴樉銆�
+            function Assignment(nowindex, dataindex) {
+                if (SummaryIndex.indexOf(nowindex) == -1) {
+                    var dataobj = {
+                        HEntryID: $("#HEntryID").val(), //琛屽彿
+                        HStatus: $("#HStatus").val(), //鐘舵��
+                        HSampleSchemeID: $("#HSampleSchemeID").val(), //鎶芥牱鏂规ID
+                        HSampleSchemeName: $("#HSampleSchemeName").val(), //鎶芥牱鏂规
+                        //xxx: $("#xxx").val(),
+                        HUnitID: $("#HUnitID").val(), //鍗曚綅ID
+                        HUnit: $("#HUnit").val(), //鍗曚綅
+                        HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
+                        HTargetVal: $("#HTargetVal").val(), //鐩爣鍊�
+                        HUpLimit: $("#HUpLimit").val(), //涓婇檺鍊�
+                        HDownLimit: $("#HDownLimit").val(), //涓嬮檺鍊�
+                        HUpOffSet: $("#HUpOffSet").val(), //涓婂亸宸�
+                        HDownOffSet: $("#HDownOffSet").val(), //涓嬪亸宸�
+                        HSampleDamageQty: $("#HSampleDamageQty").val(), //鏍锋湰鐮村潖鏁�
+                        HSampleQty: $("#HSampleQty").val(), //鏍锋湰閲�
+                        HAcceptQty: $("#HAcceptQty").val(), //鍏佽鏁�
+                        HInspectionLevel: $("#HInspectionLevel").val(), //妫�楠屾按骞�
+                        HRejectQty: $("#HRejectQty").val(), //鎷掔粷鏁�
+                        HStrictness: $("#HStrictness").val(), //涓ユ牸搴�
+                        HSampleUnRightQty: $("#HSampleUnRightQty").val(), //鏍锋湰涓嶅悎鏍兼暟
+                        HAQL: $("#HAQL").val(), //AQL
+                        HSamplingType: $("#HSamplingType").val(),
+
+                        HSampleQty: $("#HSampleQty").val(), //鏍锋湰閲�
+                        HInspectResultToSee: $("#HInspectResultToSee").val(), //妫�楠岀粨鏋�
+                        HInspectResultToSee2: $("#HInspectResultToSee2").val(), //妫�楠岀粨鏋�2
+                        HSampleUnRightQty: $("#HSampleUnRightQty").val(), //鏍锋湰涓嶅悎鏍兼暟
+                        HUnitID: $("#HUnitID").val(), //鍗曚綅ID
+                        HUnitName: $("#HUnitName").val(), //鍗曚綅
+                        HInspectValB: $("#HInspectValB").val(), //妫�楠屽�糏D
+                        HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
+                        HTargetValB: $("#HTargetValB").val(), //鐩爣鍊糏D
+                        HTargetVal: $("#HTargetVal").val(), //鐩爣鍊�
+                        HUpLimit: $("#HUpLimit").val(), //涓婇檺鍊�
+                        HDownLimit: $("#HDownLimit").val(), //涓嬮檺鍊�
+                        HUpOffSet: $("#HUpOffSet").val(), //涓婂亸宸�
+                        HDownOffSet: $("#HDownOffSet").val(), //涓嬪亸宸�
+                    };
+
+                    //鑾峰彇鏂囨湰妗嗗��
+                    var maindata = table.cache['mainTable'];
+                    //璧嬪�硷紝鍌ㄥ瓨鏁版嵁
+                    maindata[dataindex].HStatus = dataobj.HStatus;
+                    maindata[dataindex].HSampleSchemeID = dataobj.HSampleSchemeID;
+                    maindata[dataindex].HUnitID = dataobj.HUnitID;
+                    maindata[dataindex].HInspectVal = dataobj.HInspectVal;
+                    maindata[dataindex].HTargetVal = dataobj.HTargetVal;
+                    maindata[dataindex].HUpLimit = dataobj.HUpLimit;
+                    maindata[dataindex].HDownLimit = dataobj.HDownLimit;
+                    maindata[dataindex].HUpOffSet = dataobj.HUpOffSet;
+                    maindata[dataindex].HDownOffSet = dataobj.HDownOffSet;
+                    maindata[dataindex].HSampleDamageQty = dataobj.HSampleDamageQty;
+                    maindata[dataindex].HSampleSchemeName = dataobj.HSampleSchemeName;
+                    maindata[dataindex].HUnit = dataobj.HUnit;
+                    maindata[dataindex].HSampleQty = dataobj.HSampleQty;
+                    maindata[dataindex].HAcceptQty = dataobj.HAcceptQty;
+                    maindata[dataindex].HInspectionLevel = dataobj.HInspectionLevel;
+                    maindata[dataindex].HRejectQty = dataobj.HRejectQty;
+                    maindata[dataindex].HStrictness = dataobj.HStrictness;
+                    maindata[dataindex].HSampleUnRightQty = dataobj.HSampleUnRightQty;
+                    maindata[dataindex].HAQL = dataobj.HAQL;
+                    maindata[dataindex].HSamplingType = dataobj.HSamplingType;
+
+                    maindata[dataindex].HSampleQty = dataobj.HSampleQty;
+                    maindata[dataindex].HInspectResultToSee = dataobj.HInspectResultToSee;
+                    maindata[dataindex].HInspectResultToSee2 = dataobj.HInspectResultToSee2;
+                    maindata[dataindex].HSampleUnRightQty = dataobj.HSampleUnRightQty;
+                    maindata[dataindex].HUnitID = dataobj.HUnitID;
+                    maindata[dataindex].HUnitName = dataobj.HUnitName;
+                    maindata[dataindex].HInspectValB = dataobj.HInspectValB;
+                    maindata[dataindex].HInspectVal = dataobj.HInspectVal;
+                    maindata[dataindex].HTargetValB = dataobj.HTargetValB;
+                    maindata[dataindex].HTargetVal = dataobj.HTargetVal;
+                    maindata[dataindex].HUpLimit = dataobj.HUpLimit;
+                    maindata[dataindex].HDownLimit = dataobj.HDownLimit;
+                    maindata[dataindex].HUpOffSet = dataobj.HUpOffSet;
+                    maindata[dataindex].HDownOffSet = dataobj.HDownOffSet;
+
+                    SummaryIndex.push(nowindex);
+
+                    $("#HSampleSchemeID").val(0);
+                    $("#HSampleSchemeName").val("");
+                    //xxx: $("#xxx").val();
+                    $("#HUnitID").val(0);
+                    $("#HUnit").val("");
+                    $("#HInspectVal").val("");
+                    $("#HTargetVal").val("");
+                    $("#HUpLimit").val(0);
+                    $("#HDownLimit").val(0);
+                    $("#HUpOffSet").val(0);
+                    $("#HDownOffSet").val(0);
+                    $("#HSampleDamageQty").val("")
+                    $("#HSampleQty").val("")
+                    $("#HSampleQty2").val("")
+                    $("#HAcceptQty").val("")
+                    $("#HInspectionLevel").val("")
+                    $("#HRejectQty").val("")
+                    $("#HStrictness").val("")
+                    $("#HSampleUnRightQty").val("")
+                    $("#HSampleUnRightQty2").val("")
+                    $("#HAQL").val("")
+                    $("#HSamplingType").val("")
+                    $("#HSampleQty").val("")
+                    $("#HInspectResultToSee").val("")
+                    $("#HInspectResultToSee2").val("")
+                    $("#HSampleUnRightQty").val("")
+                    $("#HUnitID").val("0")
+                    $("#HUnitName").val("")
+                    $("#HInspectValB").val("0")
+                    $("#HInspectVal").val("")
+                    $("#HTargetValB").val("0")
+                    $("#HTargetVal").val("")
+                    $("#HUpLimit").val("0")
+                    $("#HDownLimit").val("0")
+                    $("#HUpOffSet").val("0")
+                    $("#HDownOffSet").val("0")
+
+                } else { //琛ㄤ綋鏂囨湰妗嗗�煎洖鏄�
+                    //鑾峰彇鏂囨湰妗嗗��
+                    var maindata = table.cache['mainTable'];
+
+                    var dataobj = {
+                        HEntryID: $("#HEntryID").val(), //琛屽彿
+                        HStatus: $("#HStatus").val(), //鐘舵��
+                        HSampleSchemeID: $("#HSampleSchemeID").val(), //鎶芥牱鏂规ID
+                        HSampleSchemeName: $("#HSampleSchemeName").val(), //鎶芥牱鏂规
+                        //xxx: $("#xxx").val(),
+                        HUnitID: $("#HUnitID").val(), //鍗曚綅ID
+                        HUnit: $("#HUnit").val(), //鍗曚綅
+                        HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
+                        HTargetVal: $("#HTargetVal").val(), //鐩爣鍊�
+                        HUpLimit: $("#HUpLimit").val(), //涓婇檺鍊�
+                        HDownLimit: $("#HDownLimit").val(), //涓嬮檺鍊�
+                        HUpOffSet: $("#HUpOffSet").val(), //涓婂亸宸�
+                        HDownOffSet: $("#HDownOffSet").val(), //涓嬪亸宸�
+                        HSampleDamageQty: $("#HSampleDamageQty").val(), //鏍锋湰鐮村潖鏁�
+                        HSampleQty: $("#HSampleQty").val(), //鏍锋湰閲�
+                        HAcceptQty: $("#HAcceptQty").val(), //鍏佽鏁�
+                        HInspectionLevel: $("#HInspectionLevel").val(), //妫�楠屾按骞�
+                        HRejectQty: $("#HRejectQty").val(), //鎷掔粷鏁�
+                        HStrictness: $("#HStrictness").val(), //涓ユ牸搴�
+                        HSampleUnRightQty: $("#HSampleUnRightQty").val(), //鏍锋湰涓嶅悎鏍兼暟
+                        HAQL: $("#HAQL").val(), //AQL
+                        HSamplingType: $("#HSamplingType").val(),
+
+                        HSampleQty: $("#HSampleQty").val(), //鏍锋湰閲�
+                        HInspectResultToSee: $("#HInspectResultToSee").val(), //妫�楠岀粨鏋�
+                        HInspectResultToSee2: $("#HInspectResultToSee2").val(), //妫�楠岀粨鏋�2
+                        HSampleUnRightQty: $("#HSampleUnRightQty").val(), //鏍锋湰涓嶅悎鏍兼暟
+                        HUnitID: $("#HUnitID").val(), //鍗曚綅ID
+                        HUnitName: $("#HUnitName").val(), //鍗曚綅
+                        HInspectValB: $("#HInspectValB").val(), //妫�楠屽�糏D
+                        HInspectVal: $("#HInspectVal").val(), //妫�楠屽��
+                        HTargetValB: $("#HTargetValB").val(), //鐩爣鍊糏D
+                        HTargetVal: $("#HTargetVal").val(), //鐩爣鍊�
+                        HUpLimit: $("#HUpLimit").val(), //涓婇檺鍊�
+                        HDownLimit: $("#HDownLimit").val(), //涓嬮檺鍊�
+                        HUpOffSet: $("#HUpOffSet").val(), //涓婂亸宸�
+                        HDownOffSet: $("#HDownOffSet").val(), //涓嬪亸宸�
+                    };
+                    //璧嬪�硷紝鍌ㄥ瓨鏁版嵁
+                    maindata[dataindex].HStatus = dataobj.HStatus;
+                    maindata[dataindex].HSampleSchemeID = dataobj.HSampleSchemeID;
+                    maindata[dataindex].HUnitID = dataobj.HUnitID;
+                    maindata[dataindex].HInspectVal = dataobj.HInspectVal;
+                    maindata[dataindex].HTargetVal = dataobj.HTargetVal;
+                    maindata[dataindex].HUpLimit = dataobj.HUpLimit;
+                    maindata[dataindex].HDownLimit = dataobj.HDownLimit;
+                    maindata[dataindex].HUpOffSet = dataobj.HUpOffSet;
+                    maindata[dataindex].HDownOffSet = dataobj.HDownOffSet;
+                    maindata[dataindex].HSampleDamageQty = dataobj.HSampleDamageQty;
+                    maindata[dataindex].HSampleSchemeName = dataobj.HSampleSchemeName;
+                    maindata[dataindex].HUnit = dataobj.HUnit;
+                    maindata[dataindex].HSampleQty = dataobj.HSampleQty;
+                    maindata[dataindex].HAcceptQty = dataobj.HAcceptQty;
+                    maindata[dataindex].HInspectionLevel = dataobj.HInspectionLevel;
+                    maindata[dataindex].HRejectQty = dataobj.HRejectQty;
+                    maindata[dataindex].HStrictness = dataobj.HStrictness;
+                    maindata[dataindex].HSampleUnRightQty = dataobj.HSampleUnRightQty;
+                    maindata[dataindex].HAQL = dataobj.HAQL;
+                    maindata[dataindex].HSamplingType = dataobj.HSamplingType;
+
+                    maindata[dataindex].HSampleQty = dataobj.HSampleQty;
+                    maindata[dataindex].HInspectResultToSee = dataobj.HInspectResultToSee;
+                    maindata[dataindex].HInspectResultToSee2 = dataobj.HInspectResultToSee2;
+                    maindata[dataindex].HSampleUnRightQty = dataobj.HSampleUnRightQty;
+                    maindata[dataindex].HUnitID = dataobj.HUnitID;
+                    maindata[dataindex].HUnitName = dataobj.HUnitName;
+                    maindata[dataindex].HInspectValB = dataobj.HInspectValB;
+                    maindata[dataindex].HInspectVal = dataobj.HInspectVal;
+                    maindata[dataindex].HTargetValB = dataobj.HTargetValB;
+                    maindata[dataindex].HTargetVal = dataobj.HTargetVal;
+                    maindata[dataindex].HUpLimit = dataobj.HUpLimit;
+                    maindata[dataindex].HDownLimit = dataobj.HDownLimit;
+                    maindata[dataindex].HUpOffSet = dataobj.HUpOffSet;
+                    maindata[dataindex].HDownOffSet = dataobj.HDownOffSet;
+
+                    //鍥炴樉
+                    $("#HSampleSchemeID").val(maindata[nowindex].HSampleSchemeID);
+                    $("#HSampleSchemeName").val(maindata[nowindex].HSampleSchemeName);
+                    //xxx: $("#xxx").val();
+                    $("#HUnitID").val(maindata[nowindex].HUnitID);
+                    $("#HUnit").val(maindata[nowindex].HUnit);
+                    $("#HInspectVal").val(maindata[nowindex].HInspectVal);
+                    $("#HTargetVal").val(maindata[nowindex].HTargetVal);
+                    $("#HUpLimit").val(maindata[nowindex].HUpLimit);
+                    $("#HDownLimit").val(maindata[nowindex].HDownLimit);
+                    $("#HUpOffSet").val(maindata[nowindex].HUpOffSet);
+                    $("#HDownOffSet").val(maindata[nowindex].HDownOffSet);
+                    $("#HSampleDamageQty").val(maindata[nowindex].HSampleDamageQty);
+                    $("#HSampleQty").val(maindata[nowindex].HSampleQty);
+                    $("#HSampleQty2").val(maindata[nowindex].HSampleQty);
+                    $("#HAcceptQty").val(maindata[nowindex].HAcceptQty);
+                    $("#HInspectionLevel").val(maindata[nowindex].HInspectionLevel);
+                    $("#HRejectQty").val(maindata[nowindex].HRejectQty);
+                    $("#HStrictness").val(maindata[nowindex].HStrictness);
+                    $("#HSampleUnRightQty").val(maindata[nowindex].HSampleUnRightQty);
+                    $("#HSampleUnRightQty2").val(maindata[nowindex].HSampleUnRightQty);
+                    $("#HAQL").val(maindata[nowindex].HAQL);
+                    $("#HSamplingType").val(maindata[nowindex].HSamplingType);
+                    $("#HSampleQty").val(maindata[nowindex].HSampleQty);
+                    $("#HInspectResultToSee").val(maindata[nowindex].HInspectResultToSee);
+                    $("#HInspectResultToSee2").val(maindata[nowindex].HInspectResultToSee2);
+                    $("#HSampleUnRightQty").val(maindata[nowindex].HSampleUnRightQty);
+                    $("#HUnitID").val(maindata[nowindex].HUnitID);
+                    $("#HUnitName").val(maindata[nowindex].HUnitName);
+                    $("#HInspectValB").val(maindata[nowindex].HInspectValB);
+                    $("#HInspectVal").val(maindata[nowindex].HInspectVal);
+                    $("#HTargetValB").val(maindata[nowindex].HTargetValB);
+                    $("#HTargetVal").val(maindata[nowindex].HTargetVal);
+                    $("#HUpLimit").val(maindata[nowindex].HUpLimit);
+                    $("#HDownLimit").val(maindata[nowindex].HDownLimit);
+                    $("#HUpOffSet").val(maindata[nowindex].HUpOffSet);
+                    $("#HDownOffSet").val(maindata[nowindex].HDownOffSet);
+
+                    if (maindata[nowindex].HInspectResultToSee == "鍚堟牸") {
+                        $("#HInspectResultToSee").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                        $("#HInspectResultToSee2").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                    } else {
+                        $("#HInspectResultToSee").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                        $("#HInspectResultToSee2").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                    }
+
+                    var HInterID = $("#HInterID").val();
+                    var HEntryID = $("#HEntryID").val();
+                    isHavingCount = false;
+                    //鍥炴樉妫�楠屽��
+                    $.ajax({
+                        url: GetWEBURL() + "/QC_ValueTable/getValueList",
+                        type: "GET",
+                        async: false,
+                        data: { "HInterID": HInterID, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                isHavingCount = true
+
+                                var data = result.data;
+
+                                var rowdata = [];
+                                for (var i = 0; i < result.data.length; i++) {
+                                    //瀛欒〃  璧嬪��
+                                    rowdata.push({
+                                        "HSEQ": data[i]["HSEQ"], "HInSpectResult": data[i]["HInSpectResult"], "HInSpectValueB": data[i]["HInSpectValueB"], "HInSpectValueT": data[i]["HInSpectValueT"], "HInSpectValue": data[i]["HInSpectValue"]
+                                    });
+                                }
+
+                                option_Value.data = rowdata;
+                                table.render(option_Value);
+                                for (var i = 0; i < result.data.length; i++) {
+                                    $('#HInSpectResult' + (i + 1)).find("option[value='" + result.data[i].HInSpectResult + "']").attr("selected", true);
+                                }
+
+                                IsHide(table.cache["mainTable"][HEntryID - 1].HAnalysisMethod); //闅愯棌妫�娴嬪�煎瓧娈�
+                                form.render('select');
+                            } else {
+                                //layer.msg(result.code + result.Message, { icon: 5 });
+                            }
+                        }
+                    })
+                }
+            }
+            //#endregion
+
+            //鑾峰彇涓嶅悎鏍兼暟鎬绘暟
+            function addUnRightQty() {
+                //寰幆妫�楠屽�艰〃鏍兼暟鎹紝鑾峰彇涓嶅悎鏍兼暟閲�
+                var HValueTable = table.cache["ValueTable"];
+                var UnRightQty = 0;//妫�楠屽�艰〃鏍间笉鍚堟牸鏁伴噺姹囨��
+
+                for (let i = 0; i < HValueTable.length; i++) {
+                    if (HValueTable[i].HInSpectResult == 2) {
+                        UnRightQty++;
+                    }
+                }
+                UnRightQty_isFied = UnRightQty;
+                $("#HSampleUnRightQty").val(UnRightQty);
+                $("#HSampleUnRightQty2").val(UnRightQty);
+                var HAcceptQty = $("#HAcceptQty").val();//鍏佽鏁�
+                var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+                if (UnRightQty > HAcceptQty) {
+                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                    $("#HInspectResultToSee").val('涓嶅悎鏍�');
+                    $("#HInspectResultToSee2").val('涓嶅悎鏍�');
+                    $("#HInspectResultToSee").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                    $("#HInspectResultToSee2").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                } else {
+                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                    $("#HInspectResultToSee").val('鍚堟牸');
+                    $("#HInspectResultToSee2").val('鍚堟牸');
+                    $("#HInspectResultToSee").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                    $("#HInspectResultToSee2").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                }
+                form.render('select');
+                LastResult();
+            }
+
+            //妫�楠屽�艰嚜鍔ㄥ垽鏂槸鍚﹀悎鏍�
+            function Qualified_Value(HComparator, MBValue, value, obj) {
+                var HUpLimit = $("#HUpLimit").val(); //涓婇檺鍊�
+                var HDownLimit = $("#HDownLimit").val(); //涓嬮檺鍊�
+                var HStatus = $("#HStatus").val() //鐘舵��
+
+                if (HStatus == 1) {
+                    switch (HComparator) {
+                        case "=":
+                            if (Number(value) == Number(MBValue)) { //鍏朵粬妫�娴嬪�� = 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+                                obj.update({
+                                    HInSpectResult: 1
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+                            } else {
+                                obj.update({
+                                    HInSpectResult: 2
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+                            }
+                            break;
+                        case ">":
+                            if (Number(value) > Number(MBValue)) { //鍏朵粬妫�娴嬪�� > 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+                                obj.update({
+                                    HInSpectResult: 1
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+                            } else {
+                                obj.update({
+                                    HInSpectResult: 2
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+                            }
+                            break;
+                        case ">=":
+                            if (Number(value) >= Number(MBValue)) { //鍏朵粬妫�娴嬪�� >= 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+                                obj.update({
+                                    HInSpectResult: 1
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+                            } else {
+                                obj.update({
+                                    HInSpectResult: 2
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+                            }
+                            break;
+                        case "<":
+                            if (Number(value) < Number(MBValue)) { //鍏朵粬妫�娴嬪�� < 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+                                obj.update({
+                                    HInSpectResult: 1
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+                            } else {
+                                obj.update({
+                                    HInSpectResult: 2
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+                            }
+                            break;
+                        case "<=":
+                            if (Number(value) <= Number(MBValue)) { //鍏朵粬妫�娴嬪�� <= 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+                                obj.update({
+                                    HInSpectResult: 1
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+                            } else {
+                                obj.update({
+                                    HInSpectResult: 2
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+                            }
+                            break;
+                        case "<>":
+                            if (Number(value) < Number(MBValue) || Number(value) > Number(MBValue)) { //鍏朵粬妫�娴嬪�� <> 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+                                obj.update({
+                                    HInSpectResult: 1
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+                            } else {
+                                obj.update({
+                                    HInSpectResult: 2
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+                            }
+                            break;
+                        case "between":
+                            if (Number(value) >= Number(HDownLimit) && Number(value) <= Number(HUpLimit)) { //鍏朵粬妫�娴嬪�� between 涓婁笅闄愬�硷紝鍒ゅ畾鍚堟牸
+                                obj.update({
+                                    HInSpectResult: 1
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+                            } else {
+                                obj.update({
+                                    HInSpectResult: 2
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+                            }
+                            break;
+                    }
+                } else {
+                    switch (HComparator) {
+                        case "=":
+                            if (Number(value) == Number(MBValue)) { //鍏朵粬妫�娴嬪�� = 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+                                obj.update({
+                                    HInSpectResult: 2
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+                            } else {
+                                obj.update({
+                                    HInSpectResult: 1
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+                            }
+                            break;
+                        case ">":
+                            if (Number(value) > Number(MBValue)) { //鍏朵粬妫�娴嬪�� > 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+                                obj.update({
+                                    HInSpectResult: 2
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+                            } else {
+                                obj.update({
+                                    HInSpectResult: 1
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+                            }
+                            break;
+                        case ">=":
+                            if (Number(value) >= Number(MBValue)) { //鍏朵粬妫�娴嬪�� >= 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+                                obj.update({
+                                    HInSpectResult: 2
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+                            } else {
+                                obj.update({
+                                    HInSpectResult: 1
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+                            }
+                            break;
+                        case "<":
+                            if (Number(value) < Number(MBValue)) { //鍏朵粬妫�娴嬪�� < 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+                                obj.update({
+                                    HInSpectResult: 2
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+                            } else {
+                                obj.update({
+                                    HInSpectResult: 1
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+                            }
+                            break;
+                        case "<=":
+                            if (Number(value) <= Number(MBValue)) { //鍏朵粬妫�娴嬪�� <= 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+                                obj.update({
+                                    HInSpectResult: 2
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+                            } else {
+                                obj.update({
+                                    HInSpectResult: 1
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+                            }
+                            break;
+                        case "<>":
+                            if (Number(value) < Number(MBValue) || Number(value) > Number(MBValue)) { //鍏朵粬妫�娴嬪�� <> 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+                                obj.update({
+                                    HInSpectResult: 2
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+                            } else {
+                                obj.update({
+                                    HInSpectResult: 1
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+                            }
+                            break;
+                        case "between":
+                            if (Number(value) >= Number(HDownLimit) && Number(value) <= Number(HUpLimit)) { //鍏朵粬妫�娴嬪�� between 涓婁笅闄愬�硷紝鍒ゅ畾鍚堟牸
+                                obj.update({
+                                    HInSpectResult: 2
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+                            } else {
+                                obj.update({
+                                    HInSpectResult: 1
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+                            }
+                            break;
+                    }
+                }
+
+
+                form.render('select');
+            }
+
+            //妫�楠屽�间繚瀛�
+            function set_SaveValue(dataindex) {
+                for (let i = 0; i < table.cache['ValueTable'].length; i++) {
+                    if (table.cache['ValueTable'][i].HInSpectValueB == "") {
+                        table.cache['ValueTable'][i].HInSpectValueB = 0
+                    }
+                    if (table.cache['ValueTable'][i].HInSpectValueT == "") {
+                        table.cache['ValueTable'][i].HInSpectValueT = 0
+                    }
+                    if (table.cache['ValueTable'][i].HInSpectValue == "") {
+                        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_ProcessCheckBill/set_SaveValue",
+                    async: true,
+                    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: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+
+            //#region銆愰殣钘忔娴嬪�煎瓧娈点��
+            function IsHide(HAnalysisMethod_Value) {
+                if (HAnalysisMethod_Value == 1) { //濡傛灉閫変腑銆愬畾鎬у垎鏋愩�戯紝鍒欓殣钘忓畾閲忋�佸叾浠栧垎鏋�
+                    option_Value.cols[0][3].hide = false; //瀹氭��
+                    option_Value.cols[0][4].hide = true;  //瀹氶噺
+                    option_Value.cols[0][5].hide = true;  //鍏朵粬
+
+                    $("#HComparator").attr("disabled", true); //姣旇緝绗︽敼涓轰笉鍙紪杈�
+                    $("#HUpLimit").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓婇檺鍊艰緭鍏ユ鑳屾櫙棰滆壊
+                    $("#HDownLimit").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓嬮檺鍊艰緭鍏ユ鑳屾櫙棰滆壊
+                    $("#HUpOffSet").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓婂亸宸緭鍏ユ鑳屾櫙棰滆壊
+                    $("#HDownOffSet").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓嬪亸宸緭鍏ユ鑳屾櫙棰滆壊
+
+                    $('#btnSearchInspectValB').removeClass("layui-btn-disabled").attr("disabled", false);//妫�楠屽�兼寜閽惎鐢�
+                    $('#btnSearchTargetValB').removeClass("layui-btn-disabled").attr("disabled", false);//鐩爣鍊兼寜閽惎鐢�
+
+                } else if (HAnalysisMethod_Value == 2) { //濡傛灉閫変腑銆愬畾閲忓垎鏋愩�戯紝鍒欓殣钘忓畾鎬с�佸叾浠栧垎鏋�
+                    option_Value.cols[0][4].hide = false;  //瀹氶噺
+                    option_Value.cols[0][3].hide = true;  //瀹氭��
+                    option_Value.cols[0][5].hide = true;  //鍏朵粬
+
+                    $("#HUpLimit").attr("readOnly", false).css("background-color", ""); //涓婇檺鍊兼敼涓哄彲缂栬緫
+                    $("#HDownLimit").attr("readOnly", false).css("background-color", ""); //涓嬮檺鍊兼敼涓哄彲缂栬緫
+                    $("#HUpOffSet").attr("readOnly", false).css("background-color", ""); //涓婂亸宸敼涓哄彲缂栬緫
+                    $("#HDownOffSet").attr("readOnly", false).css("background-color", ""); //涓嬪亸宸敼涓哄彲缂栬緫
+                    $("#HInspectVal").attr("readOnly", false).css("background-color", ""); //妫�楠屽�兼敼涓哄彲缂栬緫
+                    $("#HTargetVal").attr("readOnly", false).css("background-color", ""); //鐩爣鍊兼敼涓哄彲缂栬緫
+                    $('#btnSearchInspectValB').addClass("layui-btn-disabled").attr("disabled", true);//妫�楠屽�兼寜閽�
+                    $('#btnSearchTargetValB').addClass("layui-btn-disabled").attr("disabled", true);//鐩爣鍊兼寜閽�
+                    $("#HComparator").attr("disabled", false); //姣旇緝绗︽敼涓哄彲缂栬緫
+
+
+                } else if (HAnalysisMethod_Value == 3) { //濡傛灉閫変腑銆愬叾浠栧垎鏋愩�戯紝鍒欓殣钘忓畾閲忋�佸畾鎬у垎鏋�
+                    option_Value.cols[0][5].hide = false;  //鍏朵粬
+                    option_Value.cols[0][3].hide = true;  //瀹氭��
+                    option_Value.cols[0][4].hide = true;  //瀹氶噺
+
+                    $('#btnSearchInspectValB').addClass("layui-btn-disabled").attr("disabled", true);//妫�楠屽�兼寜閽�
+                    $('#btnSearchTargetValB').addClass("layui-btn-disabled").attr("disabled", true);//鐩爣鍊兼寜閽�
+                    $("#HUpOffSet").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓婂亸宸緭鍏ユ鑳屾櫙棰滆壊
+                    $("#HDownOffSet").css("background-color", "#E8E8E8").attr("readOnly", true);//鏀瑰彉涓嬪亸宸緭鍏ユ鑳屾櫙棰滆壊
+                    $("#HUpLimit").attr("readOnly", false).css("background-color", ""); //涓婇檺鍊兼敼涓哄彲缂栬緫
+                    $("#HDownLimit").attr("readOnly", false).css("background-color", ""); //涓嬮檺鍊兼敼涓哄彲缂栬緫
+                    $("#HInspectVal").attr("readOnly", false).css("background-color", ""); //妫�楠屽�兼敼涓哄彲缂栬緫
+                    $("#HTargetVal").attr("readOnly", false).css("background-color", ""); //鐩爣鍊兼敼涓哄彲缂栬緫
+                    $('#btnSearchInspectValB').addClass("layui-btn-disabled").attr("disabled", true);//妫�楠屽�兼寜閽�
+                    $('#btnSearchTargetValB').addClass("layui-btn-disabled").attr("disabled", true);//鐩爣鍊兼寜閽�
+                    $("#HComparator").attr("disabled", true); //姣旇緝绗︽敼涓轰笉鍙紪杈�
+
+                }
+                //閲嶆柊娓叉煋琛ㄦ牸
+                table.render(option_Value);
+                //涓嬫媺妗嗗洖鏄�
+                for (var i = 0; i < option_Value.data.length; i++) {
+                    $('#HInSpectResult' + (i + 1)).find("option[value='" + option_Value.data[i].HInSpectResult + "']").attr("selected", true);
+                }
+                form.render("select");
+            }
+            //#endregion
+
+            //#region銆愭敼鍙橀�変腑琛岄鑹层��
+            function check_row(obj) {
+                if (trindex != "") {
+                    $("tr[data-index = " + (trindex) + "] ").attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                    trindex = "";
+                }
+
+                if (checkobj != "") {
+                    checkobj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    checkobj.tr.find(':checkbox:first').prop('checked', false);//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    $(checkobj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //$('#HKeyInspect2').attr("checked", false);
+                var num = [];
+                for (var i = 0; i < option.data.length; i++) {
+                    var a = $('#HKeyInspect' + (i + 1)).prop("checked");
+                    num.push(a);
+                }
+
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                    checkobj = obj;
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
+                for (var i = 0; i < option.data.length; i++) {
+
+                    if (num[i]) {
+                        $('#HKeyInspect' + (i + 1)).prop("checked", true);
+                    } else {
+                        $('#HKeyInspect' + (i + 1)).prop("checked", false);
+                    }
+                }
+                form.render('checkbox');
+            }
+            //#endregion
+
             //浠ヤ笂涓簂ayui妯″潡
         });
 
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList.html"
index 0ed4dac..9d9cde8 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList.html"
@@ -87,6 +87,7 @@
                 , util = layui.util
             var option = [];
             var HModName = "QC_ProcessCheckBillList";
+            var titleData = ["hmainid", "hentryid", "HEntryID", "HSourceID", "HMaterID", "HFirstCheckEmp", "HQCCheckItemID", "HUnitID", "HSampleSchemeID"];
             //鏌ヨ鏉′欢
             var sWhere = "";
 
@@ -196,23 +197,87 @@
                     ]]
                 };
             }
+            ////#region 鏌ヨ
+            //function get_Display(sWhere) {
+            //    var ajaxLoad = layer.load();
+            //    $.ajax({
+            //        //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+            //        url: GetWEBURL() + '/QC_ProcessCheckBill/GetProcessCheckBillList',
+            //        type: "GET",
+            //        data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+            //        success: function (data1) {
+            //            if (data1.count == 1) {
+            //                option.data = data1.data;
+            //                table.render(option);
+            //                layer.close(ajaxLoad);
+            //                //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+            //            } else {
+            //                layer.close(ajaxLoad);
+            //                layer.alert(data1.code + data1.Message, { icon: 5 });
+            //            }
+            //        }, error: function () {
+            //            layer.close(ajaxLoad);
+            //            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+            //        }
+            //    });
+
+            //}
+            ////#endregion
+
             //#region 鏌ヨ
             function get_Display(sWhere) {
                 var ajaxLoad = layer.load();
                 $.ajax({
-                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                    url: GetWEBURL() + '/QC_ProcessCheckBill/GetProcessCheckBillList',
+                    url: GetWEBURL() + '/QC_ProcessCheckBill/QC_ProcessCheckBillList',
                     type: "GET",
                     data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                     success: function (data1) {
                         if (data1.count == 1) {
-                            option.data = data1.data;
-                            table.render(option);
                             layer.close(ajaxLoad);
-                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+
+                            var data = [];
+                            var col = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left' });
+                            for (var i = 0; i < data.length; i++) {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                    }
+                                }
+                            }
+                            option = {
+                                elem: '#mainTable'
+                                , toolbar: '#toolbarDemo'
+                                , height: 'full-50'
+                                , page: true //寮�鍚垎椤�
+                                , limit: 500
+                                , limits: [500, 2000, 5000, 20000]
+                                , cols: [col]
+                                , data: data1.data
+                            };
+                            //鍒濆鍖栬〃鏍�
+                            DisPlay_HideColumn();
+                            table.render(option);
+
+                            //if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                            //    ColFilter();
+                            //}
                         } else {
                             layer.close(ajaxLoad);
-                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                            layer.msg(data1.code + data1.Message, { icon: 5 });
                         }
                     }, error: function () {
                         layer.close(ajaxLoad);
@@ -312,7 +377,7 @@
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
                 if (checkStatus.data.length === 1) {
-                    var ItemID = data[0];
+                    var HItemID = data[0].hmainid;
                     layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
                         var wait = layer.load();
                         //閫昏緫鍒犻櫎鏂规硶
@@ -320,7 +385,7 @@
 
                             url: GetWEBURL() + '/QC_ProcessCheckBill/Delete_Json',
                             type: "GET",
-                            data: { "HItemID": ItemID, "user": sessionStorage["HUserName"]},
+                            data: { "HItemID": HItemID, "user": sessionStorage["HUserName"]},
                             success: function (result) {
                                 console.log('gouba' + result);
                                 if (result.count == 1) {
@@ -467,12 +532,14 @@
 
 
                             var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
-                            var titleData = ["鍗曟嵁ID", "琛ㄥご澶囨敞", "鐗╂枡", "hsubid"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+                            var titleData = ["hmainid", "hentryid", "HEntryID", "HSourceID", "HMaterID", "HFirstCheckEmp", "HQCCheckItemID", "HUnitID", "HSampleSchemeID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
 
                             dataCol = data1.data[0].HGridString.split(',');
 
                             for (var i = 0; i < option.cols[0].length - 2; i++) {
-                                var dataCols = dataCol[i].split('|');
+                                if (dataCol[i]) {
+                                    var dataCols = dataCol[i].split('|');
+                                }
                                 //闅愯棌鍒�
                                 if (dataCols[1] == 1) {
                                     option.cols[0][i + 1]["hide"] = true;
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
index 41fdd83..1f88dc0 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
@@ -476,6 +476,12 @@
                                                 <input type="text" class="layui-input" name="HSampleUnRightQty2" id="HSampleUnRightQty2" value="0" style="">
                                             </div>
                                         </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 70px;">淇濈暀灏忔暟浣�</label>
+                                            <div class="layui-input-block" style="margin-left: 100px;">
+                                                <input type="text" class="layui-input" name="HResDec" id="HResDec" value="2" style="" onfocus="this.select();">
+                                            </div>
+                                        </div>
                                         <!--<div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">閲嶇偣妫�鏌�</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
@@ -595,8 +601,8 @@
                     </div>
                     <script type="text/html" id="toolbarDemo">
                         <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-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>
                         </div>
                     </script>
                     <!--闅愯棌瀛楁-->
@@ -663,9 +669,9 @@
             //鍏敤鍙橀噺
             var rowdata = [];
             var option = [];
+
             var rowdata_Value = [];
             var option_Value = [];
-
             var option_Check = [];//鐢ㄦ潵瀛樺偍妫�楠岄」鐩�
             var Array = []; //鍏ㄥ眬鍙橀噺锛屾渶澶栭潰鐨勪竴灞傛暟缁�,瀛樺偍妫�娴嬪��
             var checkobj = ""; //澶嶉�夋
@@ -925,7 +931,7 @@
                     , data = checkStatus.data;
                 //鏂板琛岃〃鏍兼暟鎹�
                 var NewRow = {
-                    "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
+                    "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "HInspectInstruMentID": "0", "妫�楠屼华鍣�": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
                     "HMax": "", "HMin": "", "HAvg": "", "HRemark": ""
                 };
                 switch (obj.event) {
@@ -1115,18 +1121,17 @@
                                 }
                             });
                         }
-
-                        if (obj.event == 'HInSpectValueB_Open') {
+                        if (obj.event == 'HInspectInstruMentID') {
                             //椤甸潰灞�-鑷畾涔�
                             layer.open({
                                 type: 2,
                                 skin: 'layui-layer-rim', //鍔犱笂杈规
-                                title: '妫�楠屽�煎垪琛�',
+                                title: '妫�楠屼华鍣ㄥ垪琛�',
                                 closeBtn: 1,
                                 shift: 2,
                                 area: ['90%', '90%'],
                                 maxmin: true,
-                                content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_InspectValueList.html', 'yes'],
+                                content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_InspectInstruMentList.html', 'yes'],
                                 btn: ['纭畾', '鍙栨秷']
                                 , btn1: function (index, layero) {
 
@@ -1139,7 +1144,8 @@
 
                                     //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
                                     obj.update({
-                                        HInSpectValueB: checkStatus.data[0].妫�楠屽�煎悕绉�
+                                        妫�楠屼华鍣�: checkStatus.data[0].妫�楠屼华鍣ㄥ悕绉�
+                                        , HInspectInstruMentID: checkStatus.data[0].HItemID
                                     });
                                     layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                                 }
@@ -1152,6 +1158,7 @@
                                 }
                             });
                         }
+
 
                         obj.event = "";
                         return false;
@@ -1261,244 +1268,13 @@
                 }
             });
 
-            function addUnRightQty() {
-                //寰幆妫�楠屽�艰〃鏍兼暟鎹紝鑾峰彇涓嶅悎鏍兼暟閲�
-                var HValueTable = table.cache["ValueTable"];
-                var UnRightQty = 0;//妫�楠屽�艰〃鏍间笉鍚堟牸鏁伴噺姹囨��
-
-                for (let i = 0; i < HValueTable.length; i++) {
-                    if (HValueTable[i].HInSpectResult == 2) {
-                        UnRightQty++;
-                    }
-                }
-                UnRightQty_isFied = UnRightQty;
-                $("#HSampleUnRightQty").val(UnRightQty);
-                $("#HSampleUnRightQty2").val(UnRightQty);
-                var HAcceptQty = $("#HAcceptQty").val();//鍏佽鏁�
-                var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
-                if (UnRightQty > HAcceptQty) {
-                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
-                    $("#HInspectResultToSee").val('涓嶅悎鏍�');
-                    $("#HInspectResultToSee2").val('涓嶅悎鏍�');
-                    $("#HInspectResultToSee").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
-                    $("#HInspectResultToSee2").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
-                } else {
-                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
-                    $("#HInspectResultToSee").val('鍚堟牸');
-                    $("#HInspectResultToSee2").val('鍚堟牸');
-                    $("#HInspectResultToSee").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
-                    $("#HInspectResultToSee2").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
-                }
-                form.render('select');
-                LastResult();
-            }
-
-            function Qualified_Value(HComparator, MBValue, value, obj) {
-                var HUpLimit = $("#HUpLimit").val(); //涓婇檺鍊�
-                var HDownLimit = $("#HDownLimit").val(); //涓嬮檺鍊�
-                var HStatus = $("#HStatus").val() //鐘舵��
-
-                if (HStatus == 1) {
-                    switch (HComparator) {
-                        case "=":
-                            if (Number(value) == Number(MBValue)) { //鍏朵粬妫�娴嬪�� = 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
-                                obj.update({
-                                    HInSpectResult: 1
-                                });
-                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
-                            } else {
-                                obj.update({
-                                    HInSpectResult: 2
-                                });
-                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
-                            }
-                            break;
-                        case ">":
-                            if (Number(value) > Number(MBValue)) { //鍏朵粬妫�娴嬪�� > 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
-                                obj.update({
-                                    HInSpectResult: 1
-                                });
-                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
-                            } else {
-                                obj.update({
-                                    HInSpectResult: 2
-                                });
-                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
-                            }
-                            break;
-                        case ">=":
-                            if (Number(value) >= Number(MBValue)) { //鍏朵粬妫�娴嬪�� >= 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
-                                obj.update({
-                                    HInSpectResult: 1
-                                });
-                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
-                            } else {
-                                obj.update({
-                                    HInSpectResult: 2
-                                });
-                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
-                            }
-                            break;
-                        case "<":
-                            if (Number(value) < Number(MBValue)) { //鍏朵粬妫�娴嬪�� < 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
-                                obj.update({
-                                    HInSpectResult: 1
-                                });
-                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
-                            } else {
-                                obj.update({
-                                    HInSpectResult: 2
-                                });
-                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
-                            }
-                            break;
-                        case "<=":
-                            if (Number(value) <= Number(MBValue)) { //鍏朵粬妫�娴嬪�� <= 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
-                                obj.update({
-                                    HInSpectResult: 1
-                                });
-                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
-                            } else {
-                                obj.update({
-                                    HInSpectResult: 2
-                                });
-                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
-                            }
-                            break;
-                        case "<>":
-                            if (Number(value) < Number(MBValue) || Number(value) > Number(MBValue)) { //鍏朵粬妫�娴嬪�� <> 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
-                                obj.update({
-                                    HInSpectResult: 1
-                                });
-                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
-                            } else {
-                                obj.update({
-                                    HInSpectResult: 2
-                                });
-                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
-                            }
-                            break;
-                        case "between":
-                            if (Number(value) >= Number(HDownLimit) && Number(value) <= Number(HUpLimit)) { //鍏朵粬妫�娴嬪�� between 涓婁笅闄愬�硷紝鍒ゅ畾鍚堟牸
-                                obj.update({
-                                    HInSpectResult: 1
-                                });
-                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
-                            } else {
-                                obj.update({
-                                    HInSpectResult: 2
-                                });
-                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
-                            }
-                            break;
-                    }
-                } else {
-                    switch (HComparator) {
-                        case "=":
-                            if (Number(value) == Number(MBValue)) { //鍏朵粬妫�娴嬪�� = 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
-                                obj.update({
-                                    HInSpectResult: 2
-                                });
-                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
-                            } else {
-                                obj.update({
-                                    HInSpectResult: 1
-                                });
-                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
-                            }
-                            break;
-                        case ">":
-                            if (Number(value) > Number(MBValue)) { //鍏朵粬妫�娴嬪�� > 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
-                                obj.update({
-                                    HInSpectResult: 2
-                                });
-                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
-                            } else {
-                                obj.update({
-                                    HInSpectResult: 1
-                                });
-                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
-                            }
-                            break;
-                        case ">=":
-                            if (Number(value) >= Number(MBValue)) { //鍏朵粬妫�娴嬪�� >= 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
-                                obj.update({
-                                    HInSpectResult: 2
-                                });
-                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
-                            } else {
-                                obj.update({
-                                    HInSpectResult: 1
-                                });
-                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
-                            }
-                            break;
-                        case "<":
-                            if (Number(value) < Number(MBValue)) { //鍏朵粬妫�娴嬪�� < 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
-                                obj.update({
-                                    HInSpectResult: 2
-                                });
-                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
-                            } else {
-                                obj.update({
-                                    HInSpectResult: 1
-                                });
-                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
-                            }
-                            break;
-                        case "<=":
-                            if (Number(value) <= Number(MBValue)) { //鍏朵粬妫�娴嬪�� <= 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
-                                obj.update({
-                                    HInSpectResult: 2
-                                });
-                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
-                            } else {
-                                obj.update({
-                                    HInSpectResult: 1
-                                });
-                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
-                            }
-                            break;
-                        case "<>":
-                            if (Number(value) < Number(MBValue) || Number(value) > Number(MBValue)) { //鍏朵粬妫�娴嬪�� <> 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
-                                obj.update({
-                                    HInSpectResult: 2
-                                });
-                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
-                            } else {
-                                obj.update({
-                                    HInSpectResult: 1
-                                });
-                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
-                            }
-                            break;
-                        case "between":
-                            if (Number(value) >= Number(HDownLimit) && Number(value) <= Number(HUpLimit)) { //鍏朵粬妫�娴嬪�� between 涓婁笅闄愬�硷紝鍒ゅ畾鍚堟牸
-                                obj.update({
-                                    HInSpectResult: 2
-                                });
-                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
-                            } else {
-                                obj.update({
-                                    HInSpectResult: 1
-                                });
-                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
-                            }
-                            break;
-                    }
-                }
-
-
-                form.render('select');
-            }
-
             //淇濆瓨鎸夐挳
             form.on('submit(btnSave)', function (data) {
                 set_SaveBill(data);
             });
 
             //淇濆瓨
-            function set_SaveBill(data) {
+            function set_SaveBill(data) {              
                 //璧嬪�兼渶鍚庝竴涓�変腑琛岀殑鏁版嵁缁檕ption.data
                 Assignment(LastIndex, LastIndex);
                 //淇濆瓨鏈�鍚庝竴娆$偣鍑昏鐨勬楠屽��
@@ -1523,7 +1299,6 @@
                         layer.msg("绗�" + indexRow + "琛岋紝妫�楠岄」鐩笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         return;
                     }
-                    console.log(sSubTable);
                     if (sSubTable[i].HSampleSchemeID == '') {
                         sSubTable[i].HSampleSchemeID = 0
                     }
@@ -1550,7 +1325,7 @@
                 var sSubStr = JSON.stringify(table.cache['mainTable']);
                 var sSubValue = JSON.stringify(table.cache['ValueTable']);
                 var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"] + ';' + sSubValue;
-                console.log(sSubStr);
+
                 var index = layer.load();
                 $.ajax({
                     type: "POST",
@@ -1695,49 +1470,6 @@
                         layer.alert("鍙戠敓閿欒!", { icon: 5 });
                     }
                 })
-            }
-
-            //妫�楠屽�间繚瀛�
-            function set_SaveValue(dataindex) {
-                for (let i = 0; i < table.cache['ValueTable'].length; i++) {
-                    if (table.cache['ValueTable'][i].HInSpectValueB == "") {
-                        table.cache['ValueTable'][i].HInSpectValueB = 0
-                    }
-                    if (table.cache['ValueTable'][i].HInSpectValueT == "") {
-                        table.cache['ValueTable'][i].HInSpectValueT = 0
-                    }
-                    if (table.cache['ValueTable'][i].HInSpectValue == "") {
-                        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) {
-                            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: "娓╅Θ鎻愮ず" });
-                    }
-                });
             }
 
             //#region  鏃堕棿杞崲
@@ -2038,7 +1770,7 @@
                         for (var i = 0; i < result.data.length; i++) {
                             //瀛愯〃  璧嬪��
                             rowdata.push({
-                                "HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["HUnit"], "HQCNote": "", "HAnalysisMethod": data[i]["HAnalysisMethod"], "HResult": data[i]["HResult"],
+                                "HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": 0, "妫�楠屼华鍣�": "", "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["HUnit"], "HQCNote": "", "HAnalysisMethod": data[i]["HAnalysisMethod"], "HResult": data[i]["HResult"],
                                 "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
                                 "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '',
                                 "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
@@ -2280,7 +2012,7 @@
                 $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
                 //鍒濆琛ㄦ牸鏁版嵁
                 rowdata = [{
-                    "HQCCheckItemID": "", "妫�楠岄」鐩�": "", "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": '',
                     "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
@@ -2288,7 +2020,7 @@
                 }];
                 option = {
                     elem: '#mainTable'
-                    //, toolbar: '#toolbarDemo'
+                    , toolbar: '#toolbarDemo'
                     , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
                     , height: 'full-50'
                     , cellMinWidth: 150
@@ -2297,6 +2029,8 @@
                         , { type: 'numbers', title: '搴忓彿', totalRow: true }
                         , { field: 'HQCCheckItemID', title: 'HQCCheckItemID', hide: true }
                         , { field: '妫�楠岄」鐩�', title: '妫�楠岄」鐩�', edit: 'text', event: 'HQCCheckItemID' }
+                        , { field: 'HInspectInstruMentID', title: 'HInspectInstruMentID', hide: true }
+                        , { field: '妫�楠屼华鍣�', title: '妫�楠屼华鍣�', edit: 'text', event: 'HInspectInstruMentID' }
                         , { field: 'HResult', title: '缁撹', templet: '#HResult', event: 'HResult' }
                         , { field: 'HAnalysisMethod', title: '鍒嗘瀽鏂规硶', templet: '#HAnalysisMethod', event: 'HAnalysisMethod' }
                         , { field: 'HKeyInspect', title: '閲嶇偣妫�鏌�', templet: '#HKeyInspect', unresize: false }
@@ -2430,6 +2164,8 @@
                 LastResult();
             });
 
+
+            //鍒ゆ柇琛ㄥご鍒ゆ柇缁撹鏄惁鍚堟牸
             function LastResult() {
                 var HQty = 0;//琛ㄤ綋琛屼笉鍚堟牸鏁伴噺
                 for (let i = 0; i < table.cache['mainTable'].length; i++) {
@@ -2437,10 +2173,12 @@
                         HQty++;
                     }
                 }
-                if (HQty > 0) {                  
-                    $("input:radio[name=HLastResult][value=" + false + "]").attr("checked", "true");
-                } else {                   
-                    $("input:radio[name=HLastResult][value=" + true + "]").attr("checked", "true");
+                if (HQty > 0) {
+                    document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��                   
+                    $("input:radio[name=HLastResult][value=" + false + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+                } else {
+                    document.querySelectorAll("[name='HLastResult']")[1].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
+                    $("input:radio[name=HLastResult][value=" + true + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
                 }
                 form.render('radio');
             }
@@ -2496,6 +2234,7 @@
                     $("#HInspectResultToSee2").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
                 }
                 form.render('select');
+                LastResult();
             });
 
             //琛岄�夋嫨澶勭悊锛堝垎鏋愭柟娉曪級
@@ -2693,13 +2432,14 @@
                 var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
                 var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
                 var HComparator = $("#HComparator").val(); //姣旇緝绗�
+                var HResDec = $("#HResDec").val(); //淇濈暀灏忔暟浣�
                 //====================璧嬪��/浼犲��===========================
                 var HTargetVal = $("#HTargetVal").val();//鐩爣鍊�
                 var HUpLimit = $("#HUpLimit").val();//涓婇檺鍊�
 
                 //瀹氶噺鍒嗘瀽
                 if (HAnalysisMethod == 2) {
-                    $("#HUpOffSet").val(Number(HUpLimit) - Number(HTargetVal)) //涓婂亸宸�
+                    $("#HUpOffSet").val((Number(HUpLimit) - Number(HTargetVal)).toFixed(HResDec)) //涓婂亸宸�
                     Qualified(HComparator, HEntryID, HAnalysisMethod);  //鍒ゆ柇鏄惁鍚堟牸
                 }
             })
@@ -2709,13 +2449,14 @@
                 var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
                 var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
                 var HComparator = $("#HComparator").val(); //姣旇緝绗�
+                var HResDec = $("#HResDec").val(); //淇濈暀灏忔暟浣�
                 //====================璧嬪��/浼犲��===========================
                 var HTargetVal = $("#HTargetVal").val();//鐩爣鍊�
                 var HDownLimit = $("#HDownLimit").val();//涓嬮檺鍊�
 
                 //瀹氶噺鍒嗘瀽
                 if (HAnalysisMethod == 2) {
-                    $("#HDownOffSet").val(Number(HDownLimit) - Number(HTargetVal)) //涓嬪亸宸�
+                    $("#HDownOffSet").val((Number(HDownLimit) - Number(HTargetVal)).toFixed(HResDec)) //涓嬪亸宸�
                     Qualified(HComparator, HEntryID, HAnalysisMethod);  //鍒ゆ柇鏄惁鍚堟牸
                 }
             })
@@ -2725,13 +2466,14 @@
                 var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
                 var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
                 var HComparator = $("#HComparator").val(); //姣旇緝绗�
+                var HResDec = $("#HResDec").val(); //淇濈暀灏忔暟浣�
                 //====================璧嬪��/浼犲��===========================
                 var HTargetVal = $("#HTargetVal").val();//鐩爣鍊�
                 var HUpOffSet = $("#HUpOffSet").val();//涓婂亸宸�
 
                 //瀹氶噺鍒嗘瀽
                 if (HAnalysisMethod == 2) {
-                    $("#HUpLimit").val(Number(HUpOffSet) + Number(HTargetVal)) //涓婇檺鍊�
+                    $("#HUpLimit").val((Number(HUpOffSet) + Number(HTargetVal)).toFixed(HResDec)) //涓婇檺鍊�
                     Qualified(HComparator, HEntryID, HAnalysisMethod);  //鍒ゆ柇鏄惁鍚堟牸
                 }
             })
@@ -2741,6 +2483,7 @@
                 var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
                 var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
                 var HComparator = $("#HComparator").val(); //姣旇緝绗�
+                var HResDec = $("#HResDec").val(); //淇濈暀灏忔暟浣�
                 //====================璧嬪��/浼犲��===========================
                 var HTargetVal = $("#HTargetVal").val();//鐩爣鍊�
                 var HDownOffSet = $("#HDownOffSet").val();//涓嬪亸宸�
@@ -2748,7 +2491,7 @@
                 //瀹氶噺鍒嗘瀽
                 if (HAnalysisMethod == 2) {
                     Qualified(HComparator, HEntryID, HAnalysisMethod);  //鍒ゆ柇鏄惁鍚堟牸
-                    $("#HDownLimit").val(Number(HDownOffSet) + Number(HTargetVal)) //涓嬮檺鍊�
+                    $("#HDownLimit").val((Number(HDownOffSet) + Number(HTargetVal)).toFixed(HResDec)) //涓嬮檺鍊�
                 }
             })
 
@@ -2774,8 +2517,10 @@
                             case '=':
                                 if (HInspectVal == HTargetVal && Number(HAcceptQty) >= Number(UnRightQty_isFied)) { //鍒ゆ柇妫�楠屽�硷紝鐩爣鍊兼槸鍚︾浉绛�
                                     $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
                                 } else {
                                     $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
                                 }
                                 break;
                             default: break;
@@ -2787,8 +2532,10 @@
                             case '=':
                                 if (HInspectVal == HTargetVal && Number(HAcceptQty) >= Number(UnRightQty_isFied)) { //鍒ゆ柇妫�楠屽�硷紝鐩爣鍊兼槸鍚︾浉绛�
                                     $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
                                 } else {
                                     $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
                                 }
                                 break;
                             default: break;
@@ -2807,56 +2554,70 @@
                                 //涓婇檺鍊间笉涓�0锛屾楠屽��=鐩爣鍊�&&涓婇檺鍊�>=鐩爣鍊�&&涓嬮檺鍊�<=鐩爣鍊� 鍒ゅ畾鍚堟牸
                                 if (((Number(HInspectVal) <= Number(HUpLimit) && Number(HInspectVal) >= Number(HDownLimit)) || Number(HUpLimit) == 0) && Number(HInspectVal) == Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
                                     $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
                                 } else {
                                     $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
                                 }
                                 break;
                             case '>':
                                 //姣旇緝绗︿负'>'涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽��>涓婇檺鍊煎垽瀹氬悎鏍硷紝鍚﹀垯涓嶅悎鏍�
                                 if (Number(HInspectVal) > Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
                                     $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
                                 } else {
                                     $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
                                 }
                                 break;
                             case '>=':
                                 //姣旇緝绗︿负'>='涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽��>=涓婇檺鍊煎垽瀹氬悎鏍硷紝鍚﹀垯涓嶅悎鏍�
                                 if (Number(HInspectVal) >= Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
                                     $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
                                 } else {
                                     $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
                                 }
                                 break;
                             case '<':
                                 //姣旇緝绗︿负'<'涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽��<涓婇檺鍊煎垽瀹氬悎鏍硷紝鍚﹀垯涓嶅悎鏍�
                                 if (Number(HInspectVal) < Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
                                     $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
                                 } else {
                                     $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
                                 }
                                 break;
                             case '<=':
                                 //姣旇緝绗︿负'<='涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽��<=涓婇檺鍊煎垽瀹氬悎鏍硷紝鍚﹀垯涓嶅悎鏍�
                                 if (Number(HInspectVal) <= Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
                                     $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
                                 } else {
                                     $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
                                 }
                                 break
                             case '<>':
                                 //姣旇緝绗︿负'<>'涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽��<>涓婇檺鍊煎垽瀹氬悎鏍硷紝鍚﹀垯涓嶅悎鏍�
                                 if ((Number(HInspectVal) < Number(HTargetVal) || Number(HInspectVal) > Number(HTargetVal)) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
                                     $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
                                 } else {
                                     $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
                                 }
                                 break;
                             case 'between':
                                 //姣旇緝绗︿负'between'涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽�煎湪涓嬮檺鍊间笌涓婇檺鍊间箣闂村垽瀹氬悎鏍硷紝鍚﹀垯涓嶅悎鏍�
                                 if ((Number(HInspectVal) >= Number(HDownLimit) || Number(HInspectVal) <= Number(HUpLimit)) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
                                     $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
                                 } else {
                                     $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
                                 }
                                 break;
                             default: break;
@@ -2870,56 +2631,70 @@
                                 //涓婇檺鍊间笉涓�0锛屾楠屽��=鐩爣鍊�&&涓婇檺鍊�>=鐩爣鍊�&&涓嬮檺鍊�<=鐩爣鍊� 鍒ゅ畾涓嶅悎鏍�
                                 if (((Number(HInspectVal) <= Number(HUpLimit) && Number(HInspectVal) >= Number(HDownLimit)) || Number(HUpLimit) == 0) && Number(HInspectVal) == Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
                                     $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
                                 } else {
                                     $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
                                 }
                                 break;
                             case '>':
                                 //姣旇緝绗︿负'>'涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽��>涓婇檺鍊煎垽瀹氫笉鍚堟牸锛屽惁鍒欏悎鏍�
                                 if (Number(HInspectVal) > Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
                                     $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
                                 } else {
                                     $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
                                 }
                                 break;
                             case '>=':
                                 //姣旇緝绗︿负'>='涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽��>=涓婇檺鍊煎垽瀹氫笉鍚堟牸锛屽惁鍒欏悎鏍�
                                 if (Number(HInspectVal) >= Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
                                     $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
                                 } else {
                                     $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
                                 }
                                 break;
                             case '<':
                                 //姣旇緝绗︿负'<'涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽��<涓婇檺鍊煎垽瀹氫笉鍚堟牸锛屽惁鍒欏悎鏍�
                                 if (Number(HInspectVal) < Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
                                     $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
                                 } else {
                                     $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
                                 }
                                 break;
                             case '<=':
                                 //姣旇緝绗︿负'<='涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽��<=涓婇檺鍊煎垽瀹氫笉鍚堟牸锛屽惁鍒欏悎鏍�
                                 if (Number(HInspectVal) <= Number(HTargetVal) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
                                     $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
                                 } else {
                                     $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
                                 }
                                 break
                             case '<>':
                                 //姣旇緝绗︿负'<>'涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽��<>涓婇檺鍊煎垽瀹氫笉鍚堟牸锛屽惁鍒欏悎鏍�
                                 if ((Number(HInspectVal) < Number(HTargetVal) || Number(HInspectVal) > Number(HTargetVal)) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
                                     $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
                                 } else {
                                     $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
                                 }
                                 break;
                             case 'between':
                                 //姣旇緝绗︿负'between'涓旂姸鎬佷负涓嶅悎鏍兼椂锛屽鏋滄楠屽�煎湪涓嬮檺鍊间笌涓婇檺鍊间箣闂村垽瀹氫笉鍚堟牸锛屽惁鍒欏悎鏍�
                                 if ((Number(HInspectVal) >= Number(HDownLimit) || Number(HInspectVal) <= Number(HUpLimit)) && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
                                     $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
                                 } else {
                                     $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
                                 }
                                 break;
                             default: break;
@@ -2936,8 +2711,10 @@
                                 //姣旇緝绗︿负'='涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽�煎唴瀹逛笌鐩爣鍊煎唴瀹逛竴鑷村垽瀹氬悎鏍硷紝
                                 if (HInspectVal.toString() == HTargetVal.toString() && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
                                     $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
                                 } else {
                                     $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
                                 }
                                 break;
                             default: break;
@@ -2949,8 +2726,10 @@
                                 //姣旇緝绗︿负'='涓旂姸鎬佷负鍚堟牸鏃讹紝濡傛灉妫�楠屽�煎唴瀹逛笌鐩爣鍊煎唴瀹逛竴鑷村垽瀹氫笉鍚堟牸锛�
                                 if (HInspectVal.toString() == HTargetVal.toString() && Number(HAcceptQty) >= Number(UnRightQty_isFied)) {
                                     $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                                    table.cache["mainTable"][HEntryID].HResult = 2
                                 } else {
                                     $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                                    table.cache["mainTable"][HEntryID].HResult = 1
                                 }
                                 break;
                             default: break;
@@ -3265,6 +3044,282 @@
             }
             //#endregion
 
+            //鑾峰彇涓嶅悎鏍兼暟鎬绘暟
+            function addUnRightQty() {
+                //寰幆妫�楠屽�艰〃鏍兼暟鎹紝鑾峰彇涓嶅悎鏍兼暟閲�
+                var HValueTable = table.cache["ValueTable"];
+                var UnRightQty = 0;//妫�楠屽�艰〃鏍间笉鍚堟牸鏁伴噺姹囨��
+
+                for (let i = 0; i < HValueTable.length; i++) {
+                    if (HValueTable[i].HInSpectResult == 2) {
+                        UnRightQty++;
+                    }
+                }
+                UnRightQty_isFied = UnRightQty;
+                $("#HSampleUnRightQty").val(UnRightQty);
+                $("#HSampleUnRightQty2").val(UnRightQty);
+                var HAcceptQty = $("#HAcceptQty").val();//鍏佽鏁�
+                var HEntryID = $("#HEntryID").val() - 1;//鏁扮粍涓嬫爣
+                if (UnRightQty > HAcceptQty) {
+                    $("#HResult" + (Number(HEntryID) + Number(1))).val(2); //涓嶅悎鏍�
+                    $("#HInspectResultToSee").val('涓嶅悎鏍�');
+                    $("#HInspectResultToSee2").val('涓嶅悎鏍�');
+                    $("#HInspectResultToSee").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                    $("#HInspectResultToSee2").css("background-color", "#F0D6E3");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                } else {
+                    $("#HResult" + (Number(HEntryID) + Number(1))).val(1); //鍚堟牸
+                    $("#HInspectResultToSee").val('鍚堟牸');
+                    $("#HInspectResultToSee2").val('鍚堟牸');
+                    $("#HInspectResultToSee").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                    $("#HInspectResultToSee2").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
+                }
+                form.render('select');
+                LastResult();
+            }
+
+            //妫�楠屽�艰嚜鍔ㄥ垽鏂槸鍚﹀悎鏍�
+            function Qualified_Value(HComparator, MBValue, value, obj) {
+                var HUpLimit = $("#HUpLimit").val(); //涓婇檺鍊�
+                var HDownLimit = $("#HDownLimit").val(); //涓嬮檺鍊�
+                var HStatus = $("#HStatus").val() //鐘舵��
+
+                if (HStatus == 1) {
+                    switch (HComparator) {
+                        case "=":
+                            if (Number(value) == Number(MBValue)) { //鍏朵粬妫�娴嬪�� = 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+                                obj.update({
+                                    HInSpectResult: 1
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+                            } else {
+                                obj.update({
+                                    HInSpectResult: 2
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+                            }
+                            break;
+                        case ">":
+                            if (Number(value) > Number(MBValue)) { //鍏朵粬妫�娴嬪�� > 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+                                obj.update({
+                                    HInSpectResult: 1
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+                            } else {
+                                obj.update({
+                                    HInSpectResult: 2
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+                            }
+                            break;
+                        case ">=":
+                            if (Number(value) >= Number(MBValue)) { //鍏朵粬妫�娴嬪�� >= 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+                                obj.update({
+                                    HInSpectResult: 1
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+                            } else {
+                                obj.update({
+                                    HInSpectResult: 2
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+                            }
+                            break;
+                        case "<":
+                            if (Number(value) < Number(MBValue)) { //鍏朵粬妫�娴嬪�� < 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+                                obj.update({
+                                    HInSpectResult: 1
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+                            } else {
+                                obj.update({
+                                    HInSpectResult: 2
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+                            }
+                            break;
+                        case "<=":
+                            if (Number(value) <= Number(MBValue)) { //鍏朵粬妫�娴嬪�� <= 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+                                obj.update({
+                                    HInSpectResult: 1
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+                            } else {
+                                obj.update({
+                                    HInSpectResult: 2
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+                            }
+                            break;
+                        case "<>":
+                            if (Number(value) < Number(MBValue) || Number(value) > Number(MBValue)) { //鍏朵粬妫�娴嬪�� <> 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+                                obj.update({
+                                    HInSpectResult: 1
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+                            } else {
+                                obj.update({
+                                    HInSpectResult: 2
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+                            }
+                            break;
+                        case "between":
+                            if (Number(value) >= Number(HDownLimit) && Number(value) <= Number(HUpLimit)) { //鍏朵粬妫�娴嬪�� between 涓婁笅闄愬�硷紝鍒ゅ畾鍚堟牸
+                                obj.update({
+                                    HInSpectResult: 1
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+                            } else {
+                                obj.update({
+                                    HInSpectResult: 2
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+                            }
+                            break;
+                    }
+                } else {
+                    switch (HComparator) {
+                        case "=":
+                            if (Number(value) == Number(MBValue)) { //鍏朵粬妫�娴嬪�� = 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+                                obj.update({
+                                    HInSpectResult: 2
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+                            } else {
+                                obj.update({
+                                    HInSpectResult: 1
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+                            }
+                            break;
+                        case ">":
+                            if (Number(value) > Number(MBValue)) { //鍏朵粬妫�娴嬪�� > 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+                                obj.update({
+                                    HInSpectResult: 2
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+                            } else {
+                                obj.update({
+                                    HInSpectResult: 1
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+                            }
+                            break;
+                        case ">=":
+                            if (Number(value) >= Number(MBValue)) { //鍏朵粬妫�娴嬪�� >= 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+                                obj.update({
+                                    HInSpectResult: 2
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+                            } else {
+                                obj.update({
+                                    HInSpectResult: 1
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+                            }
+                            break;
+                        case "<":
+                            if (Number(value) < Number(MBValue)) { //鍏朵粬妫�娴嬪�� < 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+                                obj.update({
+                                    HInSpectResult: 2
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+                            } else {
+                                obj.update({
+                                    HInSpectResult: 1
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+                            }
+                            break;
+                        case "<=":
+                            if (Number(value) <= Number(MBValue)) { //鍏朵粬妫�娴嬪�� <= 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+                                obj.update({
+                                    HInSpectResult: 2
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+                            } else {
+                                obj.update({
+                                    HInSpectResult: 1
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+                            }
+                            break;
+                        case "<>":
+                            if (Number(value) < Number(MBValue) || Number(value) > Number(MBValue)) { //鍏朵粬妫�娴嬪�� <> 鐩爣鍊硷紝鍒ゅ畾鍚堟牸
+                                obj.update({
+                                    HInSpectResult: 2
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+                            } else {
+                                obj.update({
+                                    HInSpectResult: 1
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+                            }
+                            break;
+                        case "between":
+                            if (Number(value) >= Number(HDownLimit) && Number(value) <= Number(HUpLimit)) { //鍏朵粬妫�娴嬪�� between 涓婁笅闄愬�硷紝鍒ゅ畾鍚堟牸
+                                obj.update({
+                                    HInSpectResult: 2
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(2)
+                            } else {
+                                obj.update({
+                                    HInSpectResult: 1
+                                });
+                                $("#HInSpectResult" + (obj.data.HSEQ)).val(1)
+                            }
+                            break;
+                    }
+                }
+
+
+                form.render('select');
+            }
+
+            //妫�楠屽�间繚瀛�
+            function set_SaveValue(dataindex) {
+                for (let i = 0; i < table.cache['ValueTable'].length; i++) {
+                    if (table.cache['ValueTable'][i].HInSpectValueB == "") {
+                        table.cache['ValueTable'][i].HInSpectValueB = 0
+                    }
+                    if (table.cache['ValueTable'][i].HInSpectValueT == "") {
+                        table.cache['ValueTable'][i].HInSpectValueT = 0
+                    }
+                    if (table.cache['ValueTable'][i].HInSpectValue == "") {
+                        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) {
+                            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: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+
             //#region銆愰殣钘忔娴嬪�煎瓧娈点��
             function IsHide(HAnalysisMethod_Value) {
                 if (HAnalysisMethod_Value == 1) { //濡傛灉閫変腑銆愬畾鎬у垎鏋愩�戯紝鍒欓殣钘忓畾閲忋�佸叾浠栧垎鏋�
@@ -3358,6 +3413,8 @@
                 layui.each(table.cache.mainTable, function (i, l) {
                     if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                         l.LAY_CHECKED = flag;
+                    } else {
+                        l.LAY_CHECKED = false;
                     }
                 });
                 for (var i = 0; i < option.data.length; i++) {
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html"
index 7d5241e..6574668 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html"
@@ -83,6 +83,7 @@
     <script>
         var _cur_page = 1;
         var sql = " ";
+        var titleData = ["hmainid", "hentryid", "HEntryID", "HSourceID", "HMaterID", "HFirstCheckEmp", "HQCCheckItemID", "HUnitID", "HSampleSchemeID"];
         //var options = document.getElementById('HStatus').children;
         function getUrlVars() {
             var vars = [], hash;
@@ -286,41 +287,105 @@
             });
 
             ///鍔犺浇鏄剧ず鏁版嵁
+            //function RoadHBillNo(sqlWhere) {
+            //    where = sqlWhere;
+            //    var index0 = layer.load();
+            //    $.ajax({
+            //        type: "get",
+            //        url: GetWEBURL() +"/QC_Management/MES_QC_FirstPieceCheckBillList_Json",
+            //        async: true,
+            //        data: { "sqlWhere": sqlWhere, "user": sessionStorage["HUserName"] },//"HSupNo": sessionStorage["HUserName"],
+            //        success: function (result) {
+            //            if (result.count == 1) {
+            //            ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
+            //            table.reload('mainTable', {
+            //                data: ajaxReturnData
+            //                , height: 'full-10'
+            //                , page: {
+            //                    curr: _cur_page //蹇呴』浠庣 1 椤靛紑濮�
+            //                }
+            //                , loading: false
+            //                , done: function (index, res) {
+
+            //                }
+            //            });
+            //            layer.close(index0);
+            //        } else {
+            //                layer.close(index0);
+            //                layer.alert(result.code + result.Message, { icon: 5 });
+            //        }
+
+            //        },
+            //        error: function (result) {
+            //            layer.close(index0);
+            //        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+            //        }
+            //    });
+            //};
+
+            // 鏌ヨ
             function RoadHBillNo(sqlWhere) {
-                where = sqlWhere;
-                var index0 = layer.load();
+                var ajaxLoad = layer.load();
                 $.ajax({
-                    type: "get",
-                    url: GetWEBURL() +"/QC_Management/MES_QC_FirstPieceCheckBillList_Json",
-                    async: true,
-                    data: { "sqlWhere": sqlWhere, "user": sessionStorage["HUserName"] },//"HSupNo": sessionStorage["HUserName"],
-                    success: function (result) {
-                        if (result.count == 1) {
-                        ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
-                        table.reload('mainTable', {
-                            data: ajaxReturnData
-                            , height: 'full-10'
-                            , page: {
-                                curr: _cur_page //蹇呴』浠庣 1 椤靛紑濮�
-                            }
-                            , loading: false
-                            , done: function (index, res) {
+                    url: GetWEBURL() + '/QC_FirstPieceCheckBill/QC_FirstPieceCheckBillList',
+                    type: "GET",
+                    data: { "sWhere": sqlWhere, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            layer.close(ajaxLoad);
 
+                            var data = [];
+                            var col = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                             }
-                        });
-                        layer.close(index0);
-                    } else {
-                            layer.close(index0);
-                            layer.alert(result.code + result.Message, { icon: 5 });
-                    }
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left' });
+                            for (var i = 0; i < data.length; i++) {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                    }
+                                }
+                            }
+                            option = {
+                                elem: '#mainTable'
+                                , toolbar: '#toolbarDemo'
+                                , height: 'full-50'
+                                , page: true //寮�鍚垎椤�
+                                , limit: 500
+                                , limits: [500, 2000, 5000, 20000]
+                                , cols: [col]
+                                , data: data1.data
+                            };
+                            //鍒濆鍖栬〃鏍�
+                            DisPlay_HideColumn();
+                            table.render(option);
 
-                    },
-                    error: function (result) {
-                        layer.close(index0);
-                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            //if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                            //    ColFilter();
+                            //}
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.msg(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
-            };
+
+            }
+
             form.on('submit(f_Query)', function (data) {//鏌ヨ
                 var sqlWhere = " and 1=1 ";
                 //if ($("#HStatus").val() != "")
@@ -495,12 +560,14 @@
 
 
                             var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
-                            var titleData = ["hmainid", "hsubid", "浣滃簾浜�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+                            var titleData = ["hmainid", "hentryid", "HEntryID", "HSourceID", "HMaterID", "HFirstCheckEmp", "HQCCheckItemID", "HUnitID", "HSampleSchemeID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
 
                             dataCol = data1.data[0].HGridString.split(',');
 
                             for (var i = 0; i < option.cols[0].length - 2; i++) {
-                                var dataCols = dataCol[i].split('|');
+                                if (dataCol[i]) {
+                                    var dataCols = dataCol[i].split('|');
+                                }
                                 //闅愯棌鍒�
                                 if (dataCols[1] == 1) {
                                     option.cols[0][i + 1]["hide"] = true;

--
Gitblit v1.9.1