From cfa02ab5f3c5bb1dcf5d89d6b08ecb73d937d8c6 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 05 六月 2024 21:09:56 +0800
Subject: [PATCH] 平板绑定自动生成文件夹,维修派工单添加必填项控制/标识;器具保养记录单改为视图查询;sop进入页面隐藏视频;设备保养记录单改为视图查询;工序流转卡维护自定义过滤放到更多里面

---
 WebTM/views/模治具管理/器具维修派工单/Sc_MouldRepairSendWorkBillEdit.html |   45 ++++++--
 WebTM/views/设备管理/设备停机单/Sb_EquipStopBill_PDA.html              |    2 
 WebTM/views/PlateBinding.html                                 |    3 
 WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html        |  158 +++++++++++++++---------------
 WebTM/views/生产管理/作业指导书/Gy_SOPBill_Video.html                  |    8 +
 WebTM/views/设备管理/Sb_EquipMaintainBillList_Mul.html            |    7 
 WebTM/views/模治具管理/模治具管理/Sc_Add_MouldMaintainBillList.html     |   14 +-
 WebTM/layuiadmin/PlateBinding.js                              |    4 
 WebTM/views/设备管理/Sb_EquipMaintainBillEdit.html                |   14 +-
 9 files changed, 143 insertions(+), 112 deletions(-)

