From ddd72a4d20b6255b6d5b454b0e6163d3ce9f4418 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期三, 28 八月 2024 16:42:14 +0800
Subject: [PATCH] 1

---
 WebTM/views/质量管理/质量报表/QC_ProcessPerformanceFirstPass.html    |  173 ------
 WebTM/views/生产管理/异常反馈单/OA_ErrMsgBackSignBill_BrushCard.html  |  308 ++++++++---
 WebTM/views/IpadIndex.html                                   |   52 +
 WebTM/views/生产管理/生产报表/Sc_QualityReportBillMonth.html         |   43 +
 WebTM/views/生产管理/异常反馈单/Sc_Add_MESExecptFeedBackBillList.html |   65 ++
 WebTM/views/生产管理/异常反馈单/OA_ErrMsgBackCheckBillMain.html       |    3 
 WebTM/views/生产管理/异常反馈单/OA_ErrMsgBackSignBillMain.html        |    7 
 WebTM/views/质量管理/质量报表/QC_ProcessPerformancePass.html         |  171 ------
 WebTM/views/质量管理/质量报表/Sc_StationOutBil_HProc.html            |   42 +
 WebTM/views/生产管理/异常反馈单/OA_ErrMsgBackHandleBillMain.html      |    7 
 WebTM/views/质量管理/异常反馈/OA_ErrMsgBackSelfQuery_BGT.html        |  458 ++++++++++++++++
 WebTM/views/质量管理/质量报表/QC_TechnologyParameterClass.html       |  252 +-------
 WebTM/WebTM.csproj                                           |    1 
 13 files changed, 930 insertions(+), 652 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index b41507f..dff863a 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -450,6 +450,7 @@
     <Content Include="views\璁惧绠＄悊\璁惧鎶ヨ〃\Sb_EquipRepairTaskReport.html" />
     <Content Include="views\璁惧绠＄悊\璁惧鎶ヨ〃\Sb_EquipResumeCheckQuery.html" />
     <Content Include="views\璁惧绠＄悊\璁惧鎶ヨ〃\Sb_EquipRepairReport.html" />
+    <Content Include="views\璐ㄩ噺绠＄悊\寮傚父鍙嶉\OA_ErrMsgBackSelfQuery_BGT.html" />
     <Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_FiveMenOneRingList.html" />
     <Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_EquipMentCollectionTechParam.html" />
     <Content Include="views\璁惧绠＄悊\璁惧瑙勭▼鍗昞Sb_EquipDotCheckRule_Excel.html" />
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index 7fdb583..8e45e25 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -1286,6 +1286,40 @@
             });
         }
 
