From 2d544a98a3f506cb625e861346c710e52b73c2f5 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 15 四月 2024 08:51:36 +0800
Subject: [PATCH] #
---
src/main/webapp/views/weekly/weekly.html | 4 ++--
src/main/webapp/static/js/weekly/weekly.js | 33 ++++++++++++++++++---------------
src/main/resources/application.yml | 2 +-
3 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 64fa213..58d79a9 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -20,7 +20,7 @@
# url: jdbc:sqlserver://192.168.4.15:1433;databasename=zy_crm
# username: sa
# password: sa@123
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=zy_crm
+ url: jdbc:sqlserver://192.168.4.15:1433;databasename=zy_crm
username: sa
password: sa@123
# url: jdbc:sqlserver://127.0.0.1:51433;databasename=zy_crm
diff --git a/src/main/webapp/static/js/weekly/weekly.js b/src/main/webapp/static/js/weekly/weekly.js
index 47d267b..78a073e 100644
--- a/src/main/webapp/static/js/weekly/weekly.js
+++ b/src/main/webapp/static/js/weekly/weekly.js
@@ -115,8 +115,8 @@
,{field: 'status$', 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}
@@ -143,6 +143,9 @@
pageSize: 'limit'
},
parseData: function (res) {
+ res.data.records.forEach((item,index) => {
+ item.nowUserId = nowUserId2
+ })
return {
'code': res.code,
'msg': res.msg,
@@ -355,9 +358,9 @@
{type: 'numbers'}
,{field: 'weeklyDay$', align: 'center',title: '鏄熸湡'}
,{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: '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: '瀹℃牳杩涘害'}
@@ -418,9 +421,9 @@
{type: 'numbers'}
,{field: 'weeklyDay$', align: 'center',title: '鏄熸湡'}
,{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: '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: '瀹℃牳杩涘害'}
@@ -617,10 +620,10 @@
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: '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: '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: '瀹℃牳杩涘害'}
@@ -877,7 +880,7 @@
function showEditModel2(expTpe) {
admin.open({
type: 1,
- title: (expTpe ? '鍒涘缓' : '鍒涘缓') + '鏃ヨ绋�',
+ title: (expTpe ? '鍒涘缓' : '鍒涘缓') + '鏃ョ粨鏋�',
content: $('#editDialog').html(),
area: '2200px',
success: function (layero, dIndex) {
@@ -947,10 +950,10 @@
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: '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: '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: '瀹℃牳杩涘害'}
diff --git a/src/main/webapp/views/weekly/weekly.html b/src/main/webapp/views/weekly/weekly.html
index 15c69bc..f9b3d19 100644
--- a/src/main/webapp/views/weekly/weekly.html
+++ b/src/main/webapp/views/weekly/weekly.html
@@ -84,7 +84,7 @@
<script type="text/html" id="tbLookReality">
<span class="layui-text">
<a href="javascript:;" lay-event="lookReality">
- <i class="layui-icon" style="font-size: 12px;"></i> 鏌ョ湅鏃ヨ绋�
+ <i class="layui-icon" style="font-size: 12px;"></i> 鏌ョ湅鏃ョ粨鏋�
</a>
</span>
</script>
@@ -113,7 +113,7 @@
{{# } }}
<a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">璁″垝</a>
- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="editReality">琛岀▼</a>
+ <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="editReality">缁撴灉</a>
<a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
</script>
--
Gitblit v1.9.1