From 39cacad489a269c9ea7cd6ff9d055734bb4108c2 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期四, 10 十月 2024 13:24:35 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckOtherill.html |   14 +
 WebTM/views/车间管理/单品过站/Cj_ProcessItemBGA.html                    |    4 
 WebTM/views/质量管理/质量报表/QC_InspectionFormReport.html              |    4 
 WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeArrangement_PG.html    |    6 
 WebTM/views/质量管理/检验方案单/QC_CheckProjectList.html                 |   14 +
 WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html          |    2 
 WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html              |   13 +
 WebTM/views/质量管理/车间自检单/QC_Add_Edit_WorkSelfCheckBill.html       |   97 +++++++++++++
 WebTM/views/车间管理/单品过站/Cj_CollectionOfSingleProductDefects.html  |    4 
 WebTM/views/车间管理/单品过站/Cj_ProcessItemStationPlatform.html        |    4 
 WebTM/views/质量管理/首件检验单/QC_FirstPieceCheckBillList2.html         |    3 
 WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html                 |   15 +
 WebTM/views/工资管理/考勤汇报单/Pay_WorkTimesBillEdit.html               |  128 +++++++++++++++++
 WebTM/views/质量管理/库存检验单/QC_Add_Edit_StockCheckBill.html          |    8 
 WebTM/views/车间管理/工序进站接收单/Cj_StationInBill.html                  |   42 ------
 WebTM/layuiadmin/Scripts/webConfig.js                           |    2 
 WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html     |   26 ++-
 17 files changed, 289 insertions(+), 97 deletions(-)

diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index ab0e759..75b6582 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -8,7 +8,7 @@
     //var WEBURL = "http://localhost:8082/API/";    //鏉滆春鏈湴閰嶇疆
     /*var WEBURL = "http://localhost/API/";*/    //娼樻禉娓告湰鍦伴厤缃�  
     //var WEBURL = "http://localhost:8082/API/";    //寮犵憺骞挎湰鍦伴厤缃�
-    var WEBURL = "http://localhost:81/API/"    //缈佹稕娑涙湰鍦伴厤缃�
+    //var WEBURL = "http://localhost:81/API/"    //缈佹稕娑涙湰鍦伴厤缃�
     //var WEBURL = "http://47.96.97.237/API/";          //鏅轰簯鏈嶅姟鍣�
     /*var WEBURL = "http://localhost:8082/LuBaoAPI/"; */  //浣欐�濇澃鏈湴閰嶇疆
     //var WEBURL = "http://localhost:8088/ARAPI/";      //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillEdit.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillEdit.html"
index 69e4d7d..6932d0f 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillEdit.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillEdit.html"
@@ -446,10 +446,10 @@
                         , { field: 'HEmpID', title: 'HEmpID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
                         , { field: 'HEmpNumber', title: '鑱屽憳浠ｇ爜', width: 100, edit: 'text', event: "HEmpNumber" }                 //F7
                         , { field: 'HEmpName', title: '鑱屽憳鍚嶇О', width: 100, style: 'background-color:#efefef4d;' }
-                        , { field: 'HEmpRate', title: '鑱屽憳绯绘暟', width: 100, edit: 'text' }
+                        , { field: 'HEmpRate', title: '鑱屽憳绯绘暟', width: 100, edit: 'text', event: "HEmpRate" }
                         , { field: 'HAMTimes', title: '涓婂崍宸ユ椂', width: 100, edit: 'text', totalRow: true }
                         , { field: 'HPMTimes', title: '涓嬪崍宸ユ椂', width: 100, edit: 'text', totalRow: true }
-                        , { field: 'HBaseTimes', title: '鍩烘湰宸ユ椂', width: 100, edit: 'text', totalRow: true }
+                        , { field: 'HBaseTimes', title: '鍩烘湰宸ユ椂', width: 100, edit: 'text', totalRow: true, event: "HBaseTimes" }
                         , { field: 'HBaseDays', title: '鍩烘湰澶╂暟', width: 100, edit: 'text', totalRow: true }
                         , { field: 'HOverTimes', title: '鍔犵彮宸ユ椂', width: 100, edit: 'text', totalRow: true }
                         , { field: 'HOverDays', title: '鍔犵彮澶╂暟', width: 100, edit: 'text', totalRow: true }
@@ -1189,9 +1189,93 @@
                                 }
                             })
                         }
+                        //obj.event = "";
+                        return false;
+                    }
+
+
+                    //#region 鎵归噺濉厖
+                    //鏁板�兼牸寮忔牎楠屽伐鍏�
+                    var ref = /^\d+(\.\d+)?$/;          //闈炶礋鏁版鍒欒〃杈惧紡
+                    var temp = "";
+                    //鎿嶄綔琛岀储寮�
+                    var rowIndex = $(obj.tr).attr("data-index");
+
+                    if (event.key == "F6") {
+                        //鑱屽憳绯绘暟
+                        if (obj.event == "HEmpRate") {
+                            var oldText = table.cache["mainTable"][rowIndex].HEmpRate;
+                            var value = e.target.value; //寰楀埌淇敼鍚庣殑鍊�
+
+                            //鏁版嵁鏍煎紡鏍￠獙
+                            temp = value + "";
+                            if (!ref.test(temp) || temp == 0) {
+                                //鎭㈠鏁版嵁鍒扮紪杈戝墠
+                                option.data[rowIndex].HEmpRate = oldText;
+                                table.render(option);
+                                //鍒锋柊璁剧疆澶嶉�夋鐘舵��
+                                CheckedSet_tableSub();
+
+                                layer.msg("鎵�杈撳叆鍊煎繀椤讳负澶т簬0鐨勬暟瀛�!");
+                                return;
+                            }
+
+
+                            for (var i = rowIndex * 1; i < option.data.length; i++) {
+                                //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+                                var HEmpRate = isNaN(value) ? 0 : value * 1;    //鑱屽憳绯绘暟
+
+                                //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                option.data[i].HEmpRate = HEmpRate;
+                            }
+                            table.render(option);
+                            //鍒锋柊璁剧疆澶嶉�夋鐘舵��
+                            CheckedSet_tableSub();
+                        }
+
+                        //鍩烘湰宸ユ椂
+                        if (obj.event == "HBaseTimes") {
+                            var oldText = table.cache["mainTable"][rowIndex].HBaseTimes;
+                            var value = e.target.value; //寰楀埌淇敼鍚庣殑鍊�
+
+                            //鏁版嵁鏍煎紡鏍￠獙
+                            temp = value + "";
+                            if (!ref.test(temp) || temp == 0) {
+                                //鎭㈠鏁版嵁鍒扮紪杈戝墠
+                                option.data[rowIndex].HBaseTimes = oldText;
+                                table.render(option);
+                                //鍒锋柊璁剧疆澶嶉�夋鐘舵��
+                                CheckedSet_tableSub();
+
+                                layer.msg("鎵�杈撳叆鍊煎繀椤讳负澶т簬0鐨勬暟瀛�!");
+                                return;
+                            }
+
+
+                            for (var i = rowIndex * 1; i < option.data.length; i++) {
+                                //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+                                var HBaseTimes = isNaN(value) ? 0 : value * 1;                                  //鍩烘湰宸ユ椂
+                                var HAMTimes = HBaseTimes / 2;                                                  //涓婂崍宸ユ椂
+                                var HPMTimes = HBaseTimes / 2;                                                  //涓嬪崍宸ユ椂
+                                var HPayMoney = isNaN(option.data[i].HPayMoney) ? 0 : option.data[i].HPayMoney; //灏忔椂宸ヨ祫
+                                var HMoney = HPayMoney * HBaseTimes;                                            //宸ヨ祫=灏忔椂宸ヨ祫*鍩烘湰宸ユ椂
+
+                                //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                option.data[i].HBaseTimes = HBaseTimes;
+                                option.data[i].HAMTimes = HAMTimes;
+                                option.data[i].HPMTimes = HPMTimes;
+                                option.data[i].HMoney = HMoney;
+                            }
+                            table.render(option);
+                            //鍒锋柊璁剧疆澶嶉�夋鐘舵��
+                            CheckedSet_tableSub();
+                        }
+
                         obj.event = "";
                         return false;
                     }
