From 3201d90a534327383f26061cb770e2f91035764e Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Fri, 21 Jan 2022 14:07:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Models/Report.php                         |  16 +-
 .../js/pages/manage/components/Report.vue     | 145 +++++++++---------
 .../js/pages/manage/components/ReportEdit.vue |  12 +-
 3 files changed, 87 insertions(+), 86 deletions(-)

diff --git a/app/Models/Report.php b/app/Models/Report.php
index 5b04efe8..100ba10a 100644
--- a/app/Models/Report.php
+++ b/app/Models/Report.php
@@ -21,24 +21,26 @@ use JetBrains\PhpStorm\Pure;
  * @property string $title 标题
  * @property string $type 汇报类型
  * @property int $userid
- * @property string|null $content
+ * @property string $content
+ * @property string $sign 汇报唯一标识
+ * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ReportReceive[] $Receives
+ * @property-read int|null $receives_count
+ * @property-read mixed $receives
+ * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\User[] $receivesUser
+ * @property-read int|null $receives_user_count
+ * @property-read \App\Models\User|null $sendUser
  * @method static Builder|Report newModelQuery()
  * @method static Builder|Report newQuery()
  * @method static Builder|Report query()
  * @method static Builder|Report whereContent($value)
  * @method static Builder|Report whereCreatedAt($value)
  * @method static Builder|Report whereId($value)
+ * @method static Builder|Report whereSign($value)
  * @method static Builder|Report whereTitle($value)
  * @method static Builder|Report whereType($value)
  * @method static Builder|Report whereUpdatedAt($value)
  * @method static Builder|Report whereUserid($value)
  * @mixin \Eloquent