diff --git a/WebTM/layuiadmin/PlateBinding.js b/WebTM/layuiadmin/PlateBinding.js
index a78f6c2..cbce0d9 100644
--- a/WebTM/layuiadmin/PlateBinding.js
+++ b/WebTM/layuiadmin/PlateBinding.js
@@ -1,12 +1,12 @@
 锘�//鑾峰彇骞虫澘缁戝畾鏂囦欢鏁版嵁
 function get_ConfigFileInfo(linterid) {
     var obj = {};
-
+    var HPath = "C:\\MESConfiguration\\PlateBinding.txt";
     $.ajax({
         url: GetWEBURL() + "Get/Xt_PlateBinding",
         type: "GET",
         async: false,
-        data: { "user": sessionStorage["HUserName"] },
+        data: { "user": sessionStorage["HUserName"], "HPath": HPath},
         success: function (result) {
             if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                 //鍏敤閮ㄥ垎 ======Begin========
diff --git a/WebTM/views/PlateBinding.html b/WebTM/views/PlateBinding.html
index a0a95b2..3be0c0a 100644
--- a/WebTM/views/PlateBinding.html
+++ b/WebTM/views/PlateBinding.html
@@ -207,8 +207,9 @@
             //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
             //淇濆瓨
             form.on('submit(Saver)', function (data) {//淇濆瓨
+                var HPath = "C:\\MESConfiguration\\PlateBinding.txt";
 
-                var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
+                var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"] + ";" + HPath;
                 if (AllowLoadData()) {
                     $.ajax(
                         {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sc_MouldRepairSendWorkBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sc_MouldRepairSendWorkBillEdit.html"
index 226e3ae..fc391f6 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sc_MouldRepairSendWorkBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sc_MouldRepairSendWorkBillEdit.html"
@@ -67,7 +67,7 @@
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鎴愬搧鍣ㄥ叿</label>
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鎴愬搧鍣ㄥ叿<label style="color:red"> * </label></label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" lay-verify="MouldHNumber" name="MouldHNumber" id="MouldHNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" name="HMouldID" id="HMouldID" lay-verify="HMouldID" value="0">
@@ -77,7 +77,7 @@
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">缁翠慨椤圭洰</label>
+                                            <label class="layui-form-label" style="width: 85px;">缁翠慨椤圭洰<label style="color:red"> * </label></label>
                                             <div class="layui-input-block" style="margin-left: 73px;">
                                                 <input type="text" class="layui-input" name="HRepairIDName" lay-verify="HRepairIDName" id="HRepairIDName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HRepairID" lay-verify="HRepairID" id="HRepairID" value="0">
@@ -110,7 +110,7 @@
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">缁翠慨閮ㄩ棬</label>
+                                            <label class="layui-form-label" style="width: 85px;">缁翠慨閮ㄩ棬<label style="color:red"> * </label></label>
                                             <div class="layui-input-block" style="margin-left: 67px;">
                                                 <input type="text" class="layui-input" name="HDeptIDName" lay-verify="HDeptIDName" id="HDeptIDName" style="background-color:#efefef4d;width: 55%;margin-left:7px;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HDeptID" lay-verify="HDeptID" id="HDeptID" value="0">
@@ -122,7 +122,7 @@
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">涓荤</label>
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">涓荤<label style="color:red"> * </label></label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
                                                 <input type="text" class="layui-input" lay-verify="HManagerIDName" name="HManagerIDName" id="HManagerIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HManagerID" id="HManagerID" lay-verify="HManagerID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
@@ -132,7 +132,7 @@
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">缁翠慨浜�</label>
+                                            <label class="layui-form-label" style="width: 85px;">缁翠慨浜�<label style="color:red"> * </label></label>
                                             <div class="layui-input-block" style="margin-left: 73px;">
                                                 <input type="text" class="layui-input" lay-verify="HEmpIDName" name="HEmpIDName" id="HEmpIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HEmpID" lay-verify="HEmpID" id="HEmpID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
@@ -150,13 +150,13 @@
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">璁″垝缁翠慨宸ユ椂</label>
+                                            <label class="layui-form-label" style="width: 85px;">璁″垝缁翠慨宸ユ椂<label style="color:red"> * </label></label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
                                                 <input type="text" class="layui-input" name="HPlanTimes" lay-verify="HPlanTimes" id="HPlanTimes" value="0" onmouseover="this.title=this.value">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">瀹為檯缁翠慨宸ユ椂</label>
+                                            <label class="layui-form-label" style="width: 85px;">瀹為檯缁翠慨宸ユ椂<label style="color:red"> * </label></label>
                                             <div class="layui-input-block" style="margin-left: 117px;">
                                                 <input type="text" class="layui-input" name="HTimes" lay-verify="HTimes" id="HTimes" value="0">
                                             </div>
@@ -836,14 +836,37 @@
                     layer.msg("缁翠慨浜轰笉鑳戒负绌�");
                     return false;
                 }
-                if ($("#HSupIDName").val() == "") {
-                    layer.msg("渚涘簲鍟嗕笉鑳戒负绌�");
+                if ($("#HPlanTimes").val() == 0) {
+                    layer.msg("璁″垝缁翠慨宸ユ椂涓嶈兘涓�0");
                     return false;
                 }
-                if ($("#HEquipIDName").val() == "") {
-                    layer.msg("璁惧涓嶈兘涓虹┖");
+                if ($("#HTimes").val() == 0) {
+                    layer.msg("瀹為檯缁翠慨宸ユ椂涓嶈兘涓�0");
                     return false;
                 }
+                //if ($("#HSupIDName").val() == "") {
+                //    layer.msg("渚涘簲鍟嗕笉鑳戒负绌�");
+                //    return false;
+                //}
+                //if ($("#HEquipIDName").val() == "") {
+                //    layer.msg("璁惧涓嶈兘涓虹┖");
+                //    return false;
+                //}
+                var sSubStr = JSON.stringify(table.cache['mainTable'])
+                if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+                    sSubStr = JSON.parse(sSubStr);
+                    for (var i = 0; i < sSubStr.length; i++) {
+                        if (sSubStr[i].HRepairID == 0) {
+                            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,缁翠慨椤圭洰淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            return Result = false;
+                        }
+                        if (sSubStr[i].HManagerID == 0) {
+                            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璐熻矗浜轰俊鎭负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            return Result = false;
+                        }
+
+                    }
+                }
                 return true;
             }
             //鑾峰彇鍙傛暟
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainBillList.html"
index adb29b6..a229d0f 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainBillList.html"
@@ -630,9 +630,9 @@
                                     buttonArr = [];//娓呯┖鏁扮粍
                                     for (var i = 0; i < BYData.length; i++) {
                                         var checkrow = {
-                                            "HMaintainItemID": BYData[i].HMaintainItemID, "HMaintainItemNumber": BYData[i].HMaintainItemNumber, "HMaintainItem": BYData[i].HMaintainItem,
-                                            "HMaintainPart": BYData[i].HMaintainPart, "HManagerID": BYData[i].HManagerID, "HManagerNumber": BYData[i].HManagerNumber,
-                                            "HManagerName": BYData[i].HManagerName, "HClaim": BYData[i].HClaim, "HRemark": BYData[i].HRemark
+                                            "HMaintainItemID": BYData[i].淇濆吇椤圭洰ID, "HMaintainItemNumber": BYData[i].淇濆吇椤圭洰浠g爜, "HMaintainItem": BYData[i].淇濆吇椤圭洰,
+                                            "HMaintainPart": BYData[i].淇濆吇閮ㄤ綅, "HManagerID": BYData[i].璐熻矗浜篒D, "HManagerNumber": BYData[i].璐熻矗浜轰唬鐮�,
+                                            "HManagerName": BYData[i].璐熻矗浜哄悕绉�, "HClaim": BYData[i].鍏蜂綋瑕佹眰, "HRemark": BYData[i].瀛愬娉�2
                                         };
                                         buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
                                     }
@@ -648,10 +648,10 @@
                                     buttonArr = [];//娓呯┖鏁扮粍
                                     for (var i = 0; i < PJData.length; i++) {
                                         var checkrow = {
-                                            "HMaterID": PJData[i].HMaterID, "HMaterNumber": PJData[i].HMaterNumber, "HMaterName": PJData[i].HMaterName,
-                                            "HMaterSpec": PJData[i].HMaterSpec, "HUnitID": PJData[i].HUnitID, "HUnitNumber": PJData[i].HUnitNumber,
-                                            "HUnitName": PJData[i].HUnitName, "HQty": PJData[i].HQty, "HQtyMust": PJData[i].HQtyMust,
-                                            "HRemark": PJData[i].HRemark
+                                            "HMaterID": PJData[i].閰嶄欢ID, "HMaterNumber": PJData[i].閰嶄欢浠g爜, "HMaterName": PJData[i].閰嶄欢鍚嶇О,
+                                            "HMaterSpec": PJData[i].瑙勬牸鍨嬪彿, "HUnitID": PJData[i].鍗曚綅ID, "HUnitNumber": PJData[i].璁¢噺鍗曚綅浠g爜,
+                                            "HUnitName": PJData[i].璁¢噺鍗曚綅鍚嶇О, "HQty": PJData[i].鐢ㄩ噺, "HQtyMust": PJData[i].鏍囧噯鐢ㄩ噺,
+                                            "HRemark": PJData[i].瀛愬娉�1
                                         };
                                         buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
                                     }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\275\234\344\270\232\346\214\207\345\257\274\344\271\246/Gy_SOPBill_Video.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\275\234\344\270\232\346\214\207\345\257\274\344\271\246/Gy_SOPBill_Video.html"
index 611a0ba..02f3b60 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\275\234\344\270\232\346\214\207\345\257\274\344\271\246/Gy_SOPBill_Video.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\275\234\344\270\232\346\214\207\345\257\274\344\271\246/Gy_SOPBill_Video.html"
@@ -190,6 +190,8 @@
                 //鍒濆鍩烘湰淇℃伅璧嬪��
             }
             else if (OperationType == 3) {//缂栬緫
+                document.getElementById("IsHide").style.display = "none";//闅愯棌瑙嗛
+                document.getElementById("HideVideo").innerHTML = "鏄剧ず瑙嗛";
                 set_EditFromGrid(linterid);
             }
             else if (OperationType == 5) {//鏌ョ湅
@@ -197,6 +199,10 @@
                 HSourceNo = params[params[2]]; //宸ュ崟鍙�
                 HSourceEntryID = params[params[3]]; //婧愬崟瀛愬唴鐮�
                 HProcID = params[params[4]]; //宸ュ簭ID
+
+                document.getElementById("IsHide").style.display = "none";//闅愯棌瑙嗛
+                document.getElementById("HideVideo").innerHTML = "鏄剧ず瑙嗛";
+
                 //get_SopFile(HMaterID, HSourceNo);// 鐗╂枡
                 get_SopFile2(HMaterID, HProcID); //鐗╂枡+宸ュ簭
                 return;
@@ -250,7 +256,7 @@
                     document.getElementById("IsHide").style.display = "none";//闅愯棌瑙嗛
                     document.getElementById("HideVideo").innerHTML = "鏄剧ず瑙嗛";
                 } else {
-                    document.getElementById("IsHide").style.display = "inherit";//闅愯棌瑙嗛
+                    document.getElementById("IsHide").style.display = "inherit";//鏄剧ず瑙嗛
                     document.getElementById("HideVideo").innerHTML = "闅愯棌瑙嗛";
                 }
             });
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
index 85264a9..b759266 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
@@ -487,9 +487,9 @@
                                     buttonArr = [];//娓呯┖鏁扮粍
                                     for (var i = 0; i < BYData.length; i++) {
                                         var checkrow = {
-                                            "HMaintainItemID": BYData[i].HMaintainItemID, "HMaintainItemNumber": BYData[i].HMaintainItemNumber, "HMaintainItem": BYData[i].HMaintainItem,
-                                            "HMaintainPart": BYData[i].HMaintainPart, "HManagerID": BYData[i].HManagerID, "HManagerNumber": BYData[i].HManagerNumber,
-                                            "HManagerName": BYData[i].HManagerName, "HClaim": BYData[i].HClaim, "HRemark": BYData[i].HRemark
+                                            "HMaintainItemID": BYData[i].HMaintainItemID, "HMaintainItemNumber": BYData[i].淇濆吇椤圭洰浠g爜, "HMaintainItem": BYData[i].淇濆吇椤圭洰鍚嶇О,
+                                            "HMaintainPart": BYData[i].淇濆吇閮ㄤ綅, "HManagerID": BYData[i].HManagerID, "HManagerNumber": BYData[i].璐熻矗浜轰唬鐮�,
+                                            "HManagerName": BYData[i].璐熻矗浜哄悕绉�, "HClaim": BYData[i].鍏蜂綋瑕佹眰, "HRemark": BYData[i].琛ㄤ綋澶囨敞
                                         };
                                         buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
                                     }
@@ -505,10 +505,10 @@
                                     buttonArr = [];//娓呯┖鏁扮粍
                                     for (var i = 0; i < PJData.length; i++) {
                                         var checkrow = {
-                                            "HMaterID": PJData[i].HMaterID, "HMaterNumber": PJData[i].HMaterNumber, "HMaterName": PJData[i].HMaterName,
-                                            "HUnitID": PJData[i].HUnitID, "HUnitNumber": PJData[i].HUnitNumber,
-                                            "HUnitName": PJData[i].HUnitName, "HQty": PJData[i].HQty,
-                                            "HRemark": PJData[i].HRemark
+                                            "HMaterID": PJData[i].閰嶄欢ID, "HMaterNumber": PJData[i].閰嶄欢浠g爜, "HMaterName": PJData[i].閰嶄欢鍚嶇О,
+                                            "HUnitID": PJData[i].鍗曚綅ID, "HUnitNumber": PJData[i].璁¢噺鍗曚綅浠g爜,
+                                            "HUnitName": PJData[i].璁¢噺鍗曚綅鍚嶇О, "HQty": PJData[i].鐢ㄩ噺,
+                                            "HRemark": PJData[i].瀛愬娉�1
                                         };
                                         buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
                                     }
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList_Mul.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList_Mul.html"
index 88d761a..ce16f65 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList_Mul.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList_Mul.html"
@@ -562,10 +562,11 @@
                                     buttonArr = [];//娓呯┖鏁扮粍
                                     for (var i = 0; i < BYData.length; i++) {
                                         var checkrow = {
-                                            "HMaintainItemID": BYData[i].HMaintainItemID, "HMaintainItemNumber": BYData[i].HMaintainItemNumber, "HMaintainItem": BYData[i].HMaintainItem,
-                                            "HMaintainPart": BYData[i].HMaintainPart, "HManagerID": BYData[i].HManagerID, "HManagerNumber": BYData[i].HManagerNumber,
-                                            "HManagerName": BYData[i].HManagerName, "HClaim": rowdate1[i].HClaim, "HRemark": rowdate1[i].HRemark
+                                            "HMaintainItemID": BYData[i].HMaintainItemID, "HMaintainItemNumber": BYData[i].淇濆吇椤圭洰浠g爜, "HMaintainItem": BYData[i].淇濆吇椤圭洰鍚嶇О,
+                                            "HMaintainPart": BYData[i].淇濆吇閮ㄤ綅, "HManagerID": BYData[i].HManagerID, "HManagerNumber": BYData[i].璐熻矗浜轰唬鐮�,
+                                            "HManagerName": BYData[i].璐熻矗浜哄悕绉�, "HClaim": rowdate1[i].鍏蜂綋瑕佹眰, "HRemark": rowdate1[i].琛ㄤ綋澶囨敞
                                         };
+
                                         buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
                                     }
                                     table.reload("mainTable", {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\201\234\346\234\272\345\215\225/Sb_EquipStopBill_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\201\234\346\234\272\345\215\225/Sb_EquipStopBill_PDA.html"
index 195580e..052efbb 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\201\234\346\234\272\345\215\225/Sb_EquipStopBill_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\201\234\346\234\272\345\215\225/Sb_EquipStopBill_PDA.html"
@@ -648,7 +648,7 @@
                 }
 
                 if ($("#HStopEmpID").val() == 0) {
-                    layer.msg("寮�鏈轰汉娌℃湁閫夋嫨锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    layer.msg("鍋滄満浜烘病鏈夐�夋嫨锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return;
                 }
               
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
index 3386097..aac7368 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
@@ -116,91 +116,91 @@
                                                 </select>
                                             </div>
                                         </div>
-                                    </div>
-                                </div>
-                                <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
-                                    <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 class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
+                                            <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" lay-filter="Comparator" class="ForFilteringSchemes" 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>
-                                    <div class="layui-inline">
-                                        <select name="Comparator" id="Comparator" lay-filter="Comparator" class="ForFilteringSchemes" 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: 10px; margin-bottom: 10px ">
-                                    <div class="layui-inline">
-                                        <label class="layui-form-label">杩囨护</label>
-                                        <div class="layui-input-block">
-                                            <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
-                                            </select>
+                                        <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">杩囨护</label>
+                                                <div class="layui-input-block">
+                                                    <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" class="ForFilteringSchemes" 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="ColContent1" id="ColContent1">
+                                            </div>
                                         </div>
-                                    </div>
-                                    <div class="layui-inline">
-                                        <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" class="ForFilteringSchemes" 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="ColContent1" id="ColContent1">
-                                    </div>
-                                </div>
 
-                                <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
-                                    <div class="layui-inline">
-                                        <label class="layui-form-label">杩囨护</label>
-                                        <div class="layui-input-block">
-                                            <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
-                                            </select>
+                                        <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">杩囨护</label>
+                                                <div class="layui-input-block">
+                                                    <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" class="ForFilteringSchemes" 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="ColContent2" id="ColContent2">
+                                            </div>
                                         </div>
                                     </div>
-                                    <div class="layui-inline">
-                                        <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" class="ForFilteringSchemes" 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="ColContent2" id="ColContent2">
-                                    </div>
-                                </div>
+                                </div>                                
                             </div>
                         </div>
                         <!--<div class="layui-tab-item layui-show">-->

--
Gitblit v1.9.1