From 5ee8d702138b67a8070e850ba622aa4b07d64fb9 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期四, 30 十月 2025 13:00:08 +0800
Subject: [PATCH] #1

---
 src/main/webapp/static/js/waitPakin/waitPakin.js |   49 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 48 insertions(+), 1 deletions(-)

diff --git a/src/main/webapp/static/js/waitPakin/waitPakin.js b/src/main/webapp/static/js/waitPakin/waitPakin.js
index 35600fd..1cbf059 100644
--- a/src/main/webapp/static/js/waitPakin/waitPakin.js
+++ b/src/main/webapp/static/js/waitPakin/waitPakin.js
@@ -2,7 +2,8 @@
 function getCol() {
     var cols = [ {type: 'checkbox'} ];
     cols.push.apply(cols, detlCols);
-    cols.push({field: 'status', align: 'center',title: '鏁版嵁鐘舵��', templet:function(row){
+    cols.push({field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
+        ,{field: 'status', align: 'center',title: '鏁版嵁鐘舵��', templet:function(row){
                 var html = "<input value='status' type='checkbox' lay-skin='switch' lay-text='姝e父|閿佸畾'' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'";
                 if(row.status === 'Y'){html += " checked ";}
                 html += ">";
@@ -167,6 +168,34 @@
                         })
                     });
                 }
+                break;
+            case 'combData':
+                layer.open({
+                    type: 2,
+                    title: '缁勬墭',
+                    maxmin: true,
+                    area: [top.detailWidth, top.detailHeight],
+                    content: 'waitPakin_comb.html',
+                    success: function(layero, index){
+                        layer.getChildFrame('#data-detail-submit-edit', index).hide();
+                        clearFormVal(layer.getChildFrame('#detail', index));
+                        layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+                    }
+                });
+                break;
+            case 'clampData':
+                layer.open({
+                    type: 2,
+                    title: '骞舵澘',
+                    maxmin: true,
+                    area: [top.detailWidth, top.detailHeight],
+                    content: 'waitPakin_clamp.html',
+                    success: function(layero, index){
+                        layer.getChildFrame('#data-detail-submit-edit', index).hide();
+                        clearFormVal(layer.getChildFrame('#detail', index));
+                        layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+                    }
+                });
                 break;
             case 'exportData':
                 layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
@@ -336,6 +365,24 @@
         method("add");
     });
 
+    // 鏁版嵁缁勬墭鍔ㄤ綔
+    form.on('submit(comb)', function () {
+        if (banMsg != null){
+            layer.msg(banMsg);
+            return;
+        }
+        method("comb");
+    });
+
+    // 鏁版嵁骞舵澘鍔ㄤ綔
+    form.on('submit(clamp)', function () {
+        if (banMsg != null){
+            layer.msg(banMsg);
+            return;
+        }
+        method("clamp");
+    });
+
     // 鏁版嵁淇敼鍔ㄤ綔
     form.on('submit(edit)', function () {
         method("update")

--
Gitblit v1.9.1