From df3e719955cc93b4e762ac75fbb61737fbf3b7a8 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 16 六月 2025 08:38:12 +0800
Subject: [PATCH] 1

---
 WebTM/views/领料发货/销售出库/Kf_SellOutBillList_BarCodeNote.html |   33 ++++++++++++++++++++++++++-------
 1 files changed, 26 insertions(+), 7 deletions(-)

diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList_BarCodeNote.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList_BarCodeNote.html"
index 436d35d..c45f317 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList_BarCodeNote.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList_BarCodeNote.html"
@@ -20,6 +20,7 @@
                     <div style="padding: 2px; ">
                         <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
                         <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btn-Print" id="btn-Print">鎵撳嵃鐮佸崟</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btn-PrintByCusDefine" id="btn-PrintByCusDefine">鎵撳嵃鐮佸崟(瀹㈡埛鐗╂枡)</button>
                     </div>
 
                     <div class="layui-tab" lay-filter="tab-POStockInBill">
@@ -127,6 +128,21 @@
         })
         //#endregion
 
+        //#region 鎵撳嵃鐮佸崟(瀹㈡埛鑷畾涔�)
+        form.on('submit(btn-PrintByCusDefine)', function () {
+            layer.open({
+                type: 2
+                , area: ['50%', '50%']
+                , title: '鎵撳嵃妯$増閫夋嫨'
+                , shade: 0.6 //閬僵閫忔槑搴�
+                , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + linterid + '&MyMsg=' + linterid + '&Type=Kf_SellOutBillList_BarCodeNote_ByCusDefine', 'yes']
+                , resize: false
+            })
+        })
+        //#endregion
+
         //#region 瀛愯〃0锛氬ご宸ュ叿鏍忎簨浠�
         table.on('toolbar(mainTable0)', function (obj) {
             switch (obj.event) {
@@ -193,7 +209,8 @@
                 , height: 550
                 //, page: true
                 , cellMinWidth: 90
-                //, limit: 50
+                , limit: 5000
+                , totalRow: true
                 //, limits: [50, 500, 5000, 20000]
             };
 
@@ -204,7 +221,8 @@
                 , height: 550
                 //, page: true
                 , cellMinWidth: 90
-                //, limit: 50
+                , limit: 5000
+                , totalRow: true
                 //, limits: [50, 500, 5000, 20000]
             };
 
@@ -215,7 +233,8 @@
                 , height: 550
                 //, page: true
                 , cellMinWidth: 90
-                //, limit: 50
+                , limit: 5000
+                , totalRow: true
                 //, limits: [50, 500, 5000, 20000]
             };
         }
@@ -284,7 +303,7 @@
                 if ($.inArray(data[i].name, titleData0) > -1) {
                     col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
                 }
-                else if ($.inArray(data[i].name, totalArray) > -1) {
+                else if ($.inArray(data[i].name, totalArray) > -1 || (data[i].Type == "Decimal" || data[i].Type == "Int32")) { //璁$畻鍒�
                     col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                 } else {
                     switch (data[i].Type) {
@@ -311,7 +330,7 @@
         //#region 娓叉煋琛�1
         function setInit_mainTable1(data1) {
             //闇�瑕佽缃悎璁¤鐨勫垪
-            var totalArray = [];
+            var totalArray = ["鏈壊鍚堣"];
 
             //鏁寸悊瀛愯〃鐨勫垪
             var data = [];
@@ -327,7 +346,7 @@
                 if ($.inArray(data[i].name, titleData1) > -1) {
                     col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
                 }
-                else if ($.inArray(data[i].name, totalArray) > -1) {
+                else if ($.inArray(data[i].name, totalArray) > -1 || (data[i].Type == "Decimal" || data[i].Type == "Int32")) { //璁$畻鍒�
                     col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                 } else {
                     switch (data[i].Type) {
@@ -370,7 +389,7 @@
                 if ($.inArray(data[i].name, titleData2) > -1) {
                     col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
                 }
-                else if ($.inArray(data[i].name, totalArray) > -1) {
+                else if ($.inArray(data[i].name, totalArray) > -1 || (data[i].Type == "Decimal" || data[i].Type == "Int32")) { //璁$畻鍒�
                     col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                 } else {
                     switch (data[i].Type) {

--
Gitblit v1.9.1