+
+                    //#endregion
                 })
             }
             //#endregion
@@ -1227,7 +1311,7 @@
                         }
 
                         //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
-                        var HAMTimes = isNaN(value) ? 0 : value;                            //涓婂崍宸ユ椂
+                        var HAMTimes = isNaN(value) ? 0 : value * 1;                        //涓婂崍宸ユ椂
                         var HPMTimes = isNaN(obj.data.HPMTimes) ? 0 : obj.data.HPMTimes;    //涓嬪崍宸ユ椂
                         var HBaseTimes = Number(HPMTimes) + Number(HAMTimes);               //鍩烘湰宸ユ椂=涓婂崍宸ユ椂+涓嬪崍宸ユ椂
                         var HPayMoney = isNaN(obj.data.HPayMoney) ? 0 : obj.data.HPayMoney; //灏忔椂宸ヨ祫
@@ -1260,7 +1344,7 @@
                         }
 
                         //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
-                        var HPMTimes = isNaN(value) ? 0 : value;                            //涓嬪崍宸ユ椂
+                        var HPMTimes = isNaN(value) ? 0 : value * 1;                        //涓嬪崍宸ユ椂
                         var HAMTimes = isNaN(obj.data.HAMTimes) ? 0 : obj.data.HAMTimes;    //涓婂崍宸ユ椂
                         var HBaseTimes = Number(HPMTimes) + Number(HAMTimes);               //鍩烘湰宸ユ椂=涓婂崍宸ユ椂+涓嬪崍宸ユ椂
                         var HPayMoney = isNaN(obj.data.HPayMoney) ? 0 : obj.data.HPayMoney; //灏忔椂宸ヨ祫
@@ -1270,6 +1354,40 @@
                         obj.update({
                             HPMTimes: HPMTimes
                             , HBaseTimes: HBaseTimes
+                            , HMoney: HMoney
+                        });
+                        table.render(option);
+                        //鍒锋柊璁剧疆澶嶉�夋鐘舵��
+                        CheckedSet_tableSub();
+                        break;
+                    case "HBaseTimes":        //鍩烘湰宸ユ椂
+                        //鏁版嵁鏍煎紡鏍￠獙
+                        temp = value + "";
+                        if (!ref.test(temp) || temp == 0) {
+                            //鎭㈠鏁版嵁鍒扮紪杈戝墠
+                            obj.update({
+                                HBaseTimes: oldText
+                            });
+                            table.render(option);
+                            //鍒锋柊璁剧疆澶嶉�夋鐘舵��
+                            CheckedSet_tableSub();
+
+                            layer.msg("鎵�杈撳叆鍊煎繀椤讳负澶т簬0鐨勬暟瀛�!");
+                            return;
+                        }
+
+                        //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
+                        var HBaseTimes = isNaN(value) ? 0 : value * 1;                      //鍩烘湰宸ユ椂
+                        var HAMTimes = HBaseTimes / 2;                                      //涓婂崍宸ユ椂
+                        var HPMTimes = HBaseTimes / 2;                                      //涓嬪崍宸ユ椂
+                        var HPayMoney = isNaN(obj.data.HPayMoney) ? 0 : obj.data.HPayMoney; //灏忔椂宸ヨ祫
+                        var HMoney = HPayMoney * HBaseTimes;                                //宸ヨ祫=灏忔椂宸ヨ祫*鍩烘湰宸ユ椂
+
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.update({
+                            HBaseTimes: HBaseTimes
+                            , HAMTimes: HAMTimes
+                            , HPMTimes: HPMTimes
                             , HMoney: HMoney
                         });
                         table.render(option);
@@ -1293,7 +1411,7 @@
                         }
 
                         //鏁版嵁鏍￠獙鍚堟牸锛岄噸绠楄褰�
-                        var HPayMoney = isNaN(value) ? 0 : value;                               //灏忔椂宸ヨ祫
+                        var HPayMoney = isNaN(value) ? 0 : value * 1;                           //灏忔椂宸ヨ祫
                         var HBaseTimes = isNaN(obj.data.HBaseTimes) ? 0 : obj.data.HBaseTimes;  //鍩烘湰宸ユ椂
                         var HMoney = HPayMoney * HBaseTimes;                                    //宸ヨ祫=灏忔椂宸ヨ祫*鍩烘湰宸ユ椂
 
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html"
index c9398b6..25358d6 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html"
@@ -211,8 +211,8 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label">鍒ゆ柇缁撹</label>
                                             <div class="layui-input-block">
