From 8d3130cd1443e6d96173bdd7c582de8ffc08ca17 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期一, 04 十月 2021 12:54:52 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

---
 WebTM/views/模治具管理/模治具仓库管理/Sc_Add_MouldProdOutBillList.html      |   94 +++++++++++++------------------
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldMoveStockStepInBillList.html  |    2 
 WebTM/views/模治具管理/模治具管理/Sc_MouldOtherInBillList.html            |    2 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdBackBillList.html         |    6 +
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdOutBillList.html          |    6 +
 WebTM/layuiadmin/Scripts/webConfig.js                           |    2 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdMoveBillList.html         |    2 
 WebTM/views/模治具管理/模治具仓库管理/Sc_Add_MouldProdBackBillList.html     |   62 ++++++++------------
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldOtherOutBillList.html         |    2 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldMoveStockStepOutBillList.html |    2 
 10 files changed, 82 insertions(+), 98 deletions(-)

diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index b6681e6..132e1b9 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -6,7 +6,7 @@
     //var WEBURL = "http://localhost:8080/API/";   //棰滄檽鍐涙湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/lubao";   //棰滄檽鍐涙湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //鏉ㄩ湶鏈湴閰嶇疆
-    var WEBURL = "http://localhost:8082/LuBaoAPI/";    //绔犵传鏌旀湰鍦伴厤缃�
+    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //绔犵传鏌旀湰鍦伴厤缃�
     //var WEBURL = "http://10.1.4.155/API/";   //姹熶赴瀹㈡埛NEW
     //var WEBURL = "http://47.96.97.237/API/";   //鏅轰簯鏈嶅姟鍣�
     //var WEBURL = "http://183.129.128.86:9090/API/";   //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣ㄥ缃�
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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdBackBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdBackBillList.html"
index faa6a4e..d813f21 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdBackBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdBackBillList.html"
@@ -165,34 +165,8 @@
     <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>
-    //鑾峰彇鍙傛暟
-        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;
-        }
-
-
-
-        var params = getUrlVars();
-        if (typeof (params[params[0]]) == "undefined") {
-            var OperationType = 1;//鎿嶄綔绫诲瀷
-            var closeType = 2;  //鍏抽棴绫诲瀷
-        } else {
-            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
-            var linterid = params[params[1]];//婧愬崟id
-            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
-            var closeType = params[params[3]];  //鍏抽棴绫诲瀷
-        }
-        var hID = params[params[0]];//缂栬緫鏌ョ湅
-
-
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
@@ -205,6 +179,20 @@
                 , form = layui.form
                 , laydate = layui.laydate
                 , element = layui.element;