+        //寮傚父绛惧埌澶勭悊鐐瑰嚮浜嬩欢
+        function SingErrMsg(event, obj) {
+            layer.open({
+                type: 2,
+                skin: 'layui-layer-rim', //鍔犱笂杈规
+                title: '鏂板寮傚父绛惧埌澶勭悊鍗�',
+                closeBtn: 1,
+                shift: 2,
+                area: ['100%', '100%'],
+                maxmin: true,
+                content: '鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/OA_ErrMsgBackSignBill_BrushCard.html?OperationType=2',
+                end: function () {
+
+                }                
+            });
+        }
+
+        //寮傚父楠屾敹鐐瑰嚮浜嬩欢
+        function ErrMsgBackCheck(event, obj) {
+            layer.open({
+                type: 2,
+                skin: 'layui-layer-rim', //鍔犱笂杈规
+                title: '鏂板寮傚父鍙嶉楠屾敹鍗�',
+                closeBtn: 1,
+                shift: 2,
+                area: ['100%', '100%'],
+                maxmin: true,
+                content: '璐ㄩ噺绠＄悊/寮傚父鍙嶉/OA_ErrMsgBackSelfQuery_BGT.html?OperationType=2',
+                end: function () {
+
+                }
+            });
+        }
+
         //閫�鍑�
         function Esc(event, obj) {
             parent.location.href = "index.html"
@@ -1497,7 +1531,7 @@
                             <div class="layui-col-sm12 layui-col-md4" onclick="Abnormal(event,this)">
                                 <div class="cnt bottomright">
                                     <span class="layui-icon layui-icon-unlink imgicon"></span>
-                                    <span class="imgtitle">寮傚父</span>
+                                    <span class="imgtitle">寮傚父鐢宠</span>
                                 </div>
                             </div>
                             <div class="layui-col-sm12 layui-col-md4" onclick="Esc(event,this)">
@@ -1547,7 +1581,21 @@
                                 </div>
                             </div>
                         </div>
-                                              
+                        <div class="layui-row layui-col-space10">
+                            <div class="layui-col-sm12 layui-col-md4" onclick="SingErrMsg(event,this)">
+                                <div class="cnt bottomright">
+                                    <span class="layui-icon layui-icon-layer imgicon"></span>
+                                    <span class="imgtitle">寮傚父绛惧埌澶勭悊</span>
+                                </div>
+                            </div>
+                            <div class="layui-col-sm12 layui-col-md4" onclick="ErrMsgBackCheck(event,this)">
+                                <div class="cnt bottomright">
+                                    <span class="layui-icon layui-icon-layer imgicon"></span>
+                                    <span class="imgtitle">寮傚父楠屾敹</span>
+                                </div>
+                            </div>                          
+                        </div>
+
                     </div>
                 </fieldset>
             </div>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackCheckBillMain.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackCheckBillMain.html"
index 94deba5..0995e6b 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackCheckBillMain.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackCheckBillMain.html"
@@ -524,6 +524,8 @@
                 $("#HSendMan").val(sessionStorage["HUserName"]);   //鍙戦�佷汉
                 $("#HDeptID").val(sessionStorage["HDeptID"]);  //閮ㄩ棬ID
                 $("#HDeptName").val(sessionStorage["HDept"]);  //閮ㄩ棬
+                $("#HCheckEmpID").val(sessionStorage["HEmpID"]);     //楠屾敹浜�
+                $("#HCheckEmpName").val(sessionStorage["HUserName"]);     //鍒跺崟浜�
                 $("#HHCheckDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //鍗曟嵁鏃ユ湡
                 if (HSouceBillType == '4502') {
                     var num = 1;    //寮傚父鍙嶉鍗�
@@ -571,6 +573,7 @@
                                     $("#HErrMsgBackBillNo").val(LoadData[0].鍗曟嵁鍙�); //寮傚父鍙嶉鍗曞彿
                                     $("#HErrMsgBackInterID").val(LoadData[0].HInterID); //寮傚父鍙嶉鍗曚富鍐呯爜
                                     $("#HErrMsgBackEntryID").val(LoadData[0].HEntryID); //寮傚父鍙嶉鍗曞瓙鍐呯爜
+
                                 }
                                 else if (num == 2) {
                                     var LoadData = data.data;
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackHandleBillMain.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackHandleBillMain.html"
index 3326e5f..101f624 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackHandleBillMain.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackHandleBillMain.html"
@@ -555,7 +555,7 @@
                                     $("#HErrMsgBackTypeID").val(LoadData[0].HErrMsgBackTypeID); //寮傚父绫诲瀷鍚嶇ОID
                                     $("#HErrMsgBackTypeName").val(LoadData[0].寮傚父绫诲瀷鍚嶇О); //寮傚父绫诲瀷鍚嶇О
                                     $("#HSendMan").val(LoadData[0].鍙戦�佷汉); //鍙戦�佷汉
-                                    $("#HReceiveMan").val(LoadData[0].鎺ユ敹浜�); //鎺ユ敹浜�
+                                    $("#HReceiveMan").val(LoadData[0].鎸囨淳澶勭悊浜�); //鎺ユ敹浜�
                                     $("#HCopyMan").val(LoadData[0].鎶勯��); //鎶勯��
                                     $("#HLevel").find("option[value='" + LoadData[0]["绱ф�ョ▼搴�"] + "']").attr("selected", true); //绱ф�ョ▼搴�
                                     $("#HContext").val(LoadData[0].涓婚); //涓婚
@@ -572,6 +572,10 @@
                                     $("#HErrMsgBackBillNo").val(LoadData[0].鍗曟嵁鍙�); //寮傚父鍙嶉鍗曞彿
                                     $("#HErrMsgBackInterID").val(LoadData[0].HInterID); //寮傚父鍙嶉鍗曚富鍐呯爜
                                     $("#HErrMsgBackEntryID").val(LoadData[0].HEntryID); //寮傚父鍙嶉鍗曞瓙鍐呯爜
+
+                                    $("#HHandleEmpID").val(LoadData[0].HHandleEmpID); //绛惧埌浜篒D
+                                    $("#HHandleEmpName").val(LoadData[0].鎸囨淳澶勭悊浜�); //绛惧埌浜�
+
                                 } else if (num==2) {
                                     var LoadData = data.data;
                                     $("#HDeptID").val(LoadData[0].HDeptID); //閮ㄩ棬ID
@@ -756,6 +760,7 @@
                 var refSav = "";
                 if (OperationType == 1 || OperationType == 2 || OperationType == 4) {
                     refSav = "Add";
+                    data.field.HMaker = $("#HHandleEmpName").val();
                 }
                 if (OperationType == 3) {
                     refSav = "Update";
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackSignBillMain.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackSignBillMain.html"
index 000178c..bcd90f7 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackSignBillMain.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackSignBillMain.html"
@@ -539,7 +539,7 @@
                                     $("#HErrMsgBackTypeID").val(LoadData[0].HErrMsgBackTypeID); //寮傚父绫诲瀷鍚嶇ОID
                                     $("#HErrMsgBackTypeName").val(LoadData[0].寮傚父绫诲瀷鍚嶇О); //寮傚父绫诲瀷鍚嶇О
                                     $("#HSendMan").val(LoadData[0].鍙戦�佷汉); //鍙戦�佷汉
-                                    $("#HReceiveMan").val(LoadData[0].鎺ユ敹浜�); //鎺ユ敹浜�
+                                    $("#HReceiveMan").val(LoadData[0].鎸囨淳澶勭悊浜�); //鎺ユ敹浜�
                                     $("#HCopyMan").val(LoadData[0].鎶勯��); //鎶勯��
                                     $("#HLevel").find("option[value='" + LoadData[0]["绱ф�ョ▼搴�"] + "']").attr("selected", true); //绱ф�ョ▼搴�
                                     $("#HContext").val(LoadData[0].涓婚); //涓婚
@@ -556,6 +556,10 @@
                                     $("#HErrMsgBackBillNo").val(LoadData[0].鍗曟嵁鍙�); //寮傚父鍙嶉鍗曞彿
                                     $("#HErrMsgBackInterID").val(LoadData[0].HInterID); //寮傚父鍙嶉鍗曚富鍐呯爜
                                     $("#HErrMsgBackEntryID").val(LoadData[0].HEntryID); //寮傚父鍙嶉鍗曞瓙鍐呯爜
+
+                                    $("#HSignEmpID").val(LoadData[0].HHandleEmpID); //绛惧埌浜篒D
+                                    $("#HSignEmpName").val(LoadData[0].鎸囨淳澶勭悊浜�); //绛惧埌浜�
+
                                 } else if (num == 2) {
                                     var LoadData = data.data;
                                     $("#HDeptID").val(LoadData[0].HDeptID); //閮ㄩ棬ID
@@ -739,6 +743,7 @@
                 var refSav = "";
                 if (OperationType == 1 || OperationType == 2 || OperationType == 4) {
                     refSav = "Add";
+                    data.field.HMaker = $("#HSignEmpName").val();
                 }
                 if (OperationType == 3) {
                     refSav = "Update";
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackSignBill_BrushCard.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackSignBill_BrushCard.html"
index 74fc74b..54e79ed 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackSignBill_BrushCard.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackSignBill_BrushCard.html"
@@ -45,6 +45,9 @@
         .layui-form-label {
             width: 25%;
         }
+        #mainTable tr {
+            height: 100px; /* 浣犳兂瑕佺殑琛岄珮 */
+        }
     </style>
 
 </head>
@@ -54,9 +57,10 @@
             <div class="layui-card-body" style="padding: 1px;">
                 <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
                     <div style="padding: 2px; ">
-                        <button class="layui-btn layui-btn-normal" style="margin-left: 5px" type="button" lay-submit="" lay-filter="btnSignIn" id="btnSignIn">绛惧埌</button>
-                        <button class="layui-btn layui-btn-normal" style="margin-left: 10px" type="button" lay-submit="" lay-filter="btnQuery" id="btnQuery">鏌ヨ</button>
-                        <button class="layui-btn layui-btn-normal" style="margin-left: 10px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 150px;height:120px;width:120px;" type="button" lay-submit="" lay-filter="btnSignIn" id="btnSignIn">绛惧埌</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 70px; height: 120px; width: 120px;" type="button" lay-submit="" lay-filter="btnErrMSg" id="btnErrMSg">澶勭悊</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 70px; height: 120px; width: 120px;" type="button" lay-submit="" lay-filter="btnQuery" id="btnQuery">鏌ヨ</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 70px; height: 120px; width: 120px;" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>
                     </div>
                     <div class="layui-tab" lay-filter="tab-POStockInBill">
                         <h1 style="text-align: center; padding: 10px 0;"><b>寮傚父鍙嶉鍒峰崱绛惧埌</b></h1>
@@ -92,7 +96,7 @@
                             </div>
                         </div>
                     </div>
-                    <table class="" id="mainTable" lay-filter="mainTable" style="margin-top:10px;"></table>
+                    <table class="" id="mainTable" lay-filter="mainTable" style="margin-top:10px;" lay-size="lg"></table>
                 </form>
             </div>
         </div>
@@ -121,6 +125,10 @@
             //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
             var titleData = [];
             //#endregion
+
+            //鑾峰彇鍙傛暟
+            var params = getUrlVars();
+            var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  1娣诲姞 淇濆瓨  2澶嶅埗  3 缂栬緫        
 
             //#region 杩涘叆椤甸潰鍗冲姞杞�
 
@@ -188,6 +196,7 @@
                     , data = checkStatus.data;
                 if (checkStatus.data.length === 1) {
                     var linterid = data[0].hmainid.toString();
+                    var HEntryID = data[0].HEntryID.toString();
                     layer.open({
                         type: 2
                         , area: ['100%', '100%']
@@ -195,7 +204,7 @@
                         , shade: 0.6 //閬僵閫忔槑搴�
                         , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                         , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: '../../鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/OA_ErrMsgBackSignBillMain.html?OperationType=2&linterid=' + linterid + '&HEntryID=' + 0 + '&HSouceBillType=' + 4529 + ''
+                        , content: '../../鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/OA_ErrMsgBackSignBillMain.html?OperationType=2&linterid=' + linterid + '&HEntryID=' + HEntryID + '&HSouceBillType=' + 4502 + ''
                         , resize: false,
                         end: function () {
                             //鍒锋柊椤甸潰,
@@ -211,10 +220,51 @@
                 }
             });
 
+            //澶勭悊
+            form.on('submit(btnErrMSg)', function () {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].hmainid.toString();
+                    var HEntryID = data[0].HEntryID.toString();
+                    if (data[0].鍗曟嵁鐘舵�� != "宸茬鍒�") {
+                        layer.msg('璇ュ崟瀛愭湭绛惧埌,涓嶈兘澶勭悊锛�');
+                    } else {
+                        layer.open({
+                            type: 2
+                            , area: ['100%', '100%']
+                            , title: '寮傚父鍙嶉鎺ユ敹鍗曠鍒�'
+                            , shade: 0.6 //閬僵閫忔槑搴�
+                            , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                            , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                            , content: '../../鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/OA_ErrMsgBackHandleBillMain.html?OperationType=2&linterid=' + linterid + '&HEntryID=' + HEntryID + '&HSouceBillType=' + 4502 + ''
+                            , resize: false,
+                            end: function () {
+                                //鍒锋柊椤甸潰,
+                                get_FastQuery();//鏌ヨ
+                            }
+                            , cancel: function () {
+
+                            }
+                        })
+                    }
+                    
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�涓紓甯稿弽棣堟帴鏀跺崟杩涜绛惧埌锛�');
+                }
+            });
+
             //閫�鍑�
             form.on('submit(btnEdit)', function () {
-                //鍏抽棴椤电
-                Pub_Close(2);               
+                if (OperationType == "2") {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                } else {
+                    //鍏抽棴椤电
+                    Pub_Close(2);
+                }
+                             
             });
 
             //IC鍗″洖杞︽柟娉�
@@ -264,7 +314,7 @@
                     , limit: 50 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
                     , cellMinWidth: 200
                     , done: function (res, curr, count) {
-                        //soulTable.render(this);
+                       
                     }
                 };
                 option.data = [];
@@ -292,87 +342,183 @@
             //#region 鏌ヨ
             function get_Display(sWhere) {
                 var ajaxLoad = layer.load();
-                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-                $.ajax({
-                    url: GetWEBURL() + '/OA_ErrMsgBackSignBill_BrushCard/ErrMsgBackReceive',
-                    type: "GET",
-                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
-                    success: function (data1) {
-                        if (data1.count == 1) {
+                if (OperationType == 2) {       //淇濈暀鍘熸湁鐨勫埛鍗＄鍒�,鏂板涓�涓姤宸ュ彴鍒峰崱绛惧埌(鑾峰彇鏁版嵁鏂瑰紡涓嶄竴鏍�)
+                    //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                    $.ajax({
+                        url: GetWEBURL() + '/OA_ErrMsgBackSignBill_BrushCard/ErrMsgBackReceive',
+                        type: "GET",
+                        data: { "sWhere": sWhere, "num":"2","user": sessionStorage["HUserName"] },
+                        success: function (data1) {
+                            if (data1.count == 1) {
 
-                            if (data1.data.length > 0) {
-                                $("#HSignInEmp").val(data1.data[0].鎸囨淳澶勭悊浜�);
-                            } else {
-                                $("#HSignInEmp").val("");
-                                layer.msg('娌℃湁琚寚娲惧紓甯稿弽棣堝崟', { time: 2 * 1000});
-                            }
-                           
-                            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 });
-                                //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
-                                var patrn = new RegExp(/^h/i);
-                                if (patrn.test(data1.list[key].ColmCols)) {
-                                    titleData[key] = data1.list[key].ColmCols;
+                                if (data1.data.length > 0) {
+                                    $("#HSignInEmp").val(data1.data[0].鎸囨淳澶勭悊浜�);
+                                } else {
+                                    $("#HSignInEmp").val("");
+                                    layer.msg('娌℃湁琚寚娲惧紓甯稿弽棣堝崟', { time: 2 * 1000 });
                                 }
-                            }
-                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
-                            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;
-                                        case 'long':
-                                        case 'Int32':
-                                        case 'Int64':
-                                        case 'double':
-                                        case 'Decimal':
-                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
-                                            break;
-                                        default:
-                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+
+                                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 });
+                                    //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                                    var patrn = new RegExp(/^h/i);
+                                    if (patrn.test(data1.list[key].ColmCols)) {
+                                        titleData[key] = data1.list[key].ColmCols;
                                     }
                                 }
-                            }
-                            //鍔ㄦ�佹樉绀哄垪鍚�
-                            option = {
-                                elem: '#mainTable'
-                                , cols: [col]
-                                , data: data1.data
-                                , height: 'full-80'
-                                , page: true
-                                , limits: [50, 500, 5000, 50000]
-                                , limit: 50
-                                , cellMinWidth: 90
-                                , totalRow: true
-                                , done: function (res, curr, count) {                                    
-                                    //soulTable.render(this);
+                                //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                                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;
+                                            case 'long':
+                                            case 'Int32':
+                                            case 'Int64':
+                                            case 'double':
+                                            case 'Decimal':
+                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+                                                break;
+                                            default:
+                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                        }
+                                    }
                                 }
+                                //鍔ㄦ�佹樉绀哄垪鍚�
+                                option = {
+                                    elem: '#mainTable'
+                                    , cols: [col]
+                                    , data: data1.data
+                                    , height: 'full-80'
+                                    , page: true
+                                    , limits: [50, 500, 5000, 50000]
+                                    , limit: 50
+                                    , cellMinWidth: 90
+                                    , totalRow: true
+                                    , done: function (res, curr, count) {                                        
+                                    }
+                                }
+
+                                ins = table.render(option);
+
+                                layer.close(ajaxLoad);
+                            } else {
+                                option.data = data1.data
+                                ins = table.render(option);
+                                layer.close(ajaxLoad);
                             }
-
-                            ins = table.render(option);
-
-                            layer.close(ajaxLoad);                           
-                        } else {
-                            option.data = data1.data
-                            ins = table.render(option);
+                        }, error: function () {
                             layer.close(ajaxLoad);
-                            //layer.alert(data1.code + data1.Message, { icon: 5 });
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                         }
-                    }, error: function () {
-                        layer.close(ajaxLoad);
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                });
+                    });
+                } else {
+                    //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                    $.ajax({
+                        url: GetWEBURL() + '/OA_ErrMsgBackSignBill_BrushCard/ErrMsgBackReceive',
+                        type: "GET",
+                        data: { "sWhere": sWhere, "num": "1","user": sessionStorage["HUserName"] },
+                        success: function (data1) {
+                            if (data1.count == 1) {
+
+                                if (data1.data.length > 0) {
+                                    $("#HSignInEmp").val(data1.data[0].鎸囨淳澶勭悊浜�);
+                                } else {
+                                    $("#HSignInEmp").val("");
+                                    layer.msg('娌℃湁琚寚娲惧紓甯稿弽棣堝崟', { time: 2 * 1000 });
+                                }
+
+                                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 });
+                                    //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                                    var patrn = new RegExp(/^h/i);
+                                    if (patrn.test(data1.list[key].ColmCols)) {
+                                        titleData[key] = data1.list[key].ColmCols;
+                                    }
+                                }
+                                //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                                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;
+                                            case 'long':
+                                            case 'Int32':
+                                            case 'Int64':
+                                            case 'double':
+                                            case 'Decimal':
+                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+                                                break;
+                                            default:
+                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                        }
+                                    }
+                                }
+                                //鍔ㄦ�佹樉绀哄垪鍚�
+                                option = {
+                                    elem: '#mainTable'
+                                    , cols: [col]
+                                    , data: data1.data
+                                    , height: 'full-80'
+                                    , page: true
+                                    , limits: [50, 500, 5000, 50000]
+                                    , limit: 50
+                                    , cellMinWidth: 90
+                                    , totalRow: true
+                                    , done: function (res, curr, count) {
+                                        //soulTable.render(this);
+                                    }
+                                }
+
+                                ins = table.render(option);
+
+                                layer.close(ajaxLoad);
+                            } else {
+                                option.data = data1.data
+                                ins = table.render(option);
+                                layer.close(ajaxLoad);
+                                //layer.alert(data1.code + data1.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.close(ajaxLoad);
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+               
+            }
+            //#endregion
+
+            //#region 鑾峰彇鍙傛暟
+            function getUrlVars() {
+                var vars = [], hash;
+                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+                for (var i = 0; i < hashes.length; i++) {
+                    hash = hashes[i].split('=');
+                    vars.push(hash[0]);
+                    vars[hash[0]] = hash[1];
+                }
+                return vars;
             }
             //#endregion
 
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
index 132762d..8a8555c 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
@@ -347,10 +347,10 @@
                                                         <label class="layui-form-label">褰卞搷闈㈢▼搴�:</label>
                                                         <div class="layui-input-inline">
                                                             <select name="HErrLev" lay-filter="HErrLev" id="HErrLev">