-                                                <input type="radio" name="HLastResult" id="HLastResult" value="true" title="鍚堟牸" checked>
-                                                <input type="radio" name="HLastResult" id="HLastResult" value="false" title="涓嶅悎鏍�">
+                                                <input type="radio" name="HLastResult" id="HLastResult" value="true" title="鍚堟牸" >
+                                                <input type="radio" name="HLastResult" id="HLastResult" value="false" title="涓嶅悎鏍�" checked>
                                             </div>
                                         </div>
                                         <div class="layui-inline" id="hidediv1">
@@ -1526,6 +1526,8 @@
                                 , "HBatchNo": data.鎵瑰彿
                                 , "HTakeSampleCheckBillID": data.HTakeSampleCheckBillID
                                 , "HTakeSampleCheckBillNo": data.HTakeSampleCheckBillNo
+                                , "HProcID": data.HProcID   
+                                , "HProcName": data.HProcName
                             });
                             $("input[name=HLastResult][value=true]").prop("checked", data.鍒ゅ畾缁撹 === "鍚堟牸");
                             $("input[name=HLastResult][value=false]").prop("checked", data.鍒ゅ畾缁撹 === "涓嶅悎鏍�");
@@ -1864,7 +1866,7 @@
                                     {
                                         "HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩唬鐮�": data[i].妫�楠岄」鐩唬鐮�, "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "妫�楠屼华鍣�": data[i]["妫�楠屼华鍣�"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["鍗曚綅鍚嶇О"], "HQCNote": "", "HAnalysisMethod": data[i]["鍒嗘瀽鏂规硶"], "HResult": data[i]["榛樿缁撹"],
                                         "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": data[i]["閲嶇偣妫�鏌�"] == 1 ? true : false, "HStatus": 0, "HSampleSchemeID": data[i]["HSampleSchemeID"] == null ? 0 : data[i]["HSampleSchemeID"], "HUnitID": data[i]["HUnitID"],
-                                        "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
+                                        "HInspectVal": '', "HTargetVal": '', "HUpLimit": + data[i].涓婇檺鍊�, "HDownLimit": + data[i].涓嬮檺鍊�, "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
                                         "HSampleSchemeName": data[i].鎶芥牱鏂规鍚嶇О, "HSampleQty": data[i].鏍锋湰閲�, "HAcceptQty": data[i].鍏佽鏁� == null ? 0 : data[i].鍏佽鏁�, "HInspectionLevel": data[i].妫�楠屾按骞�, "HRejectQty": data[i].鎷掔粷鏁� == null ? 0 : data[i].鎷掔粷鏁�,
                                         "HStrictness": data[i].涓ユ牸搴�, "HSampleUnRightQty": "0", "HAQL": data[i].AQL, "HSamplingType": data[i].鎶芥牱绫诲瀷
                                     }
@@ -2270,7 +2272,7 @@
                         , { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
                         , { field: 'HUnit', title: '鍗曚綅', edit: 'text' }
                         , { field: 'HQCNote', title: '妫�楠岃褰�', edit: 'text' }
-                        , { field: 'HInspectVal', title: '妫�楠屽��' }
+                        , { field: 'HInspectVal', title: '妫�楠屽��', edit: 'text' }
                         , { field: 'HUpLimit', title: '涓婇檺鍊�' }
                         , { field: 'HDownLimit', title: '涓嬮檺鍊�'  }
                         , { field: 'HMax', title: '鏈�澶у��', edit: 'text', totalRow: true }
@@ -2409,10 +2411,10 @@
                 }
                 if (HQty > 0) {
                     document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
-                    $("input:radio[name=HLastResult][value=" + false + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+                    $("input:radio[name=HLastResult][value=" + false + "]").prop("checked", "true"); //娣诲姞閫夋嫨灞炴��
                 } else {
                     document.querySelectorAll("[name='HLastResult']")[1].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
-                    $("input:radio[name=HLastResult][value=" + true + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+                    $("input:radio[name=HLastResult][value=" + true + "]").prop("checked", "true"); //娣诲姞閫夋嫨灞炴��
                 }
                 form.render('radio');
             }           
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 7fc76a5..954c58f 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"
@@ -208,8 +208,8 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label">鍒ゆ柇缁撹</label>
                                             <div class="layui-input-block">
-                                                <input type="radio" name="HCheckerResult" id="HCheckerResult" value="true" title="鍚堟牸" checked>
-                                                <input type="radio" name="HCheckerResult" id="HCheckerResult" value="false" title="涓嶅悎鏍�">
+                                                <input type="radio" name="HCheckerResult" id="HCheckerResult" value="true" title="鍚堟牸" >
+                                                <input type="radio" name="HCheckerResult" id="HCheckerResult" value="false" title="涓嶅悎鏍�" checked>
                                             </div>
                                         </div>
                                         <div class="layui-inline" id="hidediv1">
@@ -645,7 +645,6 @@
                     <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" value="0">
                     <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" value="1">
                     <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo">
-                    <input type="hidden" name="HProcID" id="HProcID" value="1">
                 </form>
             </div>
         </div>
@@ -1485,7 +1484,13 @@
                                 , "HBatchNo": data.鎵瑰彿
                                 , "HTakeSampleCheckBillID": data.HTakeSampleCheckBillID
                                 , "HTakeSampleCheckBillNo": data.HTakeSampleCheckBillNo
+                                , "HProcID": data.HProcID
+                                , "HProcName": data.HProcName
                             });
+
+                            $("input[name=HCheckerResult][value=true]").prop("checked", data.鍒ゅ畾缁撹 === "鍚堟牸");
+                            $("input[name=HCheckerResult][value=false]").prop("checked", data.鍒ゅ畾缁撹 === "涓嶅悎鏍�");
+                            form.render();
                             data = result.data;
                             //瀛愯〃  璧嬪��
                             var rowdata = [];