- * @property string $sign 汇报唯一标识
- * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ReportReceive[] $Receives
- * @property-read int|null $receives_count
- * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\User[] $receivesUser
- * @property-read int|null $receives_user_count
- * @method static Builder|Report whereSign($value)
  */
 class Report extends AbstractModel
 {
diff --git a/resources/assets/js/pages/manage/components/Report.vue b/resources/assets/js/pages/manage/components/Report.vue
index 31433c9d..611eac71 100644
--- a/resources/assets/js/pages/manage/components/Report.vue
+++ b/resources/assets/js/pages/manage/components/Report.vue
@@ -1,24 +1,24 @@
 <template>
-  <div class="report">
-    <Tabs v-model="reportTabs">
-      <TabPane :label="$L('填写汇报')" name="edit">
-        <ReportEdit :id="reportId" @saveSuccess="saveSuccess"></ReportEdit>
-      </TabPane>
-      <TabPane :label="$L('我的汇报')" name="my">
-        <ReportMy v-if="reportTabs === 'my'" @detail="showDetail" @edit="editReport"></ReportMy>
-      </TabPane>
-      <TabPane :label="tabRebder(reportUnreadNumber)" name="receive">
-        <ReportReceive v-if="reportTabs === 'receive'" @detail="showDetail"></ReportReceive>
-      </TabPane>
-    </Tabs>
-    <DrawerOverlay
-        v-model="showDetailDrawer"
-        placement="right"
-        :size="950"
-        transfer>
-      <ReportDetail :data="detailData"/>
-    </DrawerOverlay>
-  </div>
+    <div class="report">
+        <Tabs v-model="reportTabs">
+            <TabPane :label="$L('填写汇报')" name="edit">
+                <ReportEdit :id="reportId" @saveSuccess="saveSuccess"></ReportEdit>
+            </TabPane>
+            <TabPane :label="$L('我的汇报')" name="my">
+                <ReportMy v-if="reportTabs === 'my'" @detail="showDetail" @edit="editReport"></ReportMy>
+            </TabPane>
+            <TabPane :label="tabRebder(reportUnreadNumber)" name="receive">
+                <ReportReceive v-if="reportTabs === 'receive'" @detail="showDetail"></ReportReceive>
+            </TabPane>
+        </Tabs>
+        <DrawerOverlay
+            v-model="showDetailDrawer"
+            placement="right"
+            :size="950"
+            transfer>
+            <ReportDetail :data="detailData"/>
+        </DrawerOverlay>
+    </div>
 </template>
 
 <script>
@@ -27,66 +27,65 @@ import ReportMy from "./ReportMy"
 import ReportReceive from "./ReportReceive"
 import ReportDetail from "./ReportDetail"
 import DrawerOverlay from "../../../components/DrawerOverlay";
-import {mapState} from "vuex";
 
 export default {
-  name: "Report",
-  components: {
-    DrawerOverlay,
-    ReportEdit, ReportMy, ReportReceive, ReportDetail
-  },
-  props: {
-    reportUnreadNumber: {
-      type: Number,
-      default: 0
+    name: "Report",
+    components: {
+        DrawerOverlay,
+        ReportEdit, ReportMy, ReportReceive, ReportDetail
     },
-    reportType:{
-      default: "my"
-    }
-  },
-  data() {
-    return {
-      reportTabs: "my",
-      showDetailDrawer: false,
-      detailData: {},
-      reportId: 0,
-      tabRebder: data => {
-        return h => {
-          if(data > 0){
-            return h('div', [
-              h('span', { class: 'navbar-item-content' }, '收到的汇报'),
-              h('Badge', { class: 'manage-box-report' }, data),
-            ])
-          }else {
-            return h('div', [
-              h('span', { class: 'navbar-item-content' }, '收到的汇报'),
-            ])
-          }
+    props: {
+        reportUnreadNumber: {
+            type: Number,
+            default: 0
+        },
+        reportType: {
+            default: "my"
         }
-      }
-    }
-  },
-  mounted() {
-    this.reportTabs = this.reportType;
-  },
-  methods: {
-    showDetail(row) {
-      this.showDetailDrawer = true;
-      this.detailData = row;
-      //1.5秒后执行
-      setTimeout(() => {
-        this.$emit("read");
-      }, 1500);
     },
-    editReport(id) {
-      this.reportId = id;
-      this.reportTabs = "edit";
+    data() {
+        return {
+            reportTabs: "my",
+            showDetailDrawer: false,
+            detailData: {},
+            reportId: 0,
+            tabRebder: data => {
+                return h => {
+                    if (data > 0) {
+                        return h('div', [
+                            h('span', {class: 'navbar-item-content'}, '收到的汇报'),
+                            h('Badge', {class: 'manage-box-report'}, data),
+                        ])
+                    } else {
+                        return h('div', [
+                            h('span', {class: 'navbar-item-content'}, '收到的汇报'),
+                        ])
+                    }
+                }
+            }
+        }
     },
-    saveSuccess() {
-      this.reportId = 0;
-      this.reportTabs = "my";
+    mounted() {
+        this.reportTabs = this.reportType;
+    },
+    methods: {
+        showDetail(row) {
+            this.showDetailDrawer = true;
+            this.detailData = row;
+            //1.5秒后执行
+            setTimeout(() => {
+                this.$emit("read");
+            }, 1500);
+        },
+        editReport(id) {
+            this.reportId = id;
+            this.reportTabs = "edit";
+        },
+        saveSuccess() {
+            this.reportId = 0;
+            this.reportTabs = "my";
+        }
     }
-  }
 }
 </script>
 
diff --git a/resources/assets/js/pages/manage/components/ReportEdit.vue b/resources/assets/js/pages/manage/components/ReportEdit.vue
index 11204402..cae039e4 100644
--- a/resources/assets/js/pages/manage/components/ReportEdit.vue
+++ b/resources/assets/js/pages/manage/components/ReportEdit.vue
@@ -78,12 +78,12 @@ export default {
     data() {
         return {
             reportData: {
-                title: ""
-                , content: ""
-                , type: "weekly"
-                , receive: []
-                , id: 0
-                , offset: 0 // 以当前日期为基础的周期偏移量。例如选择了上一周那么就是 -1，上一天同理。
+                title: "",
+                content: "",
+                type: "weekly",
+                receive: [],
+                id: 0,
+                offset: 0 // 以当前日期为基础的周期偏移量。例如选择了上一周那么就是 -1，上一天同理。
             },
             disabledType: false,
             userInputShow: true,