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 |   85 ++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 81 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/static/js/waitPakin/waitPakin.js b/src/main/webapp/static/js/waitPakin/waitPakin.js
index fbfef1a..1cbf059 100644
--- a/src/main/webapp/static/js/waitPakin/waitPakin.js
+++ b/src/main/webapp/static/js/waitPakin/waitPakin.js
@@ -1,9 +1,9 @@
 var pageCurr;
 function getCol() {
-    var cols = [
-    ];
+    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='姝ｅ父|閿佸畾'' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'";
                 if(row.status === 'Y'){html += " checked ";}
                 html += ">";
@@ -20,12 +20,15 @@
     return cols;
 }
 
-layui.use(['table','laydate', 'form'], function(){
+layui.config({
+    base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'tableMerge'], function(){
     var table = layui.table;
     var $ = layui.jquery;
     var layer = layui.layer;
     var layDate = layui.laydate;
     var form = layui.form;
+    var tableMerge = layui.tableMerge;
 
     // 鏁版嵁娓叉煋
     tableIns = table.render({
@@ -55,6 +58,7 @@
             statusCode: 200
         },
         done: function(res, curr, count) {
+            // tableMerge.render(this);
             if (res.code === 403) {
                 top.location.href = baseUrl+"/";
             }
@@ -98,6 +102,33 @@
     table.on('toolbar(waitPakin)', function (obj) {
         var checkStatus = table.checkStatus(obj.config.id);
         switch(obj.event) {
+            case 'addWrk':
+                if (checkStatus.data.length === 0){
+                    layer.msg('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�', {icon: 2});
+                } else {
+                    layer.confirm('纭畾鐢熸垚宸ヤ綔妗ｄ换鍔″悧', function(){
+                        $.ajax({
+                            url: baseUrl+"/create/waitPain/wrkMast/start",
+                            headers: {'token': localStorage.getItem('token')},
+                            data: JSON.stringify(checkStatus.data),
+                            contentType:'application/json;charset=UTF-8',
+                            method: 'POST',
+                            traditional:true,
+                            success: function (res) {
+                                if (res.code === 200){
+                                    layer.closeAll();
+                                    tableReload(false);
+                                    layer.msg(res.msg, {icon: 1})
+                                } else if (res.code === 403){
+                                    top.location.href = baseUrl+"/";
+                                } else {
+                                    layer.msg(res.msg, {icon: 2})
+                                }
+                            }
+                        })
+                    });
+                }
+                break;
             case 'addData':
                 layer.open({
                     type: 2,
@@ -137,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(){
@@ -306,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