@@ -1898,7 +1903,7 @@
                                     {
                                         "HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩唬鐮�": data[i].妫�楠岄」鐩唬鐮�, "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "妫�楠屼华鍣�": data[i]["妫�楠屼华鍣�"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["鍗曚綅鍚嶇О"], "HQCNote": "", "HAnalysisMethod": data[i]["鍒嗘瀽鏂规硶"], "HResult": data[i]["榛樿缁撹"],
                                         "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": data[i]["閲嶇偣妫�鏌�"] == 1 ? true : false, "HStatus": 0, "HSampleSchemeID": data[i]["HSampleSchemeID"], "HUnitID": data[i]["HUnitID"],
-                                        "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
+                                        "HInspectVal": '', "HTargetVal": '', "HUpLimit": + data[i].涓婇檺鍊�, "HDownLimit": + data[i].涓嬮檺鍊�, "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
                                         "HSampleSchemeName": data[i].鎶芥牱鏂规鍚嶇О, "HSampleQty": data[i].鏍锋湰閲�, "HAcceptQty": data[i].鍏佽鏁�, "HInspectionLevel": data[i].妫�楠屾按骞�, "HRejectQty": data[i].鎷掔粷鏁�,
                                         "HStrictness": data[i].涓ユ牸搴�, "HSampleUnRightQty": "", "HAQL": data[i].AQL, "HSamplingType": data[i].鎶芥牱绫诲瀷
                                     }
@@ -2219,7 +2224,7 @@
                         //, { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
                         , { field: 'HUnit', title: '鍗曚綅', edit: 'text' }
                         , { field: 'HQCNote', title: '妫�楠岃褰�', edit: 'text' }
-                        , { field: 'HInspectVal', title: '妫�楠屽��' }
+                        , { field: 'HInspectVal', title: '妫�楠屽��', edit: 'text' }
                         , { field: 'HUpLimit', title: '涓婇檺鍊�' }
                         , { field: 'HDownLimit', title: '涓嬮檺鍊�' }
                         , { field: 'HMax', title: '鏈�澶у��', edit: 'text', totalRow: true}
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\272\223\345\255\230\346\243\200\351\252\214\345\215\225/QC_Add_Edit_StockCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\272\223\345\255\230\346\243\200\351\252\214\345\215\225/QC_Add_Edit_StockCheckBill.html"
index 0db6d77..a1b5981 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\272\223\345\255\230\346\243\200\351\252\214\345\215\225/QC_Add_Edit_StockCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\272\223\345\255\230\346\243\200\351\252\214\345\215\225/QC_Add_Edit_StockCheckBill.html"
@@ -1418,6 +1418,10 @@
                     layer.msg("妫�楠屽憳鏈�夋嫨锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return;
                 }
