From 8e76493cc633d308cc242d76c1358f377127158b Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Mon, 17 Apr 2023 11:59:41 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=B7=A5=E4=BD=9C=E6=8A=A5=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/assets/js/App.vue                   |  2 ++
 .../assets/js/components/Mobile/Tabbar.vue    | 14 ++++++++-
 resources/assets/js/pages/manage.vue          |  6 +++-
 .../js/pages/manage/components/Report.vue     | 10 +++++--
 .../pages/manage/components/ReportDetail.vue  | 30 +++++++++++++++++--
 .../js/pages/manage/components/ReportMy.vue   |  3 ++
 .../pages/manage/components/ReportReceive.vue | 14 +++++++--
 resources/assets/sass/components/mobile.scss  |  7 +++++
 resources/assets/sass/components/report.scss  | 20 +++++++++----
 9 files changed, 90 insertions(+), 16 deletions(-)

diff --git a/resources/assets/js/App.vue b/resources/assets/js/App.vue
index f2e6f5284..c2673f143 100755
--- a/resources/assets/js/App.vue
+++ b/resources/assets/js/App.vue
@@ -227,6 +227,8 @@ export default {
             this.$store.state.windowHeight = $A(window).height()
             this.$store.state.windowLarge = this.$store.state.windowWidth > 768
             this.$store.state.windowSmall = this.$store.state.windowWidth <= 768
+            this.$store.state.formLabelPosition = this.$store.state.windowWidth > 576 ? 'right' : 'top'
+            this.$store.state.formLabelWidth = this.$store.state.windowWidth > 576 ? 'auto' : ''
         },
 
         windowScrollListener() {
diff --git a/resources/assets/js/components/Mobile/Tabbar.vue b/resources/assets/js/components/Mobile/Tabbar.vue
index b8d1ce662..9666eea67 100644
--- a/resources/assets/js/components/Mobile/Tabbar.vue
+++ b/resources/assets/js/components/Mobile/Tabbar.vue
@@ -12,6 +12,7 @@
                         <div class="more-item">
                             <i class="taskfont" v-html="item.icon"></i>
                             <div class="tabbar-title">{{$L(item.label)}}</div>
+                            <Badge v-if="item.name === 'workReport'" class="tabbar-badge" :overflow-count="999" :count="reportUnreadNumber"/>
                         </div>
                     </li>
                 </ul>
@@ -29,6 +30,9 @@
                 <template v-else-if="item.name === 'dialog'">
                     <Badge class="tabbar-badge" :overflow-count="999" :text="msgUnreadMention"/>
                 </template>
+                <template v-else-if="item.name === 'more'">
+                    <Badge class="tabbar-badge" :overflow-count="999" :count="reportUnreadNumber"/>
+                </template>
             </li>
         </ul>
         <Modal
@@ -77,6 +81,9 @@ export default {
                     {icon: '&#xe7b8;', name: 'addTask', label: '添加任务'},
                     {icon: '&#xe7c1;', name: 'createMeeting', label: '新会议'},
                     {icon: '&#xe794;', name: 'joinMeeting', label: '加入会议'},
+                ],
+                [
+                    {icon: '&#xe7c0;', name: 'workReport', label: '工作报告'},
                 ]
             ],
 
