From 775a4818b1ff4f18f17b24108cc92c23f728ea61 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 19 四月 2024 15:03:16 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/weekly/weekly.js | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/src/main/webapp/static/js/weekly/weekly.js b/src/main/webapp/static/js/weekly/weekly.js
index 78a073e..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,8 @@
},
done: function (res, curr, count) {
$(".layui-table-cell").css('overflow', 'visible');//瑙ｅ喅layui鏁版嵁琛ㄦ牸涓祵濂椾笅鎷夋鏄剧ず闂
- $(".laytable-cell-2-0-7").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;
@@ -936,7 +937,11 @@
}
})
location.reload();
+
return false;
+ });
+ $('#cancelBtn').on('click', function () {
+ location.reload();
});
// 鏄庣粏琛ㄦ牸
var xxDataList = [];
@@ -950,17 +955,17 @@
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}
// ,{field: 'comment', title: '璇勮', style: 'color: blue;font-weight: bold', edit:false}
- ,{field: 'weeklyMatter', title: '闇�鍗忓姪浜嬮」', style: 'color: blue;font-weight: bold', edit:true}
+ // ,{field: 'weeklyMatter', title: '闇�鍗忓姪浜嬮」', style: 'color: blue;font-weight: bold', edit:true}
// ,{field: 'dailyTime$', align: 'center',title: '鏃ユ姤鏃ユ湡'}
// ,{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: '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'}
]],
@@ -974,14 +979,17 @@
},
done: function (res, curr, count) {
$(".layui-table-cell").css('overflow', 'visible');//瑙ｅ喅layui鏁版嵁琛ㄦ牸涓祵濂椾笅鎷夋鏄剧ず闂
- $(".laytable-cell-2-0-6").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++) {
@@ -1003,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, // 璁剧疆涓哄悓姝ユ墽琛�
@@ -1130,6 +1140,9 @@
title: (exp ? '淇敼' : '娣诲姞') + '鏄庣粏',
content: $('#matEditDialog').html(),
success: function (layero, dIndex) {
+ if (!exp){
+ indexDelSign = 1;
+ }
// 鍥炴樉鏁版嵁
form.val('matEditForm', exp);
// 琛ㄥ崟鎻愪氦浜嬩欢
--
Gitblit v1.9.1