+       
+            var params = get_UrlVars();
+            if (typeof (params[params[0]]) == "undefined") {
+                var OperationType = 1;//鎿嶄綔绫诲瀷
+                var closeType = 2;  //鍏抽棴绫诲瀷
+            } else {
+                var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+                var linterid = params[params[1]];//婧愬崟id
+                var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+                var closeType = params[params[3]];  //鍏抽棴绫诲瀷
+            }
+            var hID = params[params[1]];//缂栬緫鏌ョ湅
+
+       
 
             //甯歌鐢ㄦ硶
             laydate.render({
@@ -251,7 +239,7 @@
                 , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
             };
             //鍒ゆ柇鏄惁鏂板
-            if (hID == null || hID == 0) {
+            if (OperationType == 1) {
                 //鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": "  ", "HSQProcName": "   ","HProcID":0, "HZRProcName": "  ", "HMRBChecker": "  ", "HRemark": "  ", "HPSProcName": "  ", "HCloseMan": "   " }
                 option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HRemark": "" }];
                 table.render(option);
@@ -764,17 +752,14 @@
 
             //閫�鍑�
             form.on('submit(Exit)', function (data) {
-                if (closeType == 0) {
-                    //鍏抽棴椤电
-                    parent.layui.admin.events.closeThisTabs();
+                if (OperationType == 1) {
+                    Pub_Close(closeType);//鐩存帴鏂板closeType鍊间负2锛屽垪琛ㄨ皟鏂板closeType鍊间粠鍒楄〃浼犻��
                 }
-                if (closeType == 1) {
-                    //鍏抽棴寮圭獥
-                    var index = parent.layer.getFrameIndex(window.name);
-                    parent.layer.close(index);
-                } else if (closeType == 2) {
-                    //鍏抽棴椤电
-                    parent.layui.admin.events.closeThisTabs();
+                else if (OperationType == 3) {
+                    Pub_Close(closeType);
+                }
+                else {
+                    Pub_Close(2);
                 }
             });
 
@@ -783,6 +768,7 @@
 
 
 
+
             //form.on('submit(Cancel)', function () {
             //    //sessionStorage["SourceFlag"] = false;
             //    parent.location.href = "../../../views/index.html"
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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdOutBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdOutBillList.html"
index a593b1f..eebef97 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdOutBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdOutBillList.html"
@@ -165,33 +165,8 @@
     <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>//鑾峰彇鍙傛暟
-        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;
-        }
-
-
-
-        var params = getUrlVars();
-        if (typeof (params[params[0]]) == "undefined") {
-            var OperationType = 1;//鎿嶄綔绫诲瀷
-            var closeType = 2;  //鍏抽棴绫诲瀷
-        } else {
-            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
-            var linterid = params[params[1]];//婧愬崟id
-            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
-            var closeType = params[params[3]];  //鍏抽棴绫诲瀷
-        }
-        var hID = params[params[0]];//缂栬緫鏌ョ湅
-
-
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script>
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
@@ -204,6 +179,18 @@
                 , form = layui.form
                 , laydate = layui.laydate
                 , element = layui.element;
+    
+            var params = get_UrlVars();
+            if (typeof (params[params[0]]) == "undefined") {
+                var OperationType = 1;//鎿嶄綔绫诲瀷
+                var closeType = 2;  //鍏抽棴绫诲瀷
+            } else {
+                var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+                var linterid = params[params[1]];//婧愬崟id
+                var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+                var closeType = params[params[3]];  //鍏抽棴绫诲瀷
+            }
+            var hID = params[params[1]];//缂栬緫鏌ョ湅
 
             //甯歌鐢ㄦ硶
             laydate.render({
@@ -225,23 +212,23 @@
                 , page: true //寮�鍚垎椤�
                 , cols: [[ //琛ㄥご
                     { type: 'checkbox', fixed: 'left' }
-                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" ,width: 100}
-                    , { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true}
+                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+                    , { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
                     , { field: 'HMaterCode', title: '妯″叿浠g爜', edit: 'text', event: 'HMaterCode', width: 100 }
-                    , { field: 'HMaterName', title: '妯″叿鍚嶇О', edit: 'text', width: 100}
+                    , { field: 'HMaterName', title: '妯″叿鍚嶇О', edit: 'text', width: 100 }
                     , { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
-                    , { field: 'HBatchNo', title: '鎵规', edit: 'text', width: 100 }  
-                    , { field: 'HDesignLife', title: '璁捐瀵垮懡', edit: 'text', width: 100}
-                    , { field: 'HLeaveLife', title: '鍓╀綑瀵垮懡', edit: 'text', width: 100}
+                    , { field: 'HBatchNo', title: '鎵规', edit: 'text', width: 100 }
+                    , { field: 'HDesignLife', title: '璁捐瀵垮懡', edit: 'text', width: 100 }
+                    , { field: 'HLeaveLife', title: '鍓╀綑瀵垮懡', edit: 'text', width: 100 }
                     , { field: 'HUseLife', title: '绱Н浣跨敤瀵垮懡', edit: 'text', width: 100 }
                     , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', edit: 'text', width: 100 }
-                    , { field: 'HQty', title: '瀹炲彂鏁伴噺', edit: 'text', width: 100}
-                    , { field: 'HPrice', title: '鍗曚环', edit: 'text', width: 100}
-                    , { field: 'HMoney', title: '閲戦', edit: 'text', width: 100}
-                    , { field: 'HWHID', title: 'HWHID', edit: 'text', width: 100, hide: true}
+                    , { field: 'HQty', title: '瀹炲彂鏁伴噺', edit: 'text', width: 100 }
+                    , { field: 'HPrice', title: '鍗曚环', edit: 'text', width: 100 }
+                    , { field: 'HMoney', title: '閲戦', edit: 'text', width: 100 }
+                    , { field: 'HWHID', title: 'HWHID', edit: 'text', width: 100, hide: true }
                     , { field: 'HWHCode', title: '鍙戞枡浠撳簱浠g爜', edit: 'text', event: 'HWHCode', width: 100 }
                     , { field: 'HWHName', title: '鍙戞枡浠撳簱', edit: 'text', width: 100 }
-                    , { field: 'HSPID', title: 'HSPID', edit: 'text', width: 100, hide: true}
+                    , { field: 'HSPID', title: 'HSPID', edit: 'text', width: 100, hide: true }
                     , { field: 'HSPCode', title: '浠撲綅浠g爜', edit: 'text', event: 'HSPCode', width: 100 }
                     , { field: 'HSPName', title: '浠撲綅', edit: 'text', width: 100 }
                     , { field: 'HRemark', title: '琛ㄤ綋澶囨敞', edit: 'text', width: 100 }
@@ -250,9 +237,9 @@
                 , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
             };
             //鍒ゆ柇鏄惁鏂板
-            if (hID == null || hID == 0) {
+            if (OperationType == 1) {
                 //鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": "  ", "HSQProcName": "   ","HProcID":0, "HZRProcName": "  ", "HMRBChecker": "  ", "HRemark": "  ", "HPSProcName": "  ", "HCloseMan": "   " }
-                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0,"HSPCode":"", "HSPName": "", "HRemark": "" }];
+                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HRemark": "" }];
                 table.render(option);
             }
             else {
@@ -334,7 +321,7 @@
                         }
                     });
                 }
-               
+
                 $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                     if (event.key == "F7") {
                         if (obj.event === 'HMaterCode')  //妯″叿淇℃伅
@@ -383,7 +370,7 @@
                                 }
                             });
                         }
-                       
+
                         if (obj.event === 'HWHCode')  //浠撳簱浠g爜
                         {
                             //椤甸潰灞�-鑷畾涔�
@@ -469,7 +456,7 @@
                         return false;
 
                     }
-                })          
+                })
             });
 
             //鐩戝惉鍗曞厓鏍肩紪杈�
@@ -564,7 +551,7 @@
                                 , "HKeeperName": data.鍙戞枡浜�            //淇濈鍛樺悕绉�
                                 , "HDeptID": data.HDeptID                 //閮ㄩ棬ID
                                 , "HDeptName": data.閮ㄩ棬                //閮ㄩ棬鍚嶇О
-                                , "HSourceBillType":""                   //婧愬崟绫诲瀷
+                                , "HSourceBillType": ""                   //婧愬崟绫诲瀷
                                 , "XDH": ""                               //閫夊崟鍙�
                                 , "HExplanation": data.鎽樿              //鎽樿
                                 , "HRemark": data.琛ㄥご澶囨敞                    //澶囨敞
@@ -761,22 +748,19 @@
                 });
             });
 
+
             //閫�鍑�
             form.on('submit(Exit)', function (data) {
-                if (closeType == 0) {
-                    //鍏抽棴椤电
-                    parent.layui.admin.events.closeThisTabs();
+                if (OperationType == 1) {
+                    Pub_Close(closeType);//鐩存帴鏂板closeType鍊间负2锛屽垪琛ㄨ皟鏂板closeType鍊间粠鍒楄〃浼犻��
                 }
-                if (closeType == 1) {
-                    //鍏抽棴寮圭獥
-                    var index = parent.layer.getFrameIndex(window.name);
-                    parent.layer.close(index);
-                } else if (closeType == 2) {
-                    //鍏抽棴椤电
-                    parent.layui.admin.events.closeThisTabs();
+                else if (OperationType == 3) {
+                    Pub_Close(closeType);
+                }
+                else {
+                    Pub_Close(2);
                 }
             });
-         
 
 
 
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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepInBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepInBillList.html"
index 949752c..d5f8140 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepInBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepInBillList.html"
@@ -142,6 +142,8 @@
                     , height: 'full-50'
                     , page: true
                     , cellMinWidth: 90
+                    , limits: [50, 500, 1000, 5000, 10000]
+                    , limit: 50
                     , cols: [[
                         { type: 'checkbox', fixed: 'left' }
                         , { field: 'hmainid', title: '鍗曟嵁ID', hide: 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepOutBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepOutBillList.html"
index 959a92c..de92176 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepOutBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepOutBillList.html"
@@ -142,6 +142,8 @@
                     , height: 'full-50'
                     , page: true
                     , cellMinWidth: 90
+                    , limits: [50, 500, 1000, 5000, 10000]
+                    , limit: 50
                     , cols: [[
                         { type: 'checkbox', fixed: 'left' }
                         , { field: 'hmainid', title: '鍗曟嵁ID', hide: 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldOtherOutBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldOtherOutBillList.html"
index 4dd8164..13060f2 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldOtherOutBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldOtherOutBillList.html"
@@ -142,6 +142,8 @@
                     , height: 'full-50'
                     , page: true
                     , cellMinWidth: 90
+                    , limits: [50, 500, 1000, 5000, 10000]
+                    , limit: 50
                     , cols: [[
                         { type: 'checkbox', fixed: 'left' }
                         , { field: 'hmainid', title: '鍗曟嵁ID', hide: 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillList.html"
index f8cae87..a14e2e4 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillList.html"
@@ -141,6 +141,8 @@
                     , height: 'full-50'
                     , page: true
                     , cellMinWidth: 90
+                    ,limits: [50,500,1000,5000,10000] 
+                    ,limit: 50
                     , cols: [[
                          { type: 'checkbox', fixed: 'left' }
                         , { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
@@ -243,7 +245,7 @@
                             shift: 2,
                             area: ['100%', '100%'],
                             maxmin: true,
-                            content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdBackBillList.html',
+                            content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdBackBillList.html?OperationType=1&linterid=0&HSouceBillType=0&closeType=1',
                             end: function () {
                                 //鍒锋柊椤甸潰,
                                 location.reload();
@@ -267,7 +269,7 @@
                                 , shade: 0.6 //閬僵閫忔槑搴�
                                 , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                                 , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdBackBillList.html?hID=' + hID
+                                , content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdBackBillList.html?OperationType=3&linterid='+hID+'&HSouceBillType=0&closeType=1'
                                 , resize: false,
                                 end: function () {
                                     //鍒锋柊椤甸潰,
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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdMoveBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdMoveBillList.html"
index 9857436..ed34416 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdMoveBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdMoveBillList.html"
@@ -142,6 +142,8 @@
                     , height: 'full-50'
                     , page: true
                     , cellMinWidth: 90
+                    , limits: [50, 500, 1000, 5000, 10000]
+                    , limit: 50
                     , cols: [[
                         { type: 'checkbox', fixed: 'left' }
                         , { field: 'hmainid', title: '鍗曟嵁ID', hide: 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillList.html"
index 122afe1..f6224a4 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillList.html"
@@ -142,6 +142,8 @@
                     , height: 'full-50'
                     , page: true
                     , cellMinWidth: 90
+                    , limits: [50, 500, 1000, 5000, 10000]
+                    , limit: 50
                     , cols: [[
                         { type: 'checkbox', fixed: 'left' }
                         , { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
@@ -242,7 +244,7 @@
                             shift: 2,
                             area: ['100%', '100%'],
                             maxmin: true,
-                            content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdOutBillList.html',
+                            content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdOutBillList.html?OperationType=1&linterid=0&HSouceBillType=0&closeType=1',
                             end: function () {
                                 //鍒锋柊椤甸潰,
                                 location.reload();
@@ -266,7 +268,7 @@
                                 , shade: 0.6 //閬僵閫忔槑搴�
                                 , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                                 , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdOutBillList.html?hID=' + hID
+                                , content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdOutBillList.html?OperationType=3&linterid='+hID+'&HSouceBillType=0&closeType=1'
                                 , resize: false,
                                 end: function () {
                                     //鍒锋柊椤甸潰,
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_MouldOtherInBillList.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_MouldOtherInBillList.html"
index ecdec15..828c114 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_MouldOtherInBillList.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_MouldOtherInBillList.html"
@@ -142,6 +142,8 @@
                     , height: 'full-50'
                     , page: true
                     , cellMinWidth: 90
+                    , limits: [50, 500, 1000, 5000, 10000]
+                    , limit: 50
                     , cols: [[
                         { type: 'checkbox', fixed: 'left' }
                         , { field: 'hmainid', title: '鍗曟嵁ID', hide: true }

--
Gitblit v1.9.1