+                if ($("#HBatchNo").val() == "") {
+                    layer.msg("鎵规鍙蜂笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
                 var sSubTable = table.cache['mainTable'];
                 for (var i = 0; i < sSubTable.length; i++) {
                     if (!sSubTable[i].HQCCheckItemID) {
@@ -2386,10 +2390,10 @@
                 }
                 if (HQty > 0) {
                     document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
-                    $("input:radio[name=HLastResult][value=" + false + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+                    $("input:radio[name=HLastResult][value=" + false + "]").prop("checked", "true"); //娣诲姞閫夋嫨灞炴��
                 } else {
                     document.querySelectorAll("[name='HLastResult']")[1].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
-                    $("input:radio[name=HLastResult][value=" + true + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+                    $("input:radio[name=HLastResult][value=" + true + "]").prop("checked", "true"); //娣诲姞閫夋嫨灞炴��
                 }
                 form.render('radio');
             }           
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html"
index 280790e..26c98c4 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html"
@@ -33,15 +33,21 @@
                                     </div>
                                 </div>
                                 <div class="layui-inline">
+                                    <label class="layui-form-label">妫�楠屾柟妗堝悕绉�</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HQCCheckProjectName" id="HQCCheckProjectName">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
                                     <label class="layui-form-label">寮�濮嬫棩鏈�</label>
                                     <div class="layui-input-block">
-                                        <input type="text" class="layui-input" name="HDate1" id="HDate1">
+                                        <input type="date" class="layui-input" name="HDate1" id="HDate1">
                                     </div>
                                 </div>
                                 <div class="layui-inline">
                                     <label class="layui-form-label">缁撴潫鏃ユ湡</label>
                                     <div class="layui-input-block">
-                                        <input type="text" class="layui-input" name="HDate2" id="HDate2">
+                                        <input type="date" class="layui-input" name="HDate2" id="HDate2">
                                     </div>
                                 </div>
                                 <div class="layui-inline">
@@ -295,6 +301,10 @@
                 var HBillNo = $("#HBillNo").val();
                 var HDate1 = $("#HDate1").val();
                 var HDate2 = $("#HDate2").val();
+                var HQCCheckProjectName = $("#HQCCheckProjectName").val();
+                if (HQCCheckProjectName) {
+                    sWhere += " and 妫�楠屾柟妗堝悕绉� like '%" + HQCCheckProjectName + "%'";
+                }
                 if (HBillNo) {
                     sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
                 }
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html"
index 5500596..69ecbc6 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html"
@@ -682,7 +682,7 @@
 
                 option_ZXT_Avg = {
                     title: {
-                        text: '骞冲潎鍊�',
+                        text: 'x虅绠″埗鍥�',
                         left: 'center'
                     },
                     grid: {
@@ -741,7 +741,7 @@
 
                 option_ZXT_Diff = {
                     title: {
-                        text: '宸��',
+                        text: 'R绠″埗鍥�',
                         left: 'center'
                     },
                     grid: {
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_Add_Edit_WorkSelfCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_Add_Edit_WorkSelfCheckBill.html"
index 01f9935..bc2a5d3 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_Add_Edit_WorkSelfCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\275\246\351\227\264\350\207\252\346\243\200\345\215\225/QC_Add_Edit_WorkSelfCheckBill.html"
@@ -150,9 +150,13 @@
                                             </div>
                                         </div>
                                         <div class="layui-inline" id="hidediv1">
-                                            <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="HProcName" id="HProcName" style="background-color:#efefef4d;" readonly value="1">
+                                            <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="HProcName" id="HProcName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProc" id="btnHProc" 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="HProcID" id="HProcID" value="0">
                                             </div>
                                         </div>
                                     </div>
@@ -733,7 +737,7 @@
                 $("#HInterID").val("");
                 $("#HBillNo").val("");
                 $('#btn-AddNew').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂鏂板鎸夐挳绂佺敤
-                $('#btnSearchSource').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂鐢熶骇璧勬簮鎸夐挳绂佺敤
+                //$('#btnSearchSource').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂鐢熶骇璧勬簮鎸夐挳绂佺敤
                 $('#btnSearchICMOBill').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂浠诲姟鍗曞彿鎸夐挳绂佺敤
                 $('#btnSearchMater').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂浜у搧鍐呯爜鎸夐挳绂佺敤
                 $('#btnSearchProcExch').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂娴佽浆鍗″彿鎸夐挳绂佺敤
@@ -1035,6 +1039,45 @@
                 }
             });
             //#endregion
+
+            //琛ㄥご淇℃伅宸ュ簭
+            form.on('submit(btnHProc)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '宸ュ簭鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    maxmin: true,
+                    content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);
+                        $("#HProcID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                        get_ICMOBillStatusList();
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
 
             //閫�鍑烘寜閽�
             form.on('submit(btn-Exit)', function (data) {
@@ -1504,6 +1547,8 @@
                                 , "HShiftsID": data.HShiftsID
                                 , "HShiftsName": data.鐝鍚嶇О
                                 , "HErrTreatment": data.寮傚父涓存椂澶勭悊鏂规
+                                , "HProcID": data.HProcID
+                                , "HProcName": data.HProcName
                             });
                             $("input[name=HLastResult][value=true]").prop("checked", data.鍒ゅ畾缁撹 === "鍚堟牸");
                             $("input[name=HLastResult][value=false]").prop("checked", data.鍒ゅ畾缁撹 === "涓嶅悎鏍�");
@@ -2031,6 +2076,7 @@
                         }
                         $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
                         $("#HSourceID").val(checkStatus.data[0].HItemID);
+                        get_ICMOBillStatusList();
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
                     }
                     , btn2: function (index, layero) {
@@ -2343,10 +2389,10 @@
                 }
                 if (HQty > 0) {
                     document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
-                    $("input:radio[name=HLastResult][value=" + false + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+                    $("input:radio[name=HLastResult][value=" + false + "]").prop("checked", "true"); //娣诲姞閫夋嫨灞炴��
                 } else {
                     document.querySelectorAll("[name='HLastResult']")[1].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
-                    $("input:radio[name=HLastResult][value=" + true + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+                    $("input:radio[name=HLastResult][value=" + true + "]").prop("checked", "true"); //娣诲姞閫夋嫨灞炴��
                 }
                 form.render('radio');
             }           
@@ -3535,6 +3581,45 @@
             }          
             //#endregion
 
+            //鏍规嵁鐢熶骇璧勬簮鎴栬�� 宸ュ簭 鏌ヨ鐢熶骇宸ュ崟淇℃伅
+            function get_ICMOBillStatusList() {
+                var sWhere = "";
+                var HProcID = $("#HProcID").val();
+                var HSourceID = $("#HSourceID").val();
+                var HProcExchInterID = $("#HProcExchInterID").val();
+
+                if (HProcID != "0") {
+                    sWhere += " and HProcID=" + HProcID;
+                }
+                if (HSourceID != "0") {
+                    sWhere += " and HSourceID=" + HSourceID
+                }
+
+                sWhere += " and HSourceInterID=" + HProcExchInterID;
+
+                $.ajax({
+                    url: GetWEBURL() + "/CheckBill/GetICMOBillStatusList",
+                    type: "GET",
+                    async: false,
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            $("#HProcID").val(result.data[0]["HProcID"]);
+                            $("#HProcName").val(result.data[0]["宸ュ簭"]);
+                            $("#HSourceID").val(result.data[0]["HSourceID"]);
+                            $("#HSourceName").val(result.data[0]["鐢熶骇璧勬簮"]);
+
+                        } else {
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                })
+            }
+
+
             //#region 銆愰殣钘忔娴嬪�煎瓧娈点��
             function IsHide(HAnalysisMethod_Value) {
                 if (HAnalysisMethod_Value == 1) { //濡傛灉閫変腑銆愬畾鎬у垎鏋愩�戯紝鍒欓殣钘忓畾閲忋�佸叾浠栧垎鏋�
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 9cb547d..357a768 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"
@@ -214,8 +214,8 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label">鍒ゆ柇缁撹</label>
                                             <div class="layui-input-block">
-                                                <input type="radio" name="HLastResult" id="HLastResult" value="true" title="鍚堟牸" checked>
-                                                <input type="radio" name="HLastResult" id="HLastResult" value="false" title="涓嶅悎鏍�">
+                                                <input type="radio" name="HLastResult"  value="true" title="鍚堟牸" >
+                                                <input type="radio" name="HLastResult"  value="false" title="涓嶅悎鏍�" checked>
                                             </div>
                                         </div>
                                         <div class="layui-inline" id="hidediv1" style="margin-left:20px;">
@@ -1274,7 +1274,7 @@
                                 shift: 2,
                                 area: ['90%', '90%'],
                                 maxmin: true,
-                                content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectInstruMentList.html', 'yes'],
+                                content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectInstruMent.html', 'yes'],
                                 btn: ['纭畾', '鍙栨秷']
                                 , btn1: function (index, layero) {
 
@@ -1527,6 +1527,8 @@
                                 , "HICMOEntryID": data.HICMOEntryID
                                 , "HMaterID": data.HMaterID
                                 , "HMaterName": data.鐗╂枡鍚嶇О
+                                , "HProcID": data.HProcID
+                                , "HProcName": data.HProcName
                                 , "HProcExchQty": data.HProcExchQty
                                 , "HProcExchBillNo": data.HProcExchBillNo
                                 , "HProcExchInterID": data.HProcExchInterID
@@ -1589,7 +1591,7 @@
                             for (var i = 0; i < data.length; i++) {
                                 rowdata.push(
                                     {
-                                        "HQCCheckItemID": data[i].HQCCheckItemID, "妫�楠岄」鐩唬鐮�": data[i].妫�楠岄」鐩唬鐮�, "妫�楠岄」鐩�": data[i].妫�楠岄」鐩悕绉�, "HInspectInstruMentID": data[i].HInspectInstruMentID, "妫�楠屼华鍣�": data[i].妫�楠屼华鍣�, "HQCStd": data[i].妫�楠屾爣鍑�,
+                                        "HQCCheckItemID": data[i].HQCCheckItemID, "妫�楠岄」鐩唬鐮�": data[i].妫�楠岄」鐩唬鐮�, "妫�楠岄」鐩�": data[i].妫�楠岄」鐩悕绉�, "HInspectInstruMentID": data[i].HInspectInstruMentID, "妫�楠屼华鍣�": data[i].妫�楠屼华鍣ㄥ悕绉�, "HQCStd": data[i].妫�楠屾爣鍑�,
                                         "HUnit": data[i].鍗曚綅鍚嶇О, "HQCNote": data[i].妫�楠岃褰�, "HResult": data[i].缁撹 == "鍚堟牸" ? 1 : 2,
                                         "HMax": data[i].鏈�澶у��, "HMin": data[i].鏈�灏忓��, "HAvg": data[i].骞冲潎鍊�, "HRemark": data[i].琛ㄤ綋澶囨敞,
                                         "HAnalysisMethod": data[i].鍒嗘瀽鏂规硶 == "瀹氭�у垎鏋�" ? 1 : (data[i].鍒嗘瀽鏂规硶 == "瀹氶噺鍒嗘瀽" ? 2 : 3), "HKeyInspect": data[i].閲嶇偣妫�鏌� == "鍚�" ? false : true,
@@ -1952,7 +1954,7 @@
                                     {
                                         "HQCCheckItemID": data[i]["HQCCheckItemID"], "妫�楠岄」鐩唬鐮�": data[i].妫�楠岄」鐩唬鐮�, "妫�楠岄」鐩�": data[i]["妫�楠岄」鐩�"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "妫�楠屼华鍣�": data[i]["妫�楠屼华鍣�"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["鍗曚綅鍚嶇О"], "HQCNote": "", "HAnalysisMethod": data[i]["鍒嗘瀽鏂规硶"], "HResult": data[i]["榛樿缁撹"],
                                         "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": data[i]["閲嶇偣妫�鏌�"] == 1 ? true : false, "HStatus": 0, "HSampleSchemeID": data[i]["HSampleSchemeID"], "HUnitID": data[i]["HUnitID"],
-                                        "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
+                                        "HInspectVal": '', "HTargetVal": '', "HUpLimit":  + data[i].涓婇檺鍊� , "HDownLimit": + data[i].涓嬮檺鍊�, "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
                                         "HSampleSchemeName": data[i].鎶芥牱鏂规鍚嶇О, "HSampleQty": data[i].鏍锋湰閲�, "HAcceptQty": data[i].鍏佽鏁�, "HInspectionLevel": data[i].妫�楠屾按骞�, "HRejectQty": data[i].鎷掔粷鏁�,
                                         "HStrictness": data[i].涓ユ牸搴�, "HSampleUnRightQty": "", "HAQL": data[i].AQL, "HSamplingType": data[i].鎶芥牱绫诲瀷
                                     }
@@ -2423,7 +2425,7 @@
 
                 //閫夋嫨鐨剆elect瀵硅薄鍊硷紱
                 var selectValue = data.value;
-                if (selectValue == 1) {
+                if (selectValue == "1") {
                     selectValue = "鍚堟牸"
                     $("#HInspectResultToSee").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
                     $("#HInspectResultToSee2").css("background-color", "#CEE3F2");//鏀瑰彉妫�楠岀粨鏋滆緭鍏ユ鑳屾櫙棰滆壊
@@ -2454,12 +2456,12 @@
                 }
                 if (HQty > 0) {
                     document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
-                    $("input:radio[name=HLastResult][value=" + false + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+                    $("input:radio[name=HLastResult][value='false']").prop("checked", "true"); //娣诲姞閫夋嫨灞炴��
                 } else {
                     document.querySelectorAll("[name='HLastResult']")[1].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
-                    $("input:radio[name=HLastResult][value=" + true + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+                    $("input:radio[name=HLastResult][value='true']").prop("checked", "true"); //娣诲姞閫夋嫨灞炴��
                 }
-                form.render('radio');
+                form.render("radio");
             }
 
             ////琛岄�夋嫨澶勭悊锛堟楠岀粨鏋滐級-- 澶囦唤
@@ -3769,8 +3771,10 @@
                     data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                     success: function (result) {
                         if (result.count == 1) {
-                            $("#HTakeSampleCheckBillID").val(result.data[0]["hmainid"]);
-                            $("#HTakeSampleCheckBillNo").val(result.data[0]["鍗曟嵁鍙�"]);
+                            if (result.data.length > 0) {
+                                $("#HTakeSampleCheckBillID").val(result.data[0]["hmainid"]);
+                                $("#HTakeSampleCheckBillNo").val(result.data[0]["鍗曟嵁鍙�"]);
+                            }
                         } 
                     },
                     error: function (err) {
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_FirstPieceCheckBillList2.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_FirstPieceCheckBillList2.html"
index d762f21..ff6779c 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_FirstPieceCheckBillList2.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_FirstPieceCheckBillList2.html"
@@ -460,9 +460,10 @@
             //#region 鏌ヨ
             function RoadHBillNo(sqlWhere) {
                 var ajaxLoad = layer.load();
+                sqlWhere+=" order by 鍗曟嵁鍙� desc "
                 $.ajax({
                     //h_v_QC_FirstPieceCheckBill
-                    url: GetWEBURL() + '/QC_FirstPieceCheckBill/QC_FirstPieceCheckBillList',
+                    url: GetWEBURL() + '/QC_FirstPieceCheckBillMain/QC_FirstPieceCheckBillMainList',
                     type: "GET",
                     async: false,
                     data: { "sWhere": sqlWhere, "user": sessionStorage["HUserName"] },
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_CollectionOfSingleProductDefects.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_CollectionOfSingleProductDefects.html"
index cc50e32..ad0c5be 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_CollectionOfSingleProductDefects.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_CollectionOfSingleProductDefects.html"
@@ -359,8 +359,8 @@
                     layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
                     return;
                 } else {
-                    if (HBarCode.length != 29) {
-                        layer.alert("瀛愪欢鏉＄爜闀垮害涓嶄负29浣�!", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                    if (HBarCode.length != 29 && HBarCode.length != 50) {
+                        layer.alert("瀛愪欢鏉＄爜闀垮害涓嶄负29浣嶆垨50浣�!", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
                         return;
                     }
 
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA.html"
index 89c9061..ee21f2e 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemBGA.html"
@@ -387,8 +387,8 @@
                         layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
                         return;
                     } else {
-                        if (HBarCode.length != 29) {
-                            layer.alert("瀛愪欢鏉＄爜闀垮害涓嶄负29浣�!", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        if (HBarCode.length != 29 && HBarCode.length != 50) {
+                            layer.alert("瀛愪欢鏉＄爜闀垮害涓嶄负29浣嶆垨50浣�!", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
                             return;
                         }
 
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemStationPlatform.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemStationPlatform.html"
index 6146859..daa9edd 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemStationPlatform.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/Cj_ProcessItemStationPlatform.html"
@@ -338,8 +338,8 @@
                         layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
                         return;
                     } else {
-                        if (HBarCode.length != 29) {
-                            layer.alert("瀛愪欢鏉＄爜闀垮害涓嶄负29浣�!", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        if (HBarCode.length != 29 && HBarCode.length != 50) {
+                            layer.alert("瀛愪欢鏉＄爜闀垮害涓嶄负29浣嶆垨50浣�!", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
                             return;
                         }
 
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeArrangement_PG.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeArrangement_PG.html"
index 418eecd..6497387 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeArrangement_PG.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeArrangement_PG.html"
@@ -520,7 +520,11 @@
 
             //鏌ヨ鏈淳宸ョ殑娴佽浆鍗�
             function get_Display2(sWhere) {
-                sWhere += " and 鐢熶骇璧勬簮 is null  and HBillSubType<>'SUB'";
+                sWhere += " and 鐢熶骇璧勬簮 is null  and HBillSubType<>'SUB' and 宸ュ簭<>'杞伐搴�' ";
+                if ($("#HDeptName").val() != "") {
+                    sWhere += " and 閮ㄩ棬='" + $("#HDeptName").val() + "'";
+                }
+
                 var ajaxLoad = layer.load();
                 $.ajax({
                     url: GetWEBURL() + '/LEMS/MES_ProcessExchangeBillList_PG',
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
index 3273716..40793d5 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
@@ -345,6 +345,12 @@
                                                 <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="float: left;">
                                             </div>
                                         </div>
+                                        <div class="layui-col-xs3 layui-inline">
+                                            <label class="layui-form-label">鍘熸枡鎵规</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HMateOutBatchNo" id="HMateOutBatchNo">
+                                            </div>
+                                        </div>
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-col-xs3 layui-inline">
@@ -573,12 +579,7 @@
                                                 <input type="text" class="layui-input" name="HICMOEntryID" id="HICMOEntryID" value="0" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
-                                        <div class="layui-col-xs3 layui-inline">
-                                            <label class="layui-form-label">鍘熸枡鎵规</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HMateOutBatchNo" id="HMateOutBatchNo" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
+                                       
                                         <div class="layui-col-xs3 layui-inline">
                                             <label class="layui-form-label">鏉愯川</label>
                                             <div class="layui-input-inline">
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
index d4bb3f0..0574321 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
@@ -385,7 +385,7 @@
             //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堜富琛級
             var titleData = ["HEntryID", "HWorkShopID", "HMaterID", "HSupID", "HPRDORGID", "HEquipMentID", "hsubid", "HICMOEntryID", "HDeptID", "hmainid", "hicmointerid", "HICMOInterID", "HMaterID2", "HUnitID", "HBillType", "HRoutingBillID", "HAuxUnit", "鐢熶骇杞﹂棿浠ｇ爜", "鐢熶骇杞﹂棿", "鏉愯川", "鎴愬搧缂栧彿", "鐗堟湰", "鎬昏鍥惧彿", "鍥惧彿鐗堟湰", "瀛愪欢浠ｇ爜", "瀛愪欢鍚嶇О", "瀛愪欢瑙勬牸", "濮斿鍔犲伐鍗曚綅浠ｇ爜", "濮斿鍔犲伐鍗曚綅", "璁惧鍚嶇О", "璁惧浠ｇ爜", "鍘熸枡鎵规", "琛ユ枡鏍囪", "椤圭洰缂栧彿", "涓昏鏉愭枡", "鍏抽敭鏉愭枡", "浜у搧CODE", "瀹㈡埛绠�绉�", "瀹㈡埛瑕佹眰鏉愭枡鎴愬垎", "浜у搧鍚嶇О2", "瀹㈡埛鍚嶇О", "鐢熶骇澶囨敞", "閲嶈鎻愮ず", "鍘熸潗鏂欑紪鍙稟", "鍘熸潗鏂欑紪鍙稡", "鍘熸潗鏂欑紪鍙稢", "鍘熸潗鏂欑紪鍙稤", "鍘熸潗鏂欏唴鐮丄", "鍘熸潗鏂欏唴鐮丅", "鍘熸潗鏂欏唴鐮丆", "鍘熸潗鏂欏唴鐮丏", "鏃ヨ鍒掑伐鍗曞彿", "瀹㈡埛缂栫爜", "鑺綋瑙勬牸鍨嬪彿", "鑺綋鐗╂枡浠ｇ爜", "婧愬崟瀹㈡埛浠ｇ爜", "HEmpID", "HCusID","HBillSubType"];
              //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堝伐鑹烘祦绋嬶級
-            var titleData2 = ["宸ュ簭鍙�", "鍑虹珯鎶ュ簾鍏宠仈鏁伴噺", "HProcID", "宸ュ簭浠ｇ爜", "HBackProc", "鍔犲伐璇存槑", "妯″叿缂栧彿", "HCenterID", "宸ヤ綔涓績浠ｇ爜", "HDeptID", "鍔犲伐杞﹂棿浠ｇ爜", "鍔犲伐杞﹂棿", "HGroupID", "鐝粍浠ｇ爜", "鐝粍", "HWorkerID", "鎿嶄綔宸ヤ唬鐮乫", "鎿嶄綔宸�", "HSourceID", "鐢熶骇璧勬簮浠ｇ爜", "鐢熶骇璧勬簮", "璁″垝鏁伴噺", "hmainid", "鍗曟嵁鍙�", "hicmointerid", "浠诲姟鍗曞彿", "HICMOEntryID", "HWorkShopID", "鐢熶骇杞﹂棿浠ｇ爜", "鐢熶骇杞﹂棿", "HMaterID", "浜у搧浠ｇ爜", "浜у搧鍚嶇О", "瑙勬牸鍨嬪彿", "HUnitID", "鍗曚綅浠ｇ爜", "鍗曚綅", "鐢熶骇鏁伴噺", "璁″垝寮�宸ユ棩鏈�", "璁″垝瀹屽伐鏃ユ湡", "鎽樿", "鍐呴儴鍗曟嵁鍙�", "濮斿璁㈠崟鍐呯爜", "濮斿璁㈠崟瀛愬唴鐮�", "濮斿璁㈠崟鍙�", "HSupID", "渚涘簲鍟�", "渚涘簲鍟嗕唬鐮�", "琛ㄥご澶囨敞", "HBillType", "isEntrust", "鏃堕棿鍗曚綅", "宸ュ簭璁″垝鍔犲伐鏃堕棿", "瀛愯鍒掑紑宸ユ棩鏈�", "瀛愯鍒掑畬宸ユ棩鏈�", "瀹為檯寮�宸ユ棩鏈�", "瀹為檯瀹屽伐鏃ユ湡", "寮�宸ヤ綑閲忓ぉ鏁�", "寮�宸ヤ綑閲忓浐鏁�", "涓婇亾鍥哄畾澶╂暟", "鐢熶骇鍛ㄦ湡", "鍔犲伐鍗曚环", "鏈�鍚庢眹鎶ユ棩鏈�", "鍔犲伐璐圭敤閲戦", "鏈亾宸ュ簭", "棣栭亾宸ュ簭", "琛屽叧闂汉", "鍏抽棴绫诲瀷", "娴佽浆鍗℃暟閲�", "濮斿宸ュ崟鏁伴噺", "涓嶅悎鏍兼暟閲�", "瓒呴姣斾緥", "鑹巼", "绱鑹巼", "鍥剧焊缂栧彿", "鏈伐搴忕‘璁よ褰�", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "婧愬崟鍗曞彿", "婧愬崟绫诲瀷", "姹囨姤鏁伴噺", "HEntryID", "hsubid", "HPRDORGID", "缁勭粐", "HOrderProcNO"];
+            var titleData2 = ["宸ュ簭鍙�", "鍑虹珯鎶ュ簾鍏宠仈鏁伴噺", "HProcID", "宸ュ簭浠ｇ爜", "HBackProc", "鍔犲伐璇存槑", "妯″叿缂栧彿", "HCenterID", "宸ヤ綔涓績浠ｇ爜", "HDeptID", "鍔犲伐杞﹂棿浠ｇ爜", "鍔犲伐杞﹂棿", "HGroupID", "鐝粍浠ｇ爜", "鐝粍", "HWorkerID", "鎿嶄綔宸ヤ唬鐮�", "鎿嶄綔宸�", "HSourceID", "璁″垝鏁伴噺", "hmainid", "鍗曟嵁鍙�", "hicmointerid", "浠诲姟鍗曞彿", "HICMOEntryID", "HWorkShopID", "鐢熶骇杞﹂棿浠ｇ爜", "鐢熶骇杞﹂棿", "HMaterID", "浜у搧浠ｇ爜", "浜у搧鍚嶇О", "瑙勬牸鍨嬪彿", "鎵瑰彿", "HUnitID", "鍗曚綅浠ｇ爜", "鍗曚綅", "鐢熶骇鏁伴噺", "璁″垝寮�宸ユ棩鏈�", "璁″垝瀹屽伐鏃ユ湡", "鎽樿", "鍐呴儴鍗曟嵁鍙�", "濮斿璁㈠崟鍐呯爜", "濮斿璁㈠崟瀛愬唴鐮�", "濮斿璁㈠崟鍙�", "HSupID", "渚涘簲鍟�", "渚涘簲鍟嗕唬鐮�", "琛ㄥご澶囨敞", "HBillType", "isEntrust", "鏃堕棿鍗曚綅", "宸ュ簭璁″垝鍔犲伐鏃堕棿", "瀛愯鍒掑紑宸ユ棩鏈�", "瀛愯鍒掑畬宸ユ棩鏈�", "瀹為檯寮�宸ユ棩鏈�", "瀹為檯瀹屽伐鏃ユ湡", "寮�宸ヤ綑閲忓ぉ鏁�", "寮�宸ヤ綑閲忓浐鏁�", "涓婇亾鍥哄畾澶╂暟", "鐢熶骇鍛ㄦ湡", "鍔犲伐鍗曚环", "鏈�鍚庢眹鎶ユ棩鏈�", "鍔犲伐璐圭敤閲戦", "鏈亾宸ュ簭", "棣栭亾宸ュ簭", "琛屽叧闂汉", "鍏抽棴绫诲瀷", "娴佽浆鍗℃暟閲�", "濮斿宸ュ崟鏁伴噺", "涓嶅悎鏍兼暟閲�", "瓒呴姣斾緥", "鑹巼", "绱鑹巼", "鍥剧焊缂栧彿", "鏈伐搴忕‘璁よ褰�", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "婧愬崟鍗曞彿", "婧愬崟绫诲瀷", "姹囨姤鏁伴噺", "HEntryID", "hsubid", "HPRDORGID", "缁勭粐", "HOrderProcNO"];
             //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堝櫒鍏锋竻鍗曪級
             var titleData3 = ["HEntryID", "HMouldID", "HMaterID", "HUnitID", "hmainid","hicmointerid"];
             //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堝伐鑹哄弬鏁版竻鍗曪級
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
index da1e394..8fce09d 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
@@ -252,48 +252,6 @@
                                             </div>
                                         </div>
                                         <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">鐢熶骇璧勬簮2</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
-                                                <button type="button" class="layui-btn" lay-submit="" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="width: 40px; padding: 0 10px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                </button>
-                                                <input type="hidden" name="HSourceID" id="HSourceID" value="0">
-                                            </div>
-                                        </div>
-                                        <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">鐢熶骇璧勬簮3</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
-                                                <button type="button" class="layui-btn" lay-submit="" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="width: 40px; padding: 0 10px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                </button>
-                                                <input type="hidden" name="HSourceID" id="HSourceID" value="0">
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">鐢熶骇璧勬簮4</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
-                                                <button type="button" class="layui-btn" lay-submit="" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="width: 40px; padding: 0 10px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                </button>
-                                                <input type="hidden" name="HSourceID" id="HSourceID" value="0">
-                                            </div>
-                                        </div>
-                                        <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">鐢熶骇璧勬簮5</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
-                                                <button type="button" class="layui-btn" lay-submit="" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="width: 40px; padding: 0 10px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                </button>
-                                                <input type="hidden" name="HSourceID" id="HSourceID" value="0">
-                                            </div>
-                                        </div>
-                                        <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">杩涚珯鏃堕棿</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" class="layui-input" name="HStationInTime" id="HStationInTime" style="background-color:#efefef4d;" readonly>

--
Gitblit v1.9.1