@@ -90,6 +97,9 @@ export default {
         if ($A.isEEUiApp) {
             this.navMore[0].splice(2, 0, {icon: '&#xe602;', name: 'scan', label: '扫一扫'})
         }
+        if (this.userIsAdmin) {
+            this.navMore[2].splice(0, 0, {icon: '&#xe63f;', name: 'allUser', label: '团队管理'})
+        }
     },
 
     mounted() {
@@ -101,7 +111,7 @@ export default {
     },
 
     computed: {
-        ...mapState(['cacheDialogs']),
+        ...mapState(['userIsAdmin', 'cacheDialogs', 'reportUnreadNumber']),
         ...mapGetters(['dashboardTask']),
 
         routeName() {
@@ -241,6 +251,8 @@ export default {
 
                 case 'addTask':
                 case 'addProject':
+                case 'allUser':
+                case 'workReport':
                     return;
 
                 case 'createMeeting':
diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue
index 48c7969b7..0cfb7714a 100644
--- a/resources/assets/js/pages/manage.vue
+++ b/resources/assets/js/pages/manage.vue
@@ -254,7 +254,7 @@
             v-model="workReportShow"
             placement="right"
             :size="1200">
-            <Report v-if="workReportShow" :reportType="reportTabs" @on-read="$store.dispatch('getReportUnread', 1000)" />
+            <Report v-if="workReportShow" v-model="reportTabs" @on-read="$store.dispatch('getReportUnread', 1000)" />
         </DrawerOverlay>
 
         <!--查看所有团队-->
@@ -1048,6 +1048,10 @@ export default {
                 case 'addProject':
                     this.onAddShow()
                     break;
+                case 'allUser':
+                case 'workReport':
+                    this.settingRoute(act)
+                    break;
             }
         },
 
diff --git a/resources/assets/js/pages/manage/components/Report.vue b/resources/assets/js/pages/manage/components/Report.vue
index 8592abf7f..bbbee8cce 100644
--- a/resources/assets/js/pages/manage/components/Report.vue
+++ b/resources/assets/js/pages/manage/components/Report.vue
@@ -41,7 +41,7 @@ export default {
     },
 
     props: {
-        reportType: {
+        value: {
             default: "my"
         }
     },
@@ -57,7 +57,7 @@ export default {
     },
 
     mounted() {
-        this.reportTabs = this.reportType;
+        this.reportTabs = this.value;
         //
         if (this.$isMainElectron) {
             this.$Electron.listenerOnly('reportSaveSuccess', ({data, msg}) => {
@@ -73,6 +73,12 @@ export default {
         ])
     },
 
+    watch: {
+        reportTabs(val) {
+            this.$emit("input", val)
+        }
+    },
+
     methods: {
         tabRebder(num) {
             return h => {
diff --git a/resources/assets/js/pages/manage/components/ReportDetail.vue b/resources/assets/js/pages/manage/components/ReportDetail.vue
index e8fba118a..f9b246328 100644
--- a/resources/assets/js/pages/manage/components/ReportDetail.vue
+++ b/resources/assets/js/pages/manage/components/ReportDetail.vue
@@ -4,8 +4,8 @@
             {{ data.title }}
             <Icon v-if="loadIng > 0" type="ios-loading" class="icon-loading"></Icon>
         </div>
-        <div class="report-detail-context">
-            <Form class="report-form" label-width="auto" inline>
+        <div v-if="formLabelWidth === 'auto'" class="report-detail-context">
+            <Form class="report-form auto-form" label-width="auto" inline>
                 <FormItem :label="$L('汇报人')">
                     <UserAvatar :userid="data.userid" :size="28"/>
                 </FormItem>
@@ -17,7 +17,26 @@
                     <UserAvatar v-else v-for="(item, key) in data.receives_user" :key="key" :userid="item.userid" :size="28"/>
                 </FormItem>
             </Form>
-            <Form class="report-form" label-width="auto">
+            <Form class="report-form auto-form" label-width="auto">
+                <FormItem :label="$L('汇报内容')">
+                    <div class="report-content" v-html="data.content"></div>
+                </FormItem>
+            </Form>
+        </div>
+        <div v-else class="report-detail-context">
+            <Form class="report-form" :labelPosition="formLabelPosition" :labelWidth="formLabelWidth">
+                <template v-if="formLabelWidth !== 'auto'">
+                    <FormItem :label="$L('汇报人')">
+                        <UserAvatar :userid="data.userid" :size="28"/>
+                    </FormItem>
+                    <FormItem :label="$L('提交时间')">
+                        {{ data.created_at }}
+                    </FormItem>
+                    <FormItem :label="$L('汇报对象')">
+                        <template v-if="data.receives_user.length === 0">-</template>
+                        <UserAvatar v-else v-for="(item, key) in data.receives_user" :key="key" :userid="item.userid" :size="28"/>
+                    </FormItem>
+                </template>
                 <FormItem :label="$L('汇报内容')">
                     <div class="report-content" v-html="data.content"></div>
                 </FormItem>
@@ -27,6 +46,8 @@
 </template>
 
 <script>
+import {mapState} from "vuex";
+
 export default {
     name: "ReportDetail",
     props: {
@@ -39,6 +60,9 @@ export default {
             loadIng: 0,
         }
     },
+    computed: {
+        ...mapState(['formLabelPosition', 'formLabelWidth']),
+    },
     watch: {
         'data.id': {
             handler(id) {
diff --git a/resources/assets/js/pages/manage/components/ReportMy.vue b/resources/assets/js/pages/manage/components/ReportMy.vue
index 5118b3a42..54ab708e7 100644
--- a/resources/assets/js/pages/manage/components/ReportMy.vue
+++ b/resources/assets/js/pages/manage/components/ReportMy.vue
@@ -80,6 +80,9 @@ export default {
                 title: this.$L("名称"),
                 key: 'title',
                 minWidth: 120,
+                render: (h, {row}) => {
+                    return h('AutoTip', row.title);
+                }
             }, {
                 title: this.$L("类型"),
                 key: 'type',
diff --git a/resources/assets/js/pages/manage/components/ReportReceive.vue b/resources/assets/js/pages/manage/components/ReportReceive.vue
index 1de604051..ae4531fce 100644
--- a/resources/assets/js/pages/manage/components/ReportReceive.vue
+++ b/resources/assets/js/pages/manage/components/ReportReceive.vue
@@ -108,16 +108,24 @@ export default {
                             h('Tag', {
                                 props: {   //传递参数
                                     color: "orange",
+                                },
+                                style: {
+                                    flexShrink: 0,
                                 }
                             }, this.$L("未读")),
-                            h('span', row.title)
+                            h('AutoTip', row.title)
                         )
                     } else {
                         arr.push(
-                            h('span', row.title)
+                            h('AutoTip', row.title)
                         )
                     }
-                    return h('div', arr)
+                    return h('div', {
+                        style: {
+                            display: 'flex',
+                            alignItems: 'center',
+                        }
+                    }, arr)
                 }
             }, {
                 title: this.$L("类型"),
diff --git a/resources/assets/sass/components/mobile.scss b/resources/assets/sass/components/mobile.scss
index b65bbcdb1..cfda9ce3f 100644
--- a/resources/assets/sass/components/mobile.scss
+++ b/resources/assets/sass/components/mobile.scss
@@ -124,6 +124,7 @@
                     flex-direction: column;
                     align-items: center;
                     justify-content: center;
+                    position: relative;
 
                     .taskfont {
                         display: flex;
@@ -145,6 +146,12 @@
                         text-overflow: ellipsis;
                         white-space: nowrap;
                     }
+
+                    .tabbar-badge {
+                        position: absolute;
+                        top: -4px;
+                        right: 12px;
+                    }
                 }
             }
         }
diff --git a/resources/assets/sass/components/report.scss b/resources/assets/sass/components/report.scss
index b36242863..0e946f471 100644
--- a/resources/assets/sass/components/report.scss
+++ b/resources/assets/sass/components/report.scss
@@ -81,15 +81,22 @@
     }
 
     .report-form {
-        display: flex;
-        margin-bottom: 12px;
+        &.auto-form {
+            display: flex;
+            margin-bottom: 12px;
+
+            .ivu-form-item {
+                flex: 1;
+                flex-shrink: 0;
+
+                .ivu-form-item-label {
+                    padding-top: 8px;
+                }
+            }
+        }
 
         .ivu-form-item {
-            flex: 1;
-            flex-shrink: 0;
-
             .ivu-form-item-label {
-                padding-top: 8px;
                 opacity: 0.8;
             }
 
@@ -97,6 +104,7 @@
                 line-height: 30px;
                 display: flex;
                 align-items: center;
+
                 .common-avatar {
                     margin-right: 6px;
                 }