From 59292e68b11c383948b436e755a4aad8abf1ce24 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 19 四月 2024 15:32:06 +0800
Subject: [PATCH] #
---
src/main/webapp/views/weekly/weekly.html | 138 +++++++++++++++++++++++++++++++++++++++++++++-
src/main/java/com/zy/crm/manager/controller/WeeklyController.java | 40 ++++++++-----
2 files changed, 160 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 96064e7..487c42a 100644
--- a/src/main/java/com/zy/crm/manager/controller/WeeklyController.java
+++ b/src/main/java/com/zy/crm/manager/controller/WeeklyController.java
@@ -649,9 +649,6 @@
try{
weeklyDailyPlanService.insert(weeklyDailyPlan);
- WeeklyDailyReality weeklyDailyReality = new WeeklyDailyReality();
- weeklyDailyReality.sync(weeklyDailyPlan);
- weeklyDailyRealityService.insert(weeklyDailyReality);
} catch (Exception e){
log.error("鏂板鏃ヨ鍒掑け璐�"+e);
throw new CoolException("鏂板鏃ヨ鍒掑け璐�");
@@ -681,9 +678,10 @@
throw new CoolException("鍙傛暟涓虹┖锛歐eeklyId");
} else if (Cools.isEmpty(param.getType())){
throw new CoolException("鍙傛暟涓虹┖锛歍ype");
- } else if (Cools.isEmpty(param.getWeeklyType())){
- throw new CoolException("鍙傛暟涓虹┖锛歐eekly");
}
+// else if (Cools.isEmpty(param.getWeeklyType())){
+// throw new CoolException("鍙傛暟涓虹┖锛歐eekly");
+// }
Date now = new Date();
Weekly weekly = weeklyService.selectById(param.getWeeklyId());
weekly.setUpdateBy(getUserId());
@@ -704,23 +702,35 @@
throw new CoolException("鏇存柊鍛ㄨ鍒掍富琛ㄥけ璐�");
}
- List<CstmrUtilsParam> cstmrUtilsParamList = new ArrayList<>();
+ List<WeeklyDailyReality> weeklyDailyRealitieList = weeklyDailyRealityService.selectList(new EntityWrapper<WeeklyDailyReality>().eq("weekly_id", weekly.getId()));
+ List<Long> ids = new ArrayList<>();
+ for (WeeklyDailyReality weeklyDailyReality: param.getWeeklyDailyRealityList()) {
+ if (!Cools.isEmpty(weeklyDailyReality.getId())) {
+ ids.add(weeklyDailyReality.getId());
+ }
+ }
+ try{
+ for (WeeklyDailyReality weeklyDailyReality2:weeklyDailyRealitieList){
+ if (!ids.contains(weeklyDailyReality2.getId())){
+ weeklyDailyRealityService.deleteById(weeklyDailyReality2.getId());
+ }
+ }
+ }catch (Exception e){
+
+ }
for (WeeklyDailyReality weeklyDailyReality: param.getWeeklyDailyRealityList()){
WeeklyDailyReality weeklyDailyReality1 = new WeeklyDailyReality();
if (!Cools.isEmpty(weeklyDailyReality.getId())){
- Long weeklyDailyPlanId = weeklyDailyReality.getId();
+ Long weeklyDailyRealityId = weeklyDailyReality.getId();
weeklyDailyReality1 = weeklyDailyRealityService.selectById(weeklyDailyReality.getId());
- if (Cools.isEmpty(weeklyDailyReality)){
- throw new CoolException("鏇存柊澶辫触锛歩d:"+weeklyDailyPlanId);
+ if (Cools.isEmpty(weeklyDailyReality1)){
+ throw new CoolException("鏇存柊澶辫触锛歩d:"+weeklyDailyRealityId);
}
- if (!Cools.isEmpty(weeklyDailyReality1.getComment())){
-// weeklyDailyReality1.setComment(weeklyDailyReality1.getComment()+";"+weeklyDailyReality.getComment());
- weeklyDailyReality1.setComment(weeklyDailyReality.getComment());
- }else {
- weeklyDailyReality1.setComment(weeklyDailyReality.getComment());
- }
+ weeklyDailyReality1.setComment(weeklyDailyReality.getComment());
weeklyDailyReality1.setWorkContent(weeklyDailyReality.getWorkContent());
weeklyDailyReality1.setWorkPurpose(weeklyDailyReality.getWorkPurpose());
+ weeklyDailyReality1.setWeeklyMatter(weeklyDailyReality.getWeeklyMatter());
+ weeklyDailyReality1.setAddr(weeklyDailyReality.getAddr());
weeklyDailyReality1.setMemo(weeklyDailyReality.getMemo());
weeklyDailyReality1.setUpdateBy(getUserId());
weeklyDailyReality1.setUpdateTime(now);
diff --git a/src/main/webapp/views/weekly/weekly.html b/src/main/webapp/views/weekly/weekly.html
index 98b494c..af4c297 100644
--- a/src/main/webapp/views/weekly/weekly.html
+++ b/src/main/webapp/views/weekly/weekly.html
@@ -148,7 +148,69 @@
</div>
</el-dialog>
-
+ <el-dialog title="鏃ョ粨鏋�" :visible.sync="updateRealityDialogFormVisible" style="width: 1800px">
+ <el-form :model="formReality" style="width: 100%">
+ <el-form-item label="鏃ユ湡" :label-width="formLabelWidth">
+ <el-select v-model="formReality.name">
+ <el-option
+ v-for="item in addWeekPlanDataWeeklySignReality"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鍛ㄨ鍒�" :label-width="formLabelWidth">
+ <el-button type="primary" @click="addWeekPlan">娣诲姞鏃ヨ鍒�</el-button>
+ <el-table :data="weeklyFormDataReality" border style="width: 100%">
+ <el-table-column fixed :data="addWeekPlanData" prop="weeklyDay" label="鏄熸湡" width="150">
+ </el-table-column>
+ <el-table-column prop="cstmrId" label="鐢叉柟鍗曚綅" width="180">
+ <div class="item" slot-scope="scope">
+ <el-select v-model="scope.row.cstmrId" placeholder="鐢叉柟鍗曚綅">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.name"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </div>
+ </el-table-column>
+ <el-table-column prop="workContent" label="宸ヤ綔鍐呭鍙婄洰鐨�" width="180">
+ <div class="item" slot-scope="scope">
+ <el-input v-model="scope.row.workContent" placeholder="宸ヤ綔鍐呭鍙婄洰鐨�"></el-input>
+ </div>
+ </el-table-column>
+ <el-table-column prop="weeklyMatter" label="闇�鍗忓姪浜嬮」" width="120">
+ <div class="item" slot-scope="scope">
+ <el-input v-model="scope.row.weeklyMatter" placeholder="闇�鍗忓姪浜嬮」"></el-input>
+ </div>
+ </el-table-column>
+ <el-table-column prop="addr" label="鍦板潃" width="180">
+ <div class="item" slot-scope="scope">
+ <el-input v-model="scope.row.addr" placeholder="鍦板潃"></el-input>
+ </div>
+ </el-table-column>
+ <el-table-column prop="memo" label="澶囨敞" width="120">
+ <div class="item" slot-scope="scope">
+ <el-input v-model="scope.row.memo" placeholder="澶囨敞"></el-input>
+ </div>
+ </el-table-column>
+ <el-table-column :show="false" property="weeklyDay$" label="鏃ユ湡" v-if="false"></el-table-column>
+ <el-table-column fixed="right" label="鎿嶄綔" width="100">
+ <template slot-scope="scope">
+ <el-button @click="delWeeklyRealityUpdate(scope.row)" type="text" size="del-weekly-plan">鍒犻櫎</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-form-item>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button @click="updateRealityDialogFormVisible = false, weeklyFormDataRealityInit()">鍙栨秷</el-button>
+ <el-button type="primary" @click="updateRealityDialogFormVisible = false, updateRealityWeekly(formReality,false)">纭畾</el-button>
+ </div>
+ </el-dialog>
<el-dialog
title="鏄熸湡"
:visible.sync="addWeekPlanVisible"
@@ -262,7 +324,7 @@
<template slot-scope="scope">
<el-button @click="delWeekly(scope.row)" type="text" size="del-weekly">鍒犻櫎</el-button>
<el-button @click="showUpdatePlanWeekly(scope.row)" type="text" size="del-weekly">璁″垝</el-button>
- <el-button @click="updateRWeekly(scope.row)" type="text" size="del-weekly">缁撴灉</el-button>
+ <el-button @click="showUpdateRealityWeekly(scope.row)" type="text" size="del-weekly">缁撴灉</el-button>
</template>
</el-table-column>
</el-table>
@@ -290,10 +352,13 @@
weeklyDailyRealityData: [],
dialogFormVisible: false,
updatePlanDialogFormVisible: false,
+ updateRealityDialogFormVisible: false,
form: {},
formPlan: {},
+ formReality: {},
formLabelWidth: '120px',
addWeekPlanVisible: false,
+ addWeekRealityVisible: false,
addWeekPlanDataWeeklySign: [
{
value: '1',
@@ -309,10 +374,12 @@
}
],
addWeekPlanDataWeeklySignPlan: [],
+ addWeekPlanDataWeeklySignReality: [],
addWeekPlanData: [],
addWeekPlanValue: [],
weeklyFormData: [],
weeklyFormDataPlan: [],
+ weeklyFormDataReality: [],
options: [],
// 闇�瑕佺紪杈戠殑灞炴��
editProp: ['cstmrId','workContent','weeklyMatter','memo']
@@ -412,6 +479,11 @@
this.formPlan.name = []
this.updatePlanDialogFormVisible = false
},
+ weeklyFormDataRealityInit(){
+ this.weeklyFormDataReality = []
+ this.formReality.name = []
+ this.updateRealityDialogFormVisible = false
+ },
showWeeklyDailyPlan(id) {
let that = this;
// console.log(id)
@@ -446,6 +518,9 @@
},
addWeekPlan() {
this.addWeekPlanVisible = true;
+ },
+ addWeekReality() {
+ this.addWeekRealityVisible = true;
},
addWeekly(res,isExpAdd){
let that = this;
@@ -494,6 +569,24 @@
that.updatePlanDialogFormVisible = true
},
+ showUpdateRealityWeekly(res) {
+ let that = this;
+ that.formReality.name = res.weeklyDayMonth
+ that.formReality.weeklyId = res.id
+ // that.formPlan.weeklyMonth = res.weeklyMonth
+ $.ajax({
+ url: baseUrl + '/weeklyDailyReality/list/auth',
+ headers: {'token': localStorage.getItem('token')},
+ method: "get",
+ data: {
+ weekly_id: res.id
+ },
+ success: (res) => {
+ that.weeklyFormDataReality = res.data.records;
+ }
+ });
+ that.updateRealityDialogFormVisible = true
+ },
updatePlanWeekly(res,isExpAdd){
let that = this;
that.updatePlanDialogFormVisible = false
@@ -511,7 +604,6 @@
contentType:'application/json;charset=UTF-8',
method: 'POST',
success: (res) => {
- weeklyFormData=[]
},
error: function (jqXHR, textStatus, errorThrown) {
// 鍦ㄨ繖閲屽仛閿欒澶勭悊:
@@ -522,9 +614,37 @@
that.formPlan.name = []
that.formPlan.weeklyId = 0
},
+ updateRealityWeekly(res,isExpAdd){
+ let that = this;
+ that.updateRDialogFormVisible = false
+ let weeklyFormDataReality = this.weeklyFormDataReality;
+ $.ajax({
+ url: baseUrl+"/weekly/from/" + (isExpAdd?"add":"modify") + "/auth2",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify({
+ // weeklyType: Number(that.formPlan.weeklyMonth),
+ weeklyId: that.formReality.weeklyId,
+ // type: Number(data.field.type),
+ type: Number(1),
+ weeklyDailyRealityList: weeklyFormDataReality
+ }),
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: (res) => {
+ },
+ error: function (jqXHR, textStatus, errorThrown) {
+ // 鍦ㄨ繖閲屽仛閿欒澶勭悊:
+ console.log('Error occurred: ', textStatus, errorThrown);
+ }
+ })
+ that.weeklyFormDataPlan = []
+ that.formReality.name = []
+ that.formReality.weeklyId = 0
+ },
addWeekPlanConfirm() {
let list = this.weeklyFormData
let listPlan = this.weeklyFormDataPlan
+ let listReality = this.weeklyFormDataReality
let value = this.addWeekPlanValue
if (value.length > 0) {
value.forEach((item,idx) => {
@@ -534,11 +654,15 @@
listPlan.push({
weeklyDay: item
})
+ listReality.push({
+ weeklyDay: item
+ })
})
}
this.weeklyFormData = list;
this.weeklyFormDataPlan = listPlan;
+ this.weeklyFormDataReality = listReality;
console.log(list)
this.addWeekPlanVisible = false;
this.addWeekPlanValue = [];
@@ -559,6 +683,14 @@
this.weeklyFormDataPlan.splice(index, 1);
}
},
+ delWeeklyRealityUpdate(row) {
+ // 鎵惧埌瑕佸垹闄ょ殑琛屽湪鏁版嵁鍒楄〃涓殑绱㈠紩
+ const index = this.weeklyFormDataReality.findIndex(item => item === row);
+ if (index !== -1) {
+ // 閫氳繃splice鏂规硶鍒犻櫎璇ヨ
+ this.weeklyFormDataReality.splice(index, 1);
+ }
+ },
delWeekly(row) {
let that = this;
// 鎵惧埌瑕佸垹闄ょ殑琛屽湪鏁版嵁鍒楄〃涓殑绱㈠紩
--
Gitblit v1.9.1