From 1323bba4206346c87d4a8e6c8c7d14d7ede9a66d Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Thu, 7 Apr 2022 22:51:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B7=A5=E4=BD=9C=E5=8C=85=E6=8B=AC?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=86=85=E5=AE=B9=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Api/ReportController.php |  3 +-
 .../js/pages/manage/components/Report.vue     |  2 +-
 .../js/pages/manage/components/ReportEdit.vue | 34 +++++++++----------
 .../js/pages/manage/components/ReportMy.vue   |  7 ++--
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/app/Http/Controllers/Api/ReportController.php b/app/Http/Controllers/Api/ReportController.php
index 902a76118..986979fd5 100755
--- a/app/Http/Controllers/Api/ReportController.php
+++ b/app/Http/Controllers/Api/ReportController.php
@@ -282,7 +282,7 @@ class ReportController extends AbstractController
         }
         // 生成唯一标识
         $sign = Report::generateSign($type, 0, Carbon::instance($start_time));
-        $one = Report::query()->whereSign($sign)->whereType($type)->first();
+        $one = Report::whereSign($sign)->whereType($type)->first();
         // 如果已经提交了相关汇报
         if ($one && $id > 0) {
             return Base::retSuccess('success', [
@@ -292,7 +292,6 @@ class ReportController extends AbstractController
             ]);
         }
 
-
         // 已完成的任务
         $completeContent = "";
         $complete_task = ProjectTask::query()
diff --git a/resources/assets/js/pages/manage/components/Report.vue b/resources/assets/js/pages/manage/components/Report.vue
index 2a5ea6d64..2767cbd27 100644
--- a/resources/assets/js/pages/manage/components/Report.vue
+++ b/resources/assets/js/pages/manage/components/Report.vue
@@ -111,7 +111,6 @@ export default {
         },
 
         onEditReport(id) {
-            this.reportId = id;
             if (this.$Electron) {
                 let config = {
                     title: this.$L(id > 0 ? '修改报告' : '新增报告'),
@@ -126,6 +125,7 @@ export default {
                     config
                 });
             } else {
+                this.reportId = id;
                 this.showEditDrawer = true;
             }
         },
diff --git a/resources/assets/js/pages/manage/components/ReportEdit.vue b/resources/assets/js/pages/manage/components/ReportEdit.vue
index 030c22d1e..c7ab72311 100644
--- a/resources/assets/js/pages/manage/components/ReportEdit.vue
+++ b/resources/assets/js/pages/manage/components/ReportEdit.vue
@@ -74,35 +74,33 @@ export default {
                 id: 0,
                 offset: 0 // 以当前日期为基础的周期偏移量。例如选择了上一周那么就是 -1，上一天同理。
             },
-            prevCycleText: "",
-            nextCycleText: "",
+            prevCycleText: this.$L("上一周"),
+            nextCycleText: this.$L("下一周"),
         };
     },
     watch: {
-        id(val) {
-            if (this.id > 0) {
-                this.getDetail(val);
-            } else {
-                this.reportData.offset = 0;
-                this.reportData.type = "weekly";
-                this.reportData.receive = [];
-                this.getTemplate();
-            }
+        id: {
+            handler(val) {
+                if (val > 0) {
+                    this.getDetail(val);
+                } else {
+                    this.reportData.offset = 0;
+                    this.reportData.type = "weekly";
+                    this.reportData.receive = [];
+                    this.getTemplate();
+                }
+            },
+            immediate: true
         },
     },
     computed: {
         ...mapState(["userId"])
     },
     mounted() {
-        this.getTemplate();
+        //
     },
     methods: {
-        initLanguage() {
-            this.prevCycleText = this.$L("上一周");
-            this.nextCycleText = this.$L("下一周");
-        },
-
-        handleSubmit: function () {
+        handleSubmit() {
             if (this.reportData.receive.length === 0) {
                 $A.messageError(this.$L("请选择接收人"));
                 return false;
diff --git a/resources/assets/js/pages/manage/components/ReportMy.vue b/resources/assets/js/pages/manage/components/ReportMy.vue
index 0d979cf32..f5b1e8c61 100644
--- a/resources/assets/js/pages/manage/components/ReportMy.vue
+++ b/resources/assets/js/pages/manage/components/ReportMy.vue
@@ -142,8 +142,11 @@ export default {
                         },
                         on: {
                             action: (name) => {
-                                if (name === 'edit') this.$emit("on-edit", row.id);
-                                if (name === 'view') this.$emit("on-view", row);
+                                if (name === 'edit') {
+                                    this.$emit("on-edit", row.id);
+                                } else if (name === 'view') {
+                                    this.$emit("on-view", row);
+                                }
                             }
                         }
                     });