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 | 178 +++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 149 insertions(+), 29 deletions(-)
diff --git a/src/main/webapp/static/js/weekly/weekly.js b/src/main/webapp/static/js/weekly/weekly.js
index a79ee16..2c8ade7 100644
--- a/src/main/webapp/static/js/weekly/weekly.js
+++ b/src/main/webapp/static/js/weekly/weekly.js
@@ -5,6 +5,20 @@
var htmlCstmrData;
var indexS = "9999,8888";
var indexDelSign = 0;
+let nowUserId2 = 0;
+fWeekly();
+function fWeekly() {
+ layui.jquery.ajax({
+ url: baseUrl + "/dashboard/user/id/popup/auth",
+ data:{token : localStorage.getItem('token')},
+ method: 'GET',
+ success: function (res) {
+ if (res.code === 200) {
+ nowUserId2 = res.data;
+ }
+ }
+ })
+}
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
}).extend({
@@ -21,6 +35,8 @@
admin = layui.admin;
$('#organization').html(localStorage.getItem('nickname') + ' <i class="layui-icon"></i>');
+ $(".laytable-cell-2-0-7").css('color', 'rgba(0, 0, 0, 0)');
+
// 閮ㄩ棬浜哄憳 绛涢��
dropdown.render({
@@ -97,22 +113,25 @@
,{field: 'deptId$', align: 'center',title: '鎵�灞為儴闂�',hide : true}
,{field: 'cstmrIdsReality', align: 'center',title: '瀹為檯鐢叉柟鍗曚綅ID闆嗗悎',hide : true}
,{field: 'status$', align: 'center',title: '鐘舵��',hide : false}
- ,{field: 'settle$', align: 'center',title: '杩涘害',hide : false}
,{field: 'settleMsg', align: 'center',title: '瀹℃牳杩涘害',hide : true}
,{field: 'weeklyDailyPlan', align: 'center',title: '鏃ヨ鍒�',hide : false, toolbar: '#tbLookPlan'}
- ,{field: 'weeklyDailyReality', align: 'center',title: '鏃ヨ绋�',hide : false, toolbar: '#tbLookReality'}
- ,{field: 'comment', align: 'center',title: '璇勮',hide : false}
+ ,{field: 'weeklyDailyReality', align: 'center',title: '鏃ョ粨鏋�',hide : false, toolbar: '#tbLookReality'}
+ // ,{field: 'comment', align: 'center',title: '璇勮',hide : false}
,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳',hide : true}
,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿',hide : true}
,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳',hide : true}
,{field: 'updateTime$', align: 'center',title: 'update_time',hide : true}
,{field: 'memo', align: 'center',title: '澶囨敞锛�50瀛楋級',hide : false}
- ,{field: 'director$', align: 'center',title: '瀹℃壒浜�',hide : true}
+ ,{field: 'director$', align: 'center',title: '瀹℃牳鑺傜偣',hide : true}
+ ,{field: 'director', align: 'center',title: '瀹℃牳鑺傜偣',hide : true}
+ ,{field: 'settle', align: 'center',title: '杩涘害',hide : true}
,{field: 'settleSize', align: 'center',title: '娴佺▼闀垮害',hide : true}
+ ,{field: 'settle$', align: 'center',title: '杩涘害', style: 'color: #1890ff;cursor:pointer', event: 'more',hide: false}
,{field: 'settleCurrent', align: 'center',title: '褰撳墠杩涘害',hide : true}
,{field: 'cstmrIdsPlan', align: 'center',title: '璁″垝鐢叉柟鍗曚綅ID闆嗗悎',hide : true}
,{field: 'weeklyAll', align: 'center',title: '鍛ㄦ暟',hide : true}
,{field: 'weeklyNowMonth', align: 'center',title: '褰撴湀绗嚑鍛�',hide : true}
+ ,{field: 'nowUserId', align: 'center', title: 'nowUserId', hide: true, templet:function(){ return nowUserId2 }}
,{field: 'weeklyYear', align: 'center',title: '骞�',hide : true}
,{field: 'weeklyMonth', align: 'center',title: '鏈�',hide : true}
,{field: 'weeklyDay', align: 'center',title: '鏃�',hide : true}
@@ -124,6 +143,9 @@
pageSize: 'limit'
},
parseData: function (res) {
+ res.data.records.forEach((item,index) => {
+ item.nowUserId = nowUserId2
+ })
return {
'code': res.code,
'msg': res.msg,
@@ -288,7 +310,6 @@
url: baseUrl+"/weekly/delete/auth",
headers: {'token': localStorage.getItem('token')},
data: {ids: data.id},
- method: 'POST',
traditional:true,
success: function (res) {
if (res.code === 200){
@@ -336,17 +357,17 @@
cols: [[
{type: 'numbers'}
,{field: 'weeklyDay$', align: 'center',title: '鏄熸湡'}
- ,{field: 'dailyTime$', align: 'center',title: '鏃ユ湡'}
- ,{field: 'workContent', align: 'center', title: '宸ヤ綔鍐呭', edit:false}
- ,{field: 'workPurpose', title: '宸ヤ綔鐩殑', edit:false}
- ,{field: 'comment', title: '璇勮', edit:false}
+ ,{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}
+ // ,{field: 'comment', title: '璇勮', edit:false}
,{field: 'weeklyMatter', title: '闇�鍗忓姪浜嬮」', edit:false}
// ,{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'}//, templet: function () { return htmlCstme;}
,{field: 'memo', align: 'center',title: '澶囨敞', edit:false}
]],
request: {
@@ -399,17 +420,17 @@
cols: [[
{type: 'numbers'}
,{field: 'weeklyDay$', align: 'center',title: '鏄熸湡'}
- ,{field: 'dailyTime$', align: 'center',title: '鏃ユ湡'}
- ,{field: 'workContent', align: 'center', title: '宸ヤ綔鍐呭', edit:false}
- ,{field: 'workPurpose', title: '宸ヤ綔鐩殑', edit:false}
- ,{field: 'comment', title: '璇勮', edit:false}
+ ,{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}
+ // ,{field: 'comment', title: '璇勮', edit:true}
,{field: 'weeklyMatter', title: '闇�鍗忓姪浜嬮」', edit:false}
// ,{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'}//, templet: function () { return htmlCstme;}
,{field: 'memo', align: 'center',title: '澶囨敞', edit:false}
]],
request: {
@@ -435,8 +456,84 @@
}
});
break;
+ case 'approval':
+ layer.confirm('瀹℃壒閫氳繃锛�', {
+ skin: 'layui-layer-admin',
+ shade: .1,
+ offset: '200px',
+ title: data.name
+ }, function (i) {
+ layer.close(i);
+ approval(data.id);
+ });
+ break;
+ case 'approvalEnd':
+ layer.confirm('瀹℃壒鎷掔粷锛�', {
+ skin: 'layui-layer-admin',
+ shade: .1,
+ offset: '200px',
+ title: data.name
+ }, function (i) {
+ layer.close(i);
+ approvalEnd(data.id);
+ });
+ break;
}
});
+
+ function approvalEnd(weeklyId, plannerId, dIdx) {
+ let loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/weekly/approvalEnd/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ weeklyId: weeklyId,
+ plannerId: plannerId
+ },
+ method: 'POST',
+ success: function (res) {
+ if (dIdx) {
+ layer.close(dIdx);
+ }
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ }
+
+ function approval(weeklyId, plannerId, dIdx) {
+ let loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/weekly/approval/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ weeklyId: weeklyId,
+ plannerId: plannerId
+ },
+ method: 'POST',
+ success: function (res) {
+ if (dIdx) {
+ layer.close(dIdx);
+ }
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ }
// 鎼滅储
form.on('submit(search)', function (data) {
@@ -504,7 +601,12 @@
}
}
})
+ location.reload();
+
return false;
+ });
+ $('#cancelBtn').on('click', function () {
+ location.reload();
});
// 鏄庣粏琛ㄦ牸
var xxDataList = [];
@@ -518,16 +620,17 @@
cols: [[
{type: 'numbers', title: '#'}
,{field: 'weeklyDay$', align: 'center',title: '鏄熸湡'}
- ,{field: 'workContent', title: '宸ヤ綔鍐呭', style: 'color: blue;font-weight: bold', edit:true}
- ,{field: 'workPurpose', title: '宸ヤ綔鐩殑', style: 'color: blue;font-weight: bold', edit:true}
- ,{field: 'comment', title: '璇勮', style: 'color: blue;font-weight: bold', edit:true}
+ ,{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: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: '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'}
]],
@@ -541,7 +644,8 @@
},
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;
@@ -777,7 +881,7 @@
function showEditModel2(expTpe) {
admin.open({
type: 1,
- title: (expTpe ? '鍒涘缓' : '鍒涘缓') + '鏃ヨ绋�',
+ title: (expTpe ? '鍒涘缓' : '鍒涘缓') + '鏃ョ粨鏋�',
content: $('#editDialog').html(),
area: '2200px',
success: function (layero, dIndex) {
@@ -832,7 +936,12 @@
}
}
})
+ location.reload();
+
return false;
+ });
+ $('#cancelBtn').on('click', function () {
+ location.reload();
});
// 鏄庣粏琛ㄦ牸
var xxDataList = [];
@@ -846,16 +955,17 @@
cols: [[
{type: 'numbers', title: '#'}
,{field: 'weeklyDay$', align: 'center',title: '鏄熸湡'}
- ,{field: 'workContent', title: '宸ヤ綔鍐呭', style: 'color: blue;font-weight: bold', edit:true}
- ,{field: 'workPurpose', title: '宸ヤ綔鐩殑', style: 'color: blue;font-weight: bold', edit:true}
- ,{field: 'comment', title: '璇勮', style: 'color: blue;font-weight: bold', edit:true}
- ,{field: 'weeklyMatter', title: '闇�鍗忓姪浜嬮」', style: 'color: blue;font-weight: bold', edit:true}
+ ,{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: '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'}
]],
@@ -869,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++) {
@@ -898,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, // 璁剧疆涓哄悓姝ユ墽琛�
@@ -1025,6 +1140,9 @@
title: (exp ? '淇敼' : '娣诲姞') + '鏄庣粏',
content: $('#matEditDialog').html(),
success: function (layero, dIndex) {
+ if (!exp){
+ indexDelSign = 1;
+ }
// 鍥炴樉鏁版嵁
form.val('matEditForm', exp);
// 琛ㄥ崟鎻愪氦浜嬩欢
@@ -1130,8 +1248,10 @@
// 鍏抽棴鍔ㄤ綔
$(document).on('click','#data-detail-close', function () {
parent.layer.closeAll();
+ location.reload();
});
+
function tableReload(child) {
var searchData = {};
$.each($('#search-box [name]').serializeArray(), function() {
--
Gitblit v1.9.1