From cc85911b19cc25838f19ffb2fbb120fbc72b2fb4 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 29 三月 2024 13:00:32 +0800
Subject: [PATCH] #周计划
---
src/main/java/com/zy/crm/manager/entity/WeeklyDailyPlan.java | 10 +++
src/main/webapp/static/js/weekly/weekly.js | 81 +++++++++++++++++++++-----
src/main/java/com/zy/crm/manager/controller/WeeklyController.java | 20 ++++++
src/main/java/com/zy/crm/manager/entity/WeeklyDailyReality.java | 10 +++
4 files changed, 103 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/WeeklyController.java b/src/main/java/com/zy/crm/manager/controller/WeeklyController.java
index 7ee351b..5226b02 100644
--- a/src/main/java/com/zy/crm/manager/controller/WeeklyController.java
+++ b/src/main/java/com/zy/crm/manager/controller/WeeklyController.java
@@ -414,12 +414,20 @@
if (Cools.isEmpty(weeklyDailyPlan)){
throw new CoolException("鏇存柊澶辫触锛歩d:"+weeklyDailyPlanId);
}
- weeklyDailyPlan1.setComment(weeklyDailyPlan1.getComment()+";"+weeklyDailyPlan.getComment());
+ if (!Cools.isEmpty(weeklyDailyPlan1.getComment())){
+// weeklyDailyPlan1.setComment(weeklyDailyPlan1.getComment()+";"+weeklyDailyPlan.getComment());
+ weeklyDailyPlan1.setComment(weeklyDailyPlan.getComment());
+ }else {
+ weeklyDailyPlan1.setComment(weeklyDailyPlan.getComment());
+ }
weeklyDailyPlan1.setWorkContent(weeklyDailyPlan.getWorkContent());
weeklyDailyPlan1.setWorkPurpose(weeklyDailyPlan.getWorkPurpose());
weeklyDailyPlan1.setMemo(weeklyDailyPlan.getMemo());
weeklyDailyPlan1.setUpdateBy(getUserId());
weeklyDailyPlan1.setUpdateTime(now);
+ if (!Cools.isEmpty(weeklyDailyPlan.getCstmrId())){
+ weeklyDailyPlan1.setCstmrId(weeklyDailyPlan1.getCstmrId());
+ }
weeklyDailyPlanService.updateById(weeklyDailyPlan1);
}else {
@@ -504,12 +512,20 @@
if (Cools.isEmpty(weeklyDailyReality)){
throw new CoolException("鏇存柊澶辫触锛歩d:"+weeklyDailyPlanId);
}
- weeklyDailyReality1.setComment(weeklyDailyReality1.getComment()+";"+weeklyDailyReality.getComment());
+ if (!Cools.isEmpty(weeklyDailyReality1.getComment())){
+// weeklyDailyReality1.setComment(weeklyDailyReality1.getComment()+";"+weeklyDailyReality.getComment());
+ weeklyDailyReality1.setComment(weeklyDailyReality.getComment());
+ }else {
+ weeklyDailyReality1.setComment(weeklyDailyReality.getComment());
+ }
weeklyDailyReality1.setWorkContent(weeklyDailyReality.getWorkContent());
weeklyDailyReality1.setWorkPurpose(weeklyDailyReality.getWorkPurpose());
weeklyDailyReality1.setMemo(weeklyDailyReality.getMemo());
weeklyDailyReality1.setUpdateBy(getUserId());
weeklyDailyReality1.setUpdateTime(now);
+ if (!Cools.isEmpty(weeklyDailyReality.getCstmrId())){
+ weeklyDailyReality1.setCstmrId(weeklyDailyReality.getCstmrId());
+ }
weeklyDailyRealityService.updateById(weeklyDailyReality1);
}else {
diff --git a/src/main/java/com/zy/crm/manager/entity/WeeklyDailyPlan.java b/src/main/java/com/zy/crm/manager/entity/WeeklyDailyPlan.java
index d9bf1aa..d2d9385 100644
--- a/src/main/java/com/zy/crm/manager/entity/WeeklyDailyPlan.java
+++ b/src/main/java/com/zy/crm/manager/entity/WeeklyDailyPlan.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
+import com.zy.crm.manager.service.CstmrService;
import com.zy.crm.manager.service.WeeklyCostTypesService;
import com.zy.crm.system.entity.*;
import com.zy.crm.system.service.*;
@@ -350,6 +351,15 @@
}
}
+ public String getCstmrId$(){
+ CstmrService service = SpringUtils.getBean(CstmrService.class);
+ Cstmr cstmr = service.selectById(this.cstmrId);
+ if (!Cools.isEmpty(cstmr)){
+ return String.valueOf(cstmr.getName());
+ }
+ return null;
+ }
+
public String getWeeklyDay$(){
if (null == this.weeklyDay){ return ""; }
WeeklyCostTypesService weeklyCostTypesService = SpringUtils.getBean(WeeklyCostTypesService.class);
diff --git a/src/main/java/com/zy/crm/manager/entity/WeeklyDailyReality.java b/src/main/java/com/zy/crm/manager/entity/WeeklyDailyReality.java
index d228742..38e4339 100644
--- a/src/main/java/com/zy/crm/manager/entity/WeeklyDailyReality.java
+++ b/src/main/java/com/zy/crm/manager/entity/WeeklyDailyReality.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
+import com.zy.crm.manager.service.CstmrService;
import com.zy.crm.manager.service.WeeklyCostTypesService;
import com.zy.crm.system.entity.*;
import com.zy.crm.system.service.*;
@@ -326,6 +327,15 @@
return null;
}
+ public String getCstmrId$(){
+ CstmrService service = SpringUtils.getBean(CstmrService.class);
+ Cstmr cstmr = service.selectById(this.cstmrId);
+ if (!Cools.isEmpty(cstmr)){
+ return String.valueOf(cstmr.getName());
+ }
+ return null;
+ }
+
public String getStatus$(){
if (null == this.status){ return null; }
switch (this.status){
diff --git a/src/main/webapp/static/js/weekly/weekly.js b/src/main/webapp/static/js/weekly/weekly.js
index 01194a5..a79ee16 100644
--- a/src/main/webapp/static/js/weekly/weekly.js
+++ b/src/main/webapp/static/js/weekly/weekly.js
@@ -346,7 +346,7 @@
// ,{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: 'cstmrId$', align: 'center',title: '鐢叉柟鍗曚綅ID'}//, templet: function () { return htmlCstme;}
,{field: 'memo', align: 'center',title: '澶囨敞', edit:false}
]],
request: {
@@ -409,7 +409,7 @@
// ,{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: 'cstmrId$', align: 'center',title: '鐢叉柟鍗曚綅ID'}//, templet: function () { return htmlCstme;}
,{field: 'memo', align: 'center',title: '澶囨敞', edit:false}
]],
request: {
@@ -549,29 +549,22 @@
// 鑾峰彇褰撳墠琛屾暟鎹�
table.getRowData = function(elem){
var index = $(elem).closest('tr').data('index');
- console.log("index-----")
- console.log(index)
var indexArray = indexS.split(","); // 灏嗗瓧绗︿覆鎷嗗垎涓烘暟缁�
// 閬嶅巻鏁扮粍涓殑姣忎釜鍏冪礌
for (var i = 0; i < indexArray.length; i++) {
var element = Number(indexArray[i]);
// 杩涜鐩稿簲鐨勬搷浣�
- console.log("element-----");
- console.log(element);
if (element===index){
indexSign = 1;
}
}
if (indexSign === 0){
indexS = indexS+","+index;
- console.log("indexS-----")
- console.log(indexS)
}
return table.cache[options.id][index] || {};
};
if (indexSign === 0 && indexDelSign === 0){
- console.log("娓叉煋")
// 娓叉煋鎼滅储妯℃澘
$.ajax({
url: baseUrl+"/cstmr/all/get/kv",
@@ -582,10 +575,10 @@
method: 'POST',
// async: false, // 璁剧疆涓哄悓姝ユ墽琛�
success: function (res) {
- console.log(res)
- console.log($("#cstmrId").html())
+ // console.log(res)
+ // console.log($("#cstmrId").html())
res.data.forEach((item) => {
- console.log(item)
+ // console.log(item)
$("#cstmrId").append("<option value='" + item.value + "';"+" class=\"cstmrDetl\""+">" + item.name + "</option>")
})
}
@@ -593,7 +586,7 @@
}
$('.select-cstmr').on('change', function(){
- console.log("cstmrId")
+ // console.log("cstmrId")
var value = this.value; // 鑾峰彇閫変腑椤� value
var data = table.getRowData(this);
xxDataList.forEach(res => {
@@ -876,19 +869,52 @@
},
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-6").css('color', 'rgba(0, 0, 0, 0)');
$(layero).find('.layui-table-view').css('margin', '0');
var options = this;
-
+ var indexSign = 0;
// 鑾峰彇褰撳墠琛屾暟鎹�
table.getRowData = function(elem){
var index = $(elem).closest('tr').data('index');
+ var indexArray = indexS.split(","); // 灏嗗瓧绗︿覆鎷嗗垎涓烘暟缁�
+ // 閬嶅巻鏁扮粍涓殑姣忎釜鍏冪礌
+ for (var i = 0; i < indexArray.length; i++) {
+ var element = Number(indexArray[i]);
+ // 杩涜鐩稿簲鐨勬搷浣�
+ if (element===index){
+ indexSign = 1;
+ }
+ }
+ if (indexSign === 0){
+ indexS = indexS+","+index;
+ }
return table.cache[options.id][index] || {};
};
+ if (indexSign === 0 && indexDelSign === 0){
+ // 娓叉煋鎼滅储妯℃澘
+ $.ajax({
+ url: baseUrl+"/cstmr/all/get/kv",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ limit: 9999
+ },
+ method: 'POST',
+ // async: false, // 璁剧疆涓哄悓姝ユ墽琛�
+ success: function (res) {
+ // console.log(res)
+ // console.log($("#cstmrId").html())
+ res.data.forEach((item) => {
+ // console.log(item)
+ $("#cstmrId").append("<option value='" + item.value + "';"+" class=\"cstmrDetl\""+">" + item.name + "</option>")
+ })
+ }
+ })
+ }
+
$('.select-cstmr').on('change', function(){
- console.log("cstmrId")
+ // console.log("cstmrId")
var value = this.value; // 鑾峰彇閫変腑椤� value
var data = table.getRowData(this);
xxDataList.forEach(res => {
@@ -899,6 +925,29 @@
}
})
});
+
+ $(document).ready(function () {
+ $.ajax({
+ url: baseUrl + "/cstmr/all/get/kv",
+ headers: { 'token': localStorage.getItem('token') },
+ data: {
+ limit: 9999
+ },
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200) {
+ // console.log("res111111111111")
+ // console.log(res)
+ var template = $('#cstmrId').html(); // 鑾峰彇妯℃澘鍐呭
+ var compiledTemplate = Handlebars.compile(template); // 缂栬瘧妯℃澘
+ var html = compiledTemplate(res.data); // 灏嗘暟鎹簲鐢ㄥ埌妯℃澘涓�
+ $('.select-cstmr').html(html); // 娓叉煋妯℃澘鍒伴〉闈�
+ } else {
+ // 澶勭悊寮傚父鎯呭喌
+ }
+ }
+ });
+ });
},
size: ''
};
--
Gitblit v1.9.1