From 264f7e4845032d22590d5d01d2332cc2129c10fd Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 16 四月 2024 16:42:28 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/weekly/weekly.js |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/static/js/weekly/weekly.js b/src/main/webapp/static/js/weekly/weekly.js
index 8d3a941..2c8ade7 100644
--- a/src/main/webapp/static/js/weekly/weekly.js
+++ b/src/main/webapp/static/js/weekly/weekly.js
@@ -357,6 +357,7 @@
                             cols: [[
                                 {type: 'numbers'}
                                 ,{field: 'weeklyDay$', align: 'center',title: '鏄熸湡'}
+                                ,{field: 'cstmrId$', align: 'center',title: '鐢叉柟鍗曚綅ID'}//, templet: function () { return htmlCstme;}
                                 ,{field: 'dailyTime$',width : 120, align: 'center',title: '鏃ユ湡'}
                                 ,{field: 'workContent', align: 'center', title: '宸ヤ綔鍐呭鍙婄洰鐨�', edit:false}
                                 // ,{field: 'workPurpose', title: '宸ヤ綔鐩殑', edit:false}
@@ -367,7 +368,6 @@
                                 // ,{field: 'director', align: 'center',title: '璐熻矗浜�'}
                                 // ,{field: 'settleSize', align: 'center',title: '娴佺▼闀垮害'}
                                 // ,{field: 'settleCurrent', align: 'center',title: '褰撳墠杩涘害'}
-                                ,{field: 'cstmrId$', align: 'center',title: '鐢叉柟鍗曚綅ID'}//, templet: function () { return htmlCstme;}
                                 ,{field: 'memo', align: 'center',title: '澶囨敞',   edit:false}
                             ]],
                             request: {
@@ -420,6 +420,7 @@
                             cols: [[
                                 {type: 'numbers'}
                                 ,{field: 'weeklyDay$', align: 'center',title: '鏄熸湡'}
+                                ,{field: 'cstmrId$', align: 'center',title: '鐢叉柟鍗曚綅ID'}//, templet: function () { return htmlCstme;}
                                 ,{field: 'dailyTime$',width : 120, align: 'center',title: '鏃ユ湡'}
                                 ,{field: 'workContent', align: 'center', title: '宸ヤ綔鍐呭鍙婄洰鐨�', edit:false}
                                 // ,{field: 'workPurpose', title: '宸ヤ綔鐩殑', edit:false}
@@ -430,7 +431,6 @@
                                 // ,{field: 'director', align: 'center',title: '璐熻矗浜�'}
                                 // ,{field: 'settleSize', align: 'center',title: '娴佺▼闀垮害'}
                                 // ,{field: 'settleCurrent', align: 'center',title: '褰撳墠杩涘害'}
-                                ,{field: 'cstmrId$', align: 'center',title: '鐢叉柟鍗曚綅ID'}//, templet: function () { return htmlCstme;}
                                 ,{field: 'memo', align: 'center',title: '澶囨敞',   edit:false}
                             ]],
                             request: {
@@ -620,6 +620,7 @@
                     cols: [[
                         {type: 'numbers', title: '#'}
                         ,{field: 'weeklyDay$', align: 'center',title: '鏄熸湡'}
+                        ,{field: 'cstmrId', align: 'center',title: '鐢叉柟鍗曚綅ID', style: 'color: blue;font-weight: bold', templet: '#cstmrId'}//, templet: function () { return htmlCstme;}
                         ,{field: 'workContent', title: '宸ヤ綔鍐呭鍙婄洰鐨�', style: 'color: blue;font-weight: bold', edit:true}
                         // ,{field: 'workPurpose', title: '宸ヤ綔鐩殑', style: 'color: blue;font-weight: bold', edit:true}
                         ,{field: 'addr', title: '鍦板潃', style: 'color: blue;font-weight: bold', edit:true}
@@ -629,8 +630,7 @@
                         // ,{field: 'settleMsg', align: 'center',title: '瀹℃牳杩涘害'}
                         // ,{field: 'director', align: 'center',title: '璐熻矗浜�'}
                         // ,{field: 'settleSize', align: 'center',title: '娴佺▼闀垮害'}
-                        // ,{field: 'settleCurrent', align: 'center',title: '褰撳墠杩涘害'}
-                        ,{field: 'cstmrId', align: 'center',title: '鐢叉柟鍗曚綅ID', style: 'color: blue;font-weight: bold', templet: '#cstmrId'}//, templet: function () { return htmlCstme;}
+                        ,{field: 'cstmrId$', align: 'center',title: '鐢叉柟鍗曚綅'}
                         ,{field: 'memo', align: 'center',title: '澶囨敞', width: 100, style: 'color: blue;font-weight: bold', edit:true}
                         ,{align: 'center', title: '鎿嶄綔', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80, fixed: 'right'}
                     ]],
@@ -644,7 +644,7 @@
                     },
                     done: function (res, curr, count) {
                         $(".layui-table-cell").css('overflow', 'visible');//瑙e喅layui鏁版嵁琛ㄦ牸涓祵濂椾笅鎷夋鏄剧ず闂
-                        $(".laytable-cell-2-0-5").css('color', 'rgba(0, 0, 0, 0)');
+                        $(".laytable-cell-2-0-2").css('color', 'rgba(0, 0, 0, 0)');
                         $(".layui-layer-setwin").css('display', 'none');
 
                         $(layero).find('.layui-table-view').css('margin', '0');
@@ -955,6 +955,7 @@
                     cols: [[
                         {type: 'numbers', title: '#'}
                         ,{field: 'weeklyDay$', align: 'center',title: '鏄熸湡'}
+                        ,{field: 'cstmrId', align: 'center',title: '鐢叉柟鍗曚綅ID', style: 'color: blue;font-weight: bold', templet: '#cstmrId'}//, templet: function () { return htmlCstme;}
                         ,{field: 'workContent', title: '宸ヤ綔鍐呭鍙婄洰鐨�', style: 'color: blue;font-weight: bold', edit:true}
                         // ,{field: 'workPurpose', title: '宸ヤ綔鐩殑', style: 'color: blue;font-weight: bold', edit:true}
                         ,{field: 'addr', title: '鍦板潃', style: 'color: blue;font-weight: bold', edit:true}
@@ -965,7 +966,6 @@
                         // ,{field: 'director', align: 'center',title: '璐熻矗浜�'}
                         // ,{field: 'settleSize', align: 'center',title: '娴佺▼闀垮害'}
                         // ,{field: 'settleCurrent', align: 'center',title: '褰撳墠杩涘害'}
-                        ,{field: 'cstmrId', align: 'center',title: '鐢叉柟鍗曚綅ID', style: 'color: blue;font-weight: bold', templet: '#cstmrId'}//, templet: function () { return htmlCstme;}
                         ,{field: 'memo', align: 'center',title: '澶囨敞', width: 100, style: 'color: blue;font-weight: bold', edit:true}
                         ,{align: 'center', title: '鎿嶄綔', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80, fixed: 'right'}
                     ]],
@@ -979,15 +979,17 @@
                     },
                     done: function (res, curr, count) {
                         $(".layui-table-cell").css('overflow', 'visible');//瑙e喅layui鏁版嵁琛ㄦ牸涓祵濂椾笅鎷夋鏄剧ず闂
-                        $(".laytable-cell-2-0-4").css('color', 'rgba(0, 0, 0, 0)');
+                        $(".laytable-cell-2-0-2").css('color', 'rgba(0, 0, 0, 0)');
                         $(".layui-layer-setwin").css('display', 'none');
 
                         $(layero).find('.layui-table-view').css('margin', '0');
                         var options = this;
                         var indexSign = 0;
+                        var indexSignCstmr = 0;
                         // 鑾峰彇褰撳墠琛屾暟鎹�
                         table.getRowData = function(elem){
                             var index = $(elem).closest('tr').data('index');
+                            indexSignCstmr = index;
                             var indexArray = indexS.split(","); // 灏嗗瓧绗︿覆鎷嗗垎涓烘暟缁�
                             // 閬嶅巻鏁扮粍涓殑姣忎釜鍏冪礌
                             for (var i = 0; i < indexArray.length; i++) {
@@ -1009,7 +1011,9 @@
                                 url: baseUrl+"/cstmr/all/get/kv",
                                 headers: {'token': localStorage.getItem('token')},
                                 data: {
-                                    limit: 9999
+                                    limit: 9999,
+                                    weeklyId: expTpe.id,
+                                    weeklyId2: indexSignCstmr
                                 },
                                 method: 'POST',
                                 // async: false, // 璁剧疆涓哄悓姝ユ墽琛�

--
Gitblit v1.9.1