-                                                                <option value="鍋滅嚎" selected="selected">鍋滅嚎</option>
+                                                                <option value="鏃犳硶鍒ゆ柇" selected="selected">鏃犳硶鍒ゆ柇</option>
+                                                                <option value="鍋滅嚎">鍋滅嚎</option>
                                                                 <option value="鎵归噺涓嶈壇">鎵归噺涓嶈壇</option>
                                                                 <option value="鍋跺彂涓嶈壇">鍋跺彂涓嶈壇</option>
-                                                                <option value="鏃犳硶鍒ゆ柇">鏃犳硶鍒ゆ柇</option>
                                                             </select>
                                                         </div>
                                                     </div>
@@ -551,10 +551,11 @@
             }
             else if (OperationType == 4) {
                 set_AddFNew();
+                $("#HSendMan").val(sessionStorage["HUserName"]); //鍙戦�佷汉              
                 var EquipNumber = "";
                 set_Sc_ICMOBillStatus();//鑾峰彇宸ュ崟鐨� 鐗╂枡 鏁伴噺
                 set_ErrMsgBackType();   //鑾峰彇寮傚父绫诲瀷
-                set_UserSuperiors();    //鑾峰彇褰撳墠鐧诲綍浜虹殑涓婄骇
+                //set_UserSuperiors();    //鑾峰彇褰撳墠鐧诲綍浜虹殑涓婄骇
                 set_EquipFile();        //鑾峰彇璁惧鐨勮澶囩紪鐮�
                 var Datetime = Format(new Date(), "yyyy-MM-dd hh:mm:ss");
                 var Person = sessionStorage["HUserName"];
@@ -1093,8 +1094,8 @@
                 });
             });
 
-            //鎺ユ敹浜�
-            form.on('submit(HReceiveManList)', function () {
+            //鎺ユ敹浜�(浣滃簾)
+            form.on('submit(HReceiveManList0)', function () {
                 //椤甸潰灞�-鑷畾涔�
                 layer.open({
                     type: 2,
@@ -1144,6 +1145,46 @@
                     }
                 });
             });
+
+            //鎺ユ敹浜�
+            form.on('submit(HReceiveManList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鎺ユ敹浜哄垪琛�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HReceive', '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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HReceiveMan").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+                        $("#HHandleEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);  //鎸囨淳澶勭悊浜�
+                        $("#HHandleEmpID").val(checkStatus.data[0].HItemID);        //鎸囨淳澶勭悊浜�
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
 
             //鎶勯�佷汉
             form.on('submit(HCopyManList)', function () {
@@ -1418,16 +1459,22 @@
                 return Result = false;
             }
 
+            if ($("#HBadProcManName").val() == '' || $("#HSendMan").val() == null) {
+                layer.msg("璐ｄ换浜轰笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return Result = false;
+            }
+            if ($("#HQEManName").val() == '' || $("#HReceiveMan").val() == null) {
+                layer.msg("QE璐ｄ换浜轰笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return Result = false;
+            }
+
             if (OperationType == "2") {
                 if ($("#HMainSourceInterID").val() == '' || $("#HMainSourceInterID").val() == null) {
                     layer.msg("婧愬崟鍗曞彿涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return Result = false;
                 }
             }
-            //if ($("#HQty").val() > Qty) {
-            //    layer.msg("涓嶈兘澶т簬璁″垝鏁伴噺锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-            //    return Result = false;
-            //}
+       
             return Result;
         }
 
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_QualityReportBillMonth.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_QualityReportBillMonth.html"
index 77566a2..6c615ff 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_QualityReportBillMonth.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_QualityReportBillMonth.html"
@@ -129,6 +129,28 @@
                 var HQualifiedNum = [];//鍚堟牸鎬绘暟閲�
                 var HFirstPassRate = [];//鐩撮�氱巼
                 var HTitle = "";//鍥惧舰鏍囬
+                var monthlyTotals = [];
+
+                // 閬嶅巻鏁版嵁鏁扮粍
+                option.data.forEach(data => {
+                    var year = data["骞�"];
+                    var month = data["鏈�"];
+                    var quantity = data["娉ㄥ鏁伴噺"];
+
+                    // 鍒濆鍖栧勾浠藉璞�
+                    if (!monthlyTotals[year]) {
+                        monthlyTotals[year] = {};
+                    }
+
+                    // 鍒濆鍖栨湀浠藉璞�
+                    if (!monthlyTotals[year][month]) {
+                        monthlyTotals[year][month] = 0;
+                    }
+
+                    // 绱姞鏁伴噺
+                    monthlyTotals[year][month] += quantity;
+                });
+
                 if (option.data.length > 0) {
                     var HMaterName = option.data[0].鐗╂枡鍚嶇О
                     for (let i = 0; i < H_X.length; i++) {
@@ -137,10 +159,21 @@
                         HFirstPassRate.push(0);
                     }
                     // 濉厖鏁版嵁
+                    for (let i = 0; i < H_X.length; i++) {
+                        let month = i + 1; // 1鍒�12鐨勬湀浠�
+                        let year = $("#Hyear").val(); // 褰撳墠骞翠唤
+
+                        // 灏� monthlyTotals 涓殑鏁伴噺濉厖鍒� HProcSumNum 涓�
+                        if (monthlyTotals[year] && monthlyTotals[year][month]) {
+                            HProcSumNum[i] = monthlyTotals[year][month];
+                        }
+                    }
+
+                    // 濉厖鏁版嵁
                     for (let i = 0; i < option.data.length; i++) {
                         if (option.data[i].鐗╂枡鍚嶇О === HMaterName) {
                             let monthIndex = option.data[i].鏈� - 1; // 鏈堜唤鍦ㄦ暟缁勪腑鐨勭储寮曪紙娉ㄦ剰杞崲涓轰粠0寮�濮嬶級
-                            HProcSumNum[monthIndex] += option.data[i].娉ㄥ鏁伴噺;
+                            //HProcSumNum[monthIndex] += option.data[i].娉ㄥ鏁伴噺;
 
                             // 澶勭悊娉ㄥ鑹巼
                             let qualifiedRateString = option.data[i].娉ㄥ鑹巼; // "5.00%"
@@ -225,9 +258,9 @@
                         {
                             type: 'value',
                             name: '鐢熶骇鏁伴噺',
-                            min: 0,
-                            max: 200000,
-                            interval: 10000,
+                            //min: 0,
+                            //max: 200000,
+                            //interval: 10000,
                             axisLabel: {
                                 formatter: '{value}'
                             }
@@ -339,7 +372,7 @@
                 option = {
                     elem: '#mainTable'
                     , toolbar: '#toolbarDemo'
-                    , height: 'full-490'
+                    , height: '200px'
                     , totalRow: true
                     , page: true
                     , cellMinWidth: 90
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210/OA_ErrMsgBackSelfQuery_BGT.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210/OA_ErrMsgBackSelfQuery_BGT.html"
new file mode 100644
index 0000000..9589fbc
--- /dev/null
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210/OA_ErrMsgBackSelfQuery_BGT.html"
@@ -0,0 +1,458 @@
+锘�<!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">
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/PageTitle.js"></script>
+
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-tab layui-tab-card" style="margin-top:20px;">
+                            <ul class="layui-tab-title">
+                                <li class="layui-this">鏈獙鏀�</li>                             
+                            </ul>
+                            <div class="layui-tab-content">                               
+                                <div class="layui-tab-item layui-show">
+                                    <!--鎴戝彂閫佺殑-->
+                                    <table class="layui-hide" id="mainTable_send" lay-filter="mainTable_send"></table>
+                                </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-XTReception-in" id="btn-XTReception-in"><i class="layui-icon layui-icon-radio"></i>涓嬫帹寮傚父鍙嶉鎺ユ敹鍗�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-XTSign-in" id="btn-XTSign-in"><i class="layui-icon layui-icon-radio"></i>涓嬫帹寮傚父鍙嶉绛惧埌鍗�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-XTReceive" id="btn-XTReceive"><i class="layui-icon layui-icon-radio"></i>涓嬫帹寮傚父鍙嶉澶勭悊鍗�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-View" id="btn-View"><i class="layui-icon layui-icon-radio"></i>鏌ョ湅</button>
+                            </div>
+                        </script>
+                        <script type="text/html" id="toolbarDemo1">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-normal"  lay-submit=""  lay-filter="btn-XTCheck" id="btn-XTCheck" style="/* display: inline; */height: 100px;margin-left: 100px;">涓嬫帹楠屾敹鍗�</button>
+                                <button type="button" class="layui-btn layui-btn-normal" lay-submit=""  lay-filter="btn-View1" id="btn-View1"  style="/* display: inline; */ height: 100px; width: 100px; margin-left: 100px;">鏌ョ湅</button>
+                                <button type="button" class="layui-btn layui-btn-normal" lay-submit=""  lay-filter="btnEdit" id="btnEdit"  style="/* display: inline; */ height: 100px; width: 100px; margin-left: 100px;">閫�鍑�</button>
+                            </div>
+                        </script>
+                        <script type="text/html" id="toolbarDemo2">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-View2" id="btn-View2"><i class="layui-icon layui-icon-radio"></i>鏌ョ湅</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙ｆā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+                , util = layui.util
+                , soulTable = layui.soulTable
+            var sWhere = "";
+            var option_receive = "";  //鏈畬鎴�
+            var option_copy = ""; //宸插畬鎴�
+            var option_send = ""; //姝ｅ湪杩涜
+            var ins;
+            //var TableTab = "mainTable_receive";  //鍒濆鍖栭〉闈㈡椂榛樿涓� 鈥滄湭瀹屾垚鈥� 椤电
+            //var cur_title = "鏈畬鎴�"; //褰撳墠閫変腑椤电
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //
+            var HModName = "OA_ErrMsgBackSelfQuery";
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堟垜鎺ユ敹鐨勶級
+            var titleData = ["HInterID", "HEntryID", "HDeptID", "HRecDeptID", "HHandleEmpID","HErrMsgBackTypeID"];
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堟垜鍙戦�佺殑锛�
+            var titleData = ["HInterID", "HEntryID", "HDeptID", "HRecDeptID", "HHandleEmpID","HErrMsgBackTypeID"];
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� 锛堟妱閫佹垜鐨勶級
+            var titleData = ["HInterID", "HEntryID", "HDeptID", "HRecDeptID", "HHandleEmpID","HErrMsgBackTypeID"];
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+            //#endregion
+
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+            function set_ClearBill() {
+                //鍒濆鍖栨帴鏀跺垪琛�
+                set_InitGrid_notStart();
+                //鍒濆鍖栧彂閫�
+                set_InitGrid_send();
+                //鍒濆鍖栨妱閫佸垪琛�
+                set_InitGrid_copy();
+                //鏌ヨ
+                get_Display();
+            }
+
+            table.on('toolbar(mainTable_receive)', function (obj) {
+                switch (obj.event) {
+                    //涓嬫帹寮傚父鍙嶉鎺ユ敹鍗�
+                    case 'btn-XTReception-in': XTReception();
+                        break;
+                    //涓嬫帹寮傚父鍙嶉绛惧埌鍗�
+                    case 'btn-XTSign-in': XTSign();
+                        break;
+                    //涓嬫帹寮傚父鍙嶉澶勭悊鍗�
+                    case 'btn-XTReceive': XTReceive();
+                        break;
+                    //鏌ョ湅
+                    case 'btn-View': View();
+                        break;
+
+                };
+            });
+            table.on('toolbar(mainTable_send)', function (obj) {
+                switch (obj.event) {
+                    //涓嬫帹寮傚父鍙嶉楠屾敹鍗�
+                    case 'btn-XTCheck': XTCheck();
+                        break;
+                    //鏌ョ湅
+                    case 'btn-View1': View();
+                        break;
+                };
+            });
+            table.on('toolbar(mainTable_copy)', function (obj) {
+                switch (obj.event) {
+                    //鏌ョ湅
+                    case 'btn-View2': View();
+                        break;
+                };
+            });
+
+            //閫�鍑�
+            form.on('submit(btnEdit)', function () {
+                //鍏抽棴椤电
+                Pub_Close(1);
+
+            });
+
+            //鍒濆鍖栨帴鏀跺垪琛�
+            function set_InitGrid_notStart() {
+                option_receive = {
+                    elem: '#mainTable_receive'
+                    , toolbar: '#toolbarDemo'
+                    , page: true
+                    , totalRow: true
+                    , height: 300
+                    , cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+                    , cols: []
+                };
+                //table.render(option);
+            }
+
+            //鍒濆鍖栧彂閫佸垪琛�
+            function set_InitGrid_send() {
+                option_send = {
+                    elem: '#mainTable_send'
+                    , toolbar: '#toolbarDemo1'
+                    , page: false
+                    , height: 500
+                    , totalRow: true
+                    , cellMinWidth: 90
+                    , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+                    , cols: []
+                };
+            }
+
+            //鍒濆鍖栨妱閫佸垪琛�
+            function set_InitGrid_copy() {
+                option_copy = {
+                    elem: '#mainTable_copy'
+                    , page: false
+                    , height: 500
+                    , totalRow: true
+                    , cellMinWidth: 90
+                    , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+                    , cols: []
+                };
+            }
+
+            //#region 鏌ヨ
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+
+                $.ajax({
+                    url: GetWEBURL() + '/Sc_MESTransFerWorkBill/GetSc_MESTransFerWorkBillQuery',
+                    type: "GET",
+                    async: false,
+                    data: {  "user": sessionStorage["HUserName"] },
+                    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 ($.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_receive = {
+                                elem: '#mainTable_receive'
+                                , toolbar: '#toolbarDemo'
+                                , cols: [col]
+                                , data: data1.data.h_p_OA_ErrMsgBackSelfQuery
+                                , height: 'full-80'
+                                , page: true
+                                , totalRow: true
+                                , limits: [50, 500, 5000, 50000]
+                                , limit: 50
+                                , cellMinWidth: 90
+                            }
+                            table.render(option_receive);
+                            ins = table.render(option_receive);
+
+                            //鎴戝彂閫佺殑
+                            option_send = {
+                                elem: '#mainTable_send'
+                                , toolbar: '#toolbarDemo1'
+                                , cols: [col]
+                                , data: data1.data.h_p_OA_ErrMsgBackSelfQuery1
+                                , height: 'full-80'
+                                , page: true
+                                , totalRow: true
+                                , limits: [50, 500, 5000, 50000]
+                                , limit: 50
+                                , cellMinWidth: 90
+                            }
+                            table.render(option_send);
+
+                            //鎶勯�佹垜鐨�
+                            option_copy = {
+                                elem: '#mainTable_copy'
+                                , toolbar: '#toolbarDemo2'
+                                , cols: [col]
+                                , data: data1.data.h_p_OA_ErrMsgBackSelfQuery2
+                                , height: 'full-80'
+                                , page: true
+                                , totalRow: true
+                                , limits: [50, 500, 5000, 50000]
+                                , limit: 50
+                                , cellMinWidth: 90
+                            }
+                            table.render(option_copy);
+                        
+                            layer.close(ajaxLoad);                         
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+
+            }
+            //#endregion
+
+            //#region 瀵煎嚭Execel
+            function get_Export() {
+                var data = option_receive.data
+                data.forEach((item) => {
+                    // 濡傛灉鏌愪釜瀛楁鐨勫�煎お闀匡紝闇�瑕佸幓闄ゆ崲琛岀
+                    if (item.浠诲姟鎻忚堪.length > 0) {  // 鍋囪瀛楁鍚嶄负field
+                        item.浠诲姟鎻忚堪 = item.浠诲姟鎻忚堪.replace(/[\r\n]+/g, '');  // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+                    }
+                });
+                table.exportFile(ins.config.id, data, "xls");
+            }
+            //#endregion
+
+            //涓嬫帹寮傚父鍙嶉鎺ユ敹鍗�
+            function XTReception() {
+                var checkStatus = table.checkStatus('mainTable_receive')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].HInterID.toString();
+                    var HEntryID = data[0].HEntryID.toString();
+                    layer.open({
+                        type: 2
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['100%', '100%']
+                        , title: '鏂板寮傚父鍙嶉绛惧埌鍗�'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/OA_ErrMsgBackReceiveBillMain.html?OperationType=2&linterid=' + HInterID + '&HEntryID=' + HEntryID + '&HSouceBillType=' + 4502 + ''
+                        , btn: [],
+                        end: function (index, layero, that) {
+                            //鍒锋柊椤甸潰
+                            $("#btnSearch").trigger('click');
+                        }
+                    })
+                }
+            }
+
+            //涓嬫帹寮傚父鍙嶉澶勭悊鍗�
+            function XTReceive() {
+                var checkStatus = table.checkStatus('mainTable_receive')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].HInterID.toString();
+                    var HEntryID = data[0].HEntryID.toString();
+                    layer.open({
+                        type: 2
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['100%', '100%']
+                        , title: '鏂板寮傚父鍙嶉鎺ユ敹鍗�'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/OA_ErrMsgBackHandleBillMain.html?OperationType=2&linterid=' + HInterID + '&HEntryID=' + HEntryID + '&HSouceBillType=' + 4502 + ''
+                        , btn: [],
+                        end: function (index, layero, that) {
+                            //鍒锋柊椤甸潰
+                            $("#btnSearch").trigger('click');
+                        }
+                    })
+                }
+            }
+
+            //涓嬫帹寮傚父鍙嶉绛惧埌鍗�
+            function XTSign() {
+                var checkStatus = table.checkStatus('mainTable_receive')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].HInterID.toString();
+                    var HEntryID = data[0].HEntryID.toString();
+                    layer.open({
+                        type: 2
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['100%', '100%']
+                        , title: '鏂板寮傚父鍙嶉绛惧埌鍗�'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/OA_ErrMsgBackSignBillMain.html?OperationType=2&linterid=' + HInterID + '&HEntryID=' + HEntryID + '&HSouceBillType=' + 4502 + ''
+                        , btn: [],
+                        end: function (index, layero, that) {
+                            //鍒锋柊椤甸潰
+                            $("#btnSearch").trigger('click');
+                        }
+                    })
+                }
+            }
+
+            //涓嬫帹寮傚父鍙嶉楠屾敹鍗�
+            function XTCheck() {
+                var checkStatus = table.checkStatus('mainTable_send')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].HInterID.toString();
+                    var HEntryID = data[0].HEntryID.toString();
+                    layer.open({
+                        type: 2
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['100%', '100%']
+                        , title: '鏂板寮傚父鍙嶉楠屾敹鍗�'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/OA_ErrMsgBackCheckBillMain.html?OperationType=2&linterid=' + HInterID + '&HEntryID=' + HEntryID + '&HSouceBillType=' + 4502 + ''
+                        , btn: [],
+                        end: function (index, layero, that) {
+                            //鍒锋柊椤甸潰
+                            $("#btnSearch").trigger('click');
+                        }
+                    })
+                }
+            }
+
+
+            //#region 鏌ョ湅
+            function View() {
+                var activeTab = getActiveTab();
+
+                if (activeTab == "鎴戞帴鏀剁殑") {
+                    var checkStatus = table.checkStatus('mainTable_receive')
+                        , data = checkStatus.data;
+                } else if (activeTab == "鎴戝彂閫佺殑") {
+                    var checkStatus = table.checkStatus('mainTable_send')
+                        , data = checkStatus.data;
+                } else if (activeTab == "鎶勯�佹垜鐨�") {
+                    var checkStatus = table.checkStatus('mainTable_copy')
+                        , data = checkStatus.data;
+                }
+
+                var HInterID = data[0].HInterID.toString();
+                var HEntryID = data[0].HEntryID.toString();
+                if (data.length == 1) {
+                    layer.open({
+                        type: 2
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['100%', '100%']
+                        , title: '寮傚父鍙嶉鍗曟煡鐪�'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/Sc_Reply_MESExecptFeedBackBill.html?OperationType=3&linterid=' + HInterID + '&HEntryID=' + HEntryID + '&HSouceBillType=' + 4502 + ''
+                        , btn: ['纭畾'],
+                        // 鎸夐挳1 鐨勫洖璋�
+                        btn1: function (index, layero, that) {
+                            //鍒锋柊椤甸潰
+                            $("#btnSearch").trigger('click');
+                        }
+                    })
+                }
+                else {
+                    layer.msg('鏃犳硶鏌ョ湅锛�');
+                }
+            }
+            //#endregion
+
+
+            // 鑾峰彇鏍囩
+            function getActiveTab() {
+                var tabs = document.getElementsByClassName("layui-tab-title")[0].getElementsByTagName("li");
+                var activeTab;
+                for (var i = 0; i < tabs.length; i++) {
+                    if (tabs[i].classList.contains("layui-this")) {
+                        activeTab = tabs[i].innerText;
+                        break;
+                    }
+                }
+                return activeTab;
+
+            }
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+    </script>
+</body>
+</html>
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_ProcessPerformanceFirstPass.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_ProcessPerformanceFirstPass.html"
index 8a8580a..34e51e6 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_ProcessPerformanceFirstPass.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_ProcessPerformanceFirstPass.html"
@@ -39,7 +39,7 @@
                                         </select>
                                     </div>
                                 </div>
-                                <div class="layui-inline">
+                                <div class="layui-inline" style="display:none">
                                     <label class="layui-form-label">杞﹂棿</label>
                                     <div class="layui-input-block" style="width: 190px;">
                                         <select name="HDeptName" id="HDeptName" lay-verify="HDeptName">
@@ -90,90 +90,7 @@
                                             </select>
                                         </div>
                                     </div>
-                                </div>
-                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
-                                    <div class="layui-row" style="margin-top:5px">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label">杩囨护</label>
-                                            <div class="layui-input-block">
-                                                <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
-                                                </select>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
-                                                <option value="0" selected="selected"></option>
-                                                <option value="=">=</option>
-                                                <option value=">=">>=</option>
-                                                <option value=">">></option>
-                                                <option value="<="><=</option>
-                                                <option value="<"><</option>
-                                                <option value="<>"><></option>
-                                                <option value="7">鍖呭惈</option>
-                                                <option value="8">宸﹀寘鍚�</option>
-                                                <option value="9">鍙冲寘鍚�</option>
-                                                <option value="10">涓嶅寘鍚�</option>
-                                            </select>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
-                                        </div>
-                                    </div>
-                                    <div class="layui-row" style="margin-top:5px">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label">杩囨护</label>
-                                            <div class="layui-input-block">
-                                                <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
-                                                </select>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
-                                                <option value="0" selected="selected"></option>
-                                                <option value="=">=</option>
-                                                <option value=">=">>=</option>
-                                                <option value=">">></option>
-                                                <option value="<="><=</option>
-                                                <option value="<"><</option>
-                                                <option value="<>"><></option>
-                                                <option value="7">鍖呭惈</option>
-                                                <option value="8">宸﹀寘鍚�</option>
-                                                <option value="9">鍙冲寘鍚�</option>
-                                                <option value="10">涓嶅寘鍚�</option>
-                                            </select>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
-                                        </div>
-                                    </div>
-                                    <div class="layui-row" style="margin-top:5px">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label">杩囨护</label>
-                                            <div class="layui-input-block">
-                                                <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
-                                                </select>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;">
-                                                <option value="0" selected="selected"></option>
-                                                <option value="=">=</option>
-                                                <option value=">=">>=</option>
-                                                <option value=">">></option>
-                                                <option value="<="><=</option>
-                                                <option value="<"><</option>
-                                                <option value="<>"><></option>
-                                                <option value="7">鍖呭惈</option>
-                                                <option value="8">宸﹀寘鍚�</option>
-                                                <option value="9">鍙冲寘鍚�</option>
-                                                <option value="10">涓嶅寘鍚�</option>
-                                            </select>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
-                                        </div>
-                                    </div>
-                                </div>
+                                </div>                              
                             </div>
                         </div>
                         <div>
@@ -410,81 +327,6 @@
                 var HMaterName = $("#HMaterName").val();//鐗╂枡鍚嶇О
                 var HBatchWork = $("#HBatchWork").val();//鏄惁閲忎骇
                 var HDivisionName = $("#HDivisionName").val();//浜嬩笟閮�
-
-                var ColName = $("#ColName").val();//澶嶉�夋
-                var Comparator = $("#Comparator").val()
-                var ColContent = $("#ColContent").val();
-
-                var ColName1 = $("#ColName1").val();//澶嶉�夋
-                var Comparator1 = $("#Comparator1").val()
-                var ColContent1 = $("#ColContent1").val();
-                var ColName2 = $("#ColName2").val();//澶嶉�夋
-                var Comparator2 = $("#Comparator2").val()
-                var ColContent2 = $("#ColContent2").val();
-
-                if (ColName != 0 && Comparator != 0) {
-                    var com = "";
-                    switch (Comparator) {
-                        case "7":
-                            com = "like'%" + ColContent + "%'";
-                            break;
-                        case "8":
-                            com = "like'%" + ColContent + "'";
-                            break;
-                        case "9":
-                            com = "like'" + ColContent + "%'";
-                            break;
-                        case "10":
-                            com = "not like'%" + ColContent + "%'";
-                            break;
-                        default:
-                            com = "" + Comparator + "'" + ColContent + "'";
-                            break;
-                    }
-                    sWhere += " and " + ColName + " " + com;
-                }
-                if (ColName1 != 0 && Comparator1 != 0) {
-                    var com1 = "";
-                    switch (Comparator1) {
-                        case "7":
-                            com1 = "like'%" + ColContent1 + "%'";
-                            break;
-                        case "8":
-                            com1 = "like'%" + ColContent1 + "'";
-                            break;
-                        case "9":
-                            com1 = "like'" + ColContent1 + "%'";
-                            break;
-                        case "10":
-                            com1 = "not like'%" + ColContent1 + "%'";
-                            break;
-                        default:
-                            com1 = "" + Comparator1 + "'" + ColContent1 + "'";
-                            break;
-                    }
-                    sWhere += " and " + ColName1 + " " + com1;
-                }
-                if (ColName2 != 0 && Comparator2 != 0) {
-                    var com2 = "";
-                    switch (Comparator2) {
-                        case "7":
-                            com2 = "like'%" + ColContent2 + "%'";
-                            break;
-                        case "8":
-                            com2 = "like'%" + ColContent2 + "'";
-                            break;
-                        case "9":
-                            com2 = "like'" + ColContent2 + "%'";
-                            break;
-                        case "10":
-                            com2 = "not like'%" + ColContent2 + "%'";
-                            break;
-                        default:
-                            com2 = "" + Comparator + "'" + ColContent + "'";
-                            break;
-                    }
-                    sWhere += " and " + ColName2 + " " + com2;
-                }
                 
                 sWhere = {
                     HYear: HYear
@@ -511,16 +353,7 @@
                 $("#HBatchWork").val("");
                 $("#HDivisionName").val("");
 
-                $("#btnSearch").click();
-                $("#ColContent").val("");
-                $("#ColName").val("0");
-                $("#Comparator").val("0");
-                $("#ColContent2").val("");
-                $("#ColName2").val("0");
-                $("#Comparator2").val("0");
-                $("#ColContent1").val("");
-                $("#ColName1").val("0");
-                $("#Comparator1").val("0");
+                $("#btnSearch").click();               
                 form.render('select');
 
                 sWhere = "";
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_ProcessPerformancePass.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_ProcessPerformancePass.html"
index fed524e..84ead04 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_ProcessPerformancePass.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_ProcessPerformancePass.html"
@@ -39,7 +39,7 @@
                                         </select>
                                     </div>
                                 </div>
-                                <div class="layui-inline">
+                                <div class="layui-inline" style="display:none">
                                     <label class="layui-form-label">杞﹂棿</label>
                                     <div class="layui-input-block" style="width: 190px;">
                                         <select name="HDeptName" id="HDeptName" lay-verify="HDeptName">
@@ -88,89 +88,6 @@
                                             <select name="HDivisionName" id="HDivisionName" class=" ForFilteringSchemes" lay-verify="HDivisionName">
                                                 <!--鍔ㄦ�佹覆鏌撶粍缁�-->
                                             </select>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
-                                    <div class="layui-row" style="margin-top:5px">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label">杩囨护</label>
-                                            <div class="layui-input-block">
-                                                <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
-                                                </select>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
-                                                <option value="0" selected="selected"></option>
-                                                <option value="=">=</option>
-                                                <option value=">=">>=</option>
-                                                <option value=">">></option>
-                                                <option value="<="><=</option>
-                                                <option value="<"><</option>
-                                                <option value="<>"><></option>
-                                                <option value="7">鍖呭惈</option>
-                                                <option value="8">宸﹀寘鍚�</option>
-                                                <option value="9">鍙冲寘鍚�</option>
-                                                <option value="10">涓嶅寘鍚�</option>
-                                            </select>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
-                                        </div>
-                                    </div>
-                                    <div class="layui-row" style="margin-top:5px">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label">杩囨护</label>
-                                            <div class="layui-input-block">
-                                                <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
-                                                </select>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
-                                                <option value="0" selected="selected"></option>
-                                                <option value="=">=</option>
-                                                <option value=">=">>=</option>
-                                                <option value=">">></option>
-                                                <option value="<="><=</option>
-                                                <option value="<"><</option>
-                                                <option value="<>"><></option>
-                                                <option value="7">鍖呭惈</option>
-                                                <option value="8">宸﹀寘鍚�</option>
-                                                <option value="9">鍙冲寘鍚�</option>
-                                                <option value="10">涓嶅寘鍚�</option>
-                                            </select>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
-                                        </div>
-                                    </div>
-                                    <div class="layui-row" style="margin-top:5px">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label">杩囨护</label>
-                                            <div class="layui-input-block">
-                                                <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
-                                                </select>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;">
-                                                <option value="0" selected="selected"></option>
-                                                <option value="=">=</option>
-                                                <option value=">=">>=</option>
-                                                <option value=">">></option>
-                                                <option value="<="><=</option>
-                                                <option value="<"><</option>
-                                                <option value="<>"><></option>
-                                                <option value="7">鍖呭惈</option>
-                                                <option value="8">宸﹀寘鍚�</option>
-                                                <option value="9">鍙冲寘鍚�</option>
-                                                <option value="10">涓嶅寘鍚�</option>
-                                            </select>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
                                         </div>
                                     </div>
                                 </div>
@@ -409,81 +326,6 @@
                 var HBatchWork = $("#HBatchWork").val();//鏄惁閲忎骇
                 var HDivisionName = $("#HDivisionName").val();//浜嬩笟閮�
 
-
-                var ColName = $("#ColName").val();//澶嶉�夋
-                var Comparator = $("#Comparator").val()
-                var ColContent = $("#ColContent").val();
-
-                var ColName1 = $("#ColName1").val();//澶嶉�夋
-                var Comparator1 = $("#Comparator1").val()
-                var ColContent1 = $("#ColContent1").val();
-                var ColName2 = $("#ColName2").val();//澶嶉�夋
-                var Comparator2 = $("#Comparator2").val()
-                var ColContent2 = $("#ColContent2").val();
-
-                if (ColName != 0 && Comparator != 0) {
-                    var com = "";
-                    switch (Comparator) {
-                        case "7":
-                            com = "like'%" + ColContent + "%'";
-                            break;
-                        case "8":
-                            com = "like'%" + ColContent + "'";
-                            break;
-                        case "9":
-                            com = "like'" + ColContent + "%'";
-                            break;
-                        case "10":
-                            com = "not like'%" + ColContent + "%'";
-                            break;
-                        default:
-                            com = "" + Comparator + "'" + ColContent + "'";
-                            break;
-                    }
-                    sWhere += " and " + ColName + " " + com;
-                }
-                if (ColName1 != 0 && Comparator1 != 0) {
-                    var com1 = "";
-                    switch (Comparator1) {
-                        case "7":
-                            com1 = "like'%" + ColContent1 + "%'";
-                            break;
-                        case "8":
-                            com1 = "like'%" + ColContent1 + "'";
-                            break;
-                        case "9":
-                            com1 = "like'" + ColContent1 + "%'";
-                            break;
-                        case "10":
-                            com1 = "not like'%" + ColContent1 + "%'";
-                            break;
-                        default:
-                            com1 = "" + Comparator1 + "'" + ColContent1 + "'";
-                            break;
-                    }
-                    sWhere += " and " + ColName1 + " " + com1;
-                }
-                if (ColName2 != 0 && Comparator2 != 0) {
-                    var com2 = "";
-                    switch (Comparator2) {
-                        case "7":
-                            com2 = "like'%" + ColContent2 + "%'";
-                            break;
-                        case "8":
-                            com2 = "like'%" + ColContent2 + "'";
-                            break;
-                        case "9":
-                            com2 = "like'" + ColContent2 + "%'";
-                            break;
-                        case "10":
-                            com2 = "not like'%" + ColContent2 + "%'";
-                            break;
-                        default:
-                            com2 = "" + Comparator + "'" + ColContent + "'";
-                            break;
-                    }
-                    sWhere += " and " + ColName2 + " " + com2;
-                }
                 sWhere = {
                     HYear: HYear
                     , HDeptName: HDeptName
@@ -509,16 +351,7 @@
                 $("#HBatchWork").val("");
                 $("#HDivisionName").val("");
 
-                $("#btnSearch").click();
-                $("#ColContent").val("");
-                $("#ColName").val("0");
-                $("#Comparator").val("0");
-                $("#ColContent2").val("");
-                $("#ColName2").val("0");
-                $("#Comparator2").val("0");
-                $("#ColContent1").val("");
-                $("#ColName1").val("0");
-                $("#Comparator1").val("0");
+                $("#btnSearch").click();              
                 form.render('select');
 
                 sWhere = "";
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_TechnologyParameterClass.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_TechnologyParameterClass.html"
index 4d742b3..da76cb9 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_TechnologyParameterClass.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_TechnologyParameterClass.html"
@@ -67,120 +67,36 @@
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch" style="padding: 0 10px;margin-left: 20px;">
                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                 </button>
-                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
-                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
-                                    <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="HMaterName" id="HMaterName" 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="HEquipNumber" id="HEquipNumber" value="" 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="HEquipName" id="HEquipName" value="" 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="HMouldNumber" id="HMouldNumber" value="" 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="HMouldName" id="HMouldName" value="" readonly>
-                                            </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>                               
+                                <div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom: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="HMaterName" id="HMaterName" readonly>
                                         </div>
                                     </div>
-
-                                    <div class="layui-row" style="margin-top:5px">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label">杩囨护</label>
-                                            <div class="layui-input-block">
-                                                <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
-                                                </select>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
-                                                <option value="0" selected="selected"></option>
-                                                <option value="=">=</option>
-                                                <option value=">=">>=</option>
-                                                <option value=">">></option>
-                                                <option value="<="><=</option>
-                                                <option value="<"><</option>
-                                                <option value="<>"><></option>
-                                                <option value="7">鍖呭惈</option>
-                                                <option value="8">宸﹀寘鍚�</option>
-                                                <option value="9">鍙冲寘鍚�</option>
-                                                <option value="10">涓嶅寘鍚�</option>
-                                            </select>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+                                    <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="HEquipNumber" id="HEquipNumber" value="" readonly>
                                         </div>
                                     </div>
-                                    <div class="layui-row" style="margin-top:5px">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label">杩囨护</label>
-                                            <div class="layui-input-block">
-                                                <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
-                                                </select>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
-                                                <option value="0" selected="selected"></option>
-                                                <option value="=">=</option>
-                                                <option value=">=">>=</option>
-                                                <option value=">">></option>
-                                                <option value="<="><=</option>
-                                                <option value="<"><</option>
-                                                <option value="<>"><></option>
-                                                <option value="7">鍖呭惈</option>
-                                                <option value="8">宸﹀寘鍚�</option>
-                                                <option value="9">鍙冲寘鍚�</option>
-                                                <option value="10">涓嶅寘鍚�</option>
-                                            </select>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
+                                    <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="HEquipName" id="HEquipName" value="" readonly>
                                         </div>
                                     </div>
-                                    <div class="layui-row" style="margin-top:5px">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label">杩囨护</label>
-                                            <div class="layui-input-block">
-                                                <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
-                                                </select>
-                                            </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="HMouldNumber" id="HMouldNumber" value="" readonly>
                                         </div>
-                                        <div class="layui-inline">
-                                            <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;">
-                                                <option value="0" selected="selected"></option>
-                                                <option value="=">=</option>
-                                                <option value=">=">>=</option>
-                                                <option value=">">></option>
-                                                <option value="<="><=</option>
-                                                <option value="<"><</option>
-                                                <option value="<>"><></option>
-                                                <option value="7">鍖呭惈</option>
-                                                <option value="8">宸﹀寘鍚�</option>
-                                                <option value="9">鍙冲寘鍚�</option>
-                                                <option value="10">涓嶅寘鍚�</option>
-                                            </select>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
+                                    </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="HMouldName" id="HMouldName" value="" readonly>
                                         </div>
                                     </div>
                                 </div>
@@ -406,80 +322,7 @@
                 var HTechParamName = $("#HTechParamName").val();
                 var HEquipName = $("#HEquipName").val();
 
-                var ColName = $("#ColName").val();//澶嶉�夋
-                var Comparator = $("#Comparator").val()
-                var ColContent = $("#ColContent").val();
-
-                var ColName1 = $("#ColName1").val();//澶嶉�夋
-                var Comparator1 = $("#Comparator1").val()
-                var ColContent1 = $("#ColContent1").val();
-                var ColName2 = $("#ColName2").val();//澶嶉�夋
-                var Comparator2 = $("#Comparator2").val()
-                var ColContent2 = $("#ColContent2").val();
-
-                if (ColName != 0 && Comparator != 0) {
-                    var com = "";
-                    switch (Comparator) {
-                        case "7":
-                            com = "like'%" + ColContent + "%'";
-                            break;
-                        case "8":
-                            com = "like'%" + ColContent + "'";
-                            break;
-                        case "9":
-                            com = "like'" + ColContent + "%'";
-                            break;
-                        case "10":
-                            com = "not like'%" + ColContent + "%'";
-                            break;
-                        default:
-                            com = "" + Comparator + "'" + ColContent + "'";
-                            break;
-                    }
-                    sWhere += " and " + ColName + " " + com;
-                }
-                if (ColName1 != 0 && Comparator1 != 0) {
-                    var com1 = "";
-                    switch (Comparator1) {
-                        case "7":
-                            com1 = "like'%" + ColContent1 + "%'";
-                            break;
-                        case "8":
-                            com1 = "like'%" + ColContent1 + "'";
-                            break;
-                        case "9":
-                            com1 = "like'" + ColContent1 + "%'";
-                            break;
-                        case "10":
-                            com1 = "not like'%" + ColContent1 + "%'";
-                            break;
-                        default:
-                            com1 = "" + Comparator1 + "'" + ColContent1 + "'";
-                            break;
-                    }
-                    sWhere += " and " + ColName1 + " " + com1;
-                }
-                if (ColName2 != 0 && Comparator2 != 0) {
-                    var com2 = "";
-                    switch (Comparator2) {
-                        case "7":
-                            com2 = "like'%" + ColContent2 + "%'";
-                            break;
-                        case "8":
-                            com2 = "like'%" + ColContent2 + "'";
-                            break;
-                        case "9":
-                            com2 = "like'" + ColContent2 + "%'";
-                            break;
-                        case "10":
-                            com2 = "not like'%" + ColContent2 + "%'";
-                            break;
-                        default:
-                            com2 = "" + Comparator + "'" + ColContent + "'";
-                            break;
-                    }
-                    sWhere += " and " + ColName2 + " " + com2;
-                }
+               
 
                 if (HProcExchBillNo != "" && HProcName != "" && HTechParamName != "") {
                     sWhere = {
@@ -502,15 +345,7 @@
                 $("#HEquipName").val();
 
                 $("#btnSearch").click();
-                $("#ColContent").val("");
-                $("#ColName").val("0");
-                $("#Comparator").val("0");
-                $("#ColContent2").val("");
-                $("#ColName2").val("0");
-                $("#Comparator2").val("0");
-                $("#ColContent1").val("");
-                $("#ColName1").val("0");
-                $("#Comparator1").val("0");
+              
                 form.render('select');
 
                 sWhere = "";
@@ -535,6 +370,7 @@
                 var HMin = [];//涓嬮檺鍊�
                 var HTitle = HTitle1;//涓绘爣棰�
                 var HTitles = HTitle2;//鍓爣棰�
+
                 if (option.data.length > 0) {   
                     for (let i = 0; i < option.data.length ; i++) {
                         H_X.push(option.data[i].宸ヨ壓娆″簭);
@@ -548,15 +384,29 @@
                         HStd.push(option.data[i].鏍囧噯鍊�);
                     }
                 }
-                option_ZZT = {
-                    title: [{
-                        text: HTitle,
-                        left: 'center'                     
-                    }, {
-                        subtext: HTitles,
+                const HMinNumbers = HMin.map(value => parseInt(value, 10));
+                const HMaxNumbers = HMax.map(value => parseInt(value, 10));
+
+                // 璁＄畻鏈�灏忓�煎拰鏈�澶у��
+                const minValue = Math.min(...HMinNumbers);
+                const maxValue = Math.max(...HMaxNumbers);
+                option_ZZT = {                    
+                    title: {
+
+                        text: HTitles,
                         left: 'center',
-                        top: '5%'
-                    }],
+                        textStyle: {
+                            color: 'black',
+                            fontSize: 18, // 鍔″繀璁颁綇璁剧疆鏂囧瓧澶у皬鍙兘鏄暟瀛�
+                            fontWeight: 'normal'
+                        }, 
+                        subtext: HTitle,
+                        subtextStyle: {
+                            color: 'black',
+                            fontSize: 18,
+                            fontWeight: 'normal'
+                        }
+                    },
                     tooltip: {
                         trigger: 'axis'
                     },
@@ -588,9 +438,9 @@
                     yAxis: [
                         {
                             type: 'value',
-                            min: parseInt($("#HMin").val(), 10) - 10, // 璁剧疆鏈�灏忓��
-                            max: parseInt($("#HMax").val(), 10) + 10, // 璁剧疆鏈�澶у��
-                            interval: Math.floor(((parseInt($("#HMax").val(), 10) + 10) - (parseInt($("#HMin").val(), 10) - 10))/10) // 璁剧疆闂磋窛
+                            min: minValue - 10, // 璁剧疆鏈�灏忓��
+                            max: maxValue + 10, // 璁剧疆鏈�澶у��
+                            interval: Math.floor(((maxValue + 10) - (minValue - 10)) / 10) // 璁剧疆闂磋窛
                         }
                     ],
                     series: [
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/Sc_StationOutBil_HProc.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/Sc_StationOutBil_HProc.html"
index b013925..c4dcda9 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/Sc_StationOutBil_HProc.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/Sc_StationOutBil_HProc.html"
@@ -346,20 +346,36 @@
                                     }
                                 }
                             }
-
-                            //鍔ㄦ�佹樉绀哄垪鍚�
-                            option = {
-                                elem: '#mainTable'
-                                , toolbar: '#toolbarDemo'
-                                , cols: [col]
-                                , data: data1.data
-                                , height: 'full-80'
-                                , page: true
-                                , limits: [50, 500, 5000, 50000]
-                                , limit: 50
-                                , cellMinWidth: 90
+                            if ($("#HMaterName").val() != "" && $("#HProcName").val() != "") {
+                                //鍔ㄦ�佹樉绀哄垪鍚�
+                                option = {
+                                    elem: '#mainTable'
+                                    , toolbar: '#toolbarDemo'
+                                    , cols: [col]
+                                    , data: data1.data
+                                    , height: 'full-80'
+                                    , page: true
+                                    , limits: [50, 500, 5000, 50000]
+                                    , limit: 50
+                                    , cellMinWidth: 90
+                                }
+                                ins = table.render(option);
+                            } else {
+                                //鍔ㄦ�佹樉绀哄垪鍚�
+                                option = {
+                                    elem: '#mainTable'
+                                    , toolbar: '#toolbarDemo'
+                                    , cols: [col]
+                                    , data: []
+                                    , height: 'full-80'
+                                    , page: true
+                                    , limits: [50, 500, 5000, 50000]
+                                    , limit: 50
+                                    , cellMinWidth: 90
+                                }
+                                ins = table.render(option);
                             }
-                            ins = table.render(option);
+                           
                             //鍒锋柊鎸夐挳鏄剧ず
                             var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
                             var HBillType = "Sc_StationOutBil_HProc";

--
Gitblit v1.9.1