From f614347a41aa29d5050e3da3a921cdc204c23dde Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 19 四月 2024 15:38:52 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/weekly/weekly.html                          |   28 ++++++++++++++--------------
 src/main/java/com/zy/crm/manager/controller/WeeklyController.java |    1 +
 2 files changed, 15 insertions(+), 14 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 487c42a..c39bd11 100644
--- a/src/main/java/com/zy/crm/manager/controller/WeeklyController.java
+++ b/src/main/java/com/zy/crm/manager/controller/WeeklyController.java
@@ -370,6 +370,7 @@
                     weeklyDailyPlanService.insert(weeklyDailyPlan);
                     WeeklyDailyReality weeklyDailyReality = new WeeklyDailyReality();
                     weeklyDailyReality.sync(weeklyDailyPlan);
+                    weeklyDailyReality.setWorkContent("");
                     weeklyDailyRealityService.insert(weeklyDailyReality);
 
                 } catch (Exception e){
diff --git a/src/main/webapp/views/weekly/weekly.html b/src/main/webapp/views/weekly/weekly.html
index af4c297..beab96a 100644
--- a/src/main/webapp/views/weekly/weekly.html
+++ b/src/main/webapp/views/weekly/weekly.html
@@ -118,14 +118,14 @@
                                 <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="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="memo" label="澶囨敞" width="120">
@@ -161,7 +161,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="鍛ㄨ鍒�" :label-width="formLabelWidth">
-                    <el-button type="primary" @click="addWeekPlan">娣诲姞鏃ヨ鍒�</el-button>
+                    <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>
@@ -177,16 +177,16 @@
                                 </el-select>
                             </div>
                         </el-table-column>
-                        <el-table-column prop="workContent" label="宸ヤ綔鍐呭鍙婄洰鐨�" width="180">
+                        <el-table-column prop="workContent" label="缁撴灉" width="180">
                             <div class="item" slot-scope="scope">
-                                <el-input v-model="scope.row.workContent" placeholder="宸ヤ綔鍐呭鍙婄洰鐨�"></el-input>
+                                <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="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>
@@ -300,7 +300,7 @@
                                 <el-table-column property="cstmrId$" label="鐢叉柟鍗曚綅"></el-table-column>
                                 <el-table-column property="dailyTime$" label="鏃ユ湡"></el-table-column>
                                 <el-table-column width="180" property="workContent" label="缁撴灉"></el-table-column>
-                                <el-table-column property="weeklyMatter" label="闇�鍗忓姪浜嬮」"></el-table-column>
+<!--                                <el-table-column property="weeklyMatter" label="闇�鍗忓姪浜嬮」"></el-table-column>-->
                                 <el-table-column property="addr" label="鍦板潃"></el-table-column>
                                 <el-table-column property="memo" label="澶囨敞"></el-table-column>
                             </el-table>

--
Gitblit v1.9.1