From 80df6d082ded0224e74372e452d68a25603f0847 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Mon, 8 Jul 2024 16:26:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/App.vue                           | 107 +++++++++++++++---
 sgzb-ui/src/api/system/notice.js              |  16 +++
 .../return/apply/component/addReturn.vue      |  13 ++-
 .../return/receive/component/home.vue         |   5 +-
 4 files changed, 120 insertions(+), 21 deletions(-)

diff --git a/sgzb-ui/src/App.vue b/sgzb-ui/src/App.vue
index 29de49f1..ab9ab38f 100644
--- a/sgzb-ui/src/App.vue
+++ b/sgzb-ui/src/App.vue
@@ -1,28 +1,105 @@
 <template>
-  <div id="app">
-    <router-view />
-    <theme-picker />
-  </div>
+    <div id="app">
+        <router-view />
+        <theme-picker />
+    </div>
 </template>
 
 <script>
-import ThemePicker from "@/components/ThemePicker";
+import ThemePicker from '@/components/ThemePicker'
+import { getHomeNoticeApi, setQueryNoticeApi } from '@/api/system/notice.js'
 
 export default {
-  name: "App",
-  components: { ThemePicker },
+    name: 'App',
+    components: { ThemePicker },
     metaInfo() {
         return {
-            title: this.$store.state.settings.dynamicTitle && this.$store.state.settings.title,
-            titleTemplate: title => {
-                return title ? `${title} - ${process.env.VUE_APP_TITLE}` : process.env.VUE_APP_TITLE
-            }
+            title:
+                this.$store.state.settings.dynamicTitle &&
+                this.$store.state.settings.title,
+            titleTemplate: (title) => {
+                return title
+                    ? `${title} - ${process.env.VUE_APP_TITLE}`
+                    : process.env.VUE_APP_TITLE
+            },
         }
-    }
-};
+    },
+    data() {
+        return {
+            notifyPromise: Promise.resolve(),
+            whiteList: [
+                '/login',
+                '/register',
+                '/auth/sendCode',
+                '/qrCode/qrCodePage',
+            ],
+            isWindowRefresh: false,
+        }
+    },
+    mounted() {
+        // window.addEventListener('beforeunload', this.handleBeforeUnload)
+        // if (this.isWindowRefresh) {
+        //     this.getHomeNoticeFun()
+        // }
+    },
+
+    updated() {
+        // if (!this.isWindowRefresh) {
+        //     this.getHomeNoticeFun()
+        // }
+    },
+
+    methods: {
+        async getHomeNoticeFun() {
+            const urlHref = window.location.href
+            const isWhite = this.whiteList.some((e) => urlHref.indexOf(e) > 1)
+
+            if (isWhite) {
+                return
+            }
+            const res = await getHomeNoticeApi()
+            if (res.code == 200) {
+                res.data.forEach((item) => {
+                    this.notifyPromise = this.notifyPromise.then(() => {
+                        this.$notify({
+                            title: `通知公告`,
+                            dangerouslyUseHTMLString: true,
+                            message: `${item.noticeContent}`,
+                            duration: 0,
+                            onClose: async () => {
+                                const params = {
+                                    noticeId: item.noticeId,
+                                    userId: sessionStorage.getItem('userId'),
+                                }
+                                const res = await setQueryNoticeApi(params)
+                            },
+                        })
+                    })
+                })
+            }
+        },
+        handleBeforeUnload() {
+            this.isWindowRefresh = true
+        },
+    },
+}
 </script>
-<style scoped>
+<style scoped >
 #app .theme-picker {
-  display: none;
+    display: none;
+}
+</style>
+
+<style lang="scss">
+.el-notification {
+    width: 440px;
+}
+.el-notification__title {
+    font-size: 18px;
+}
+.el-notification__content {
+    margin: 15px 0;
+    font-size: 16px;
+    line-height: 1.5;
 }
 </style>
diff --git a/sgzb-ui/src/api/system/notice.js b/sgzb-ui/src/api/system/notice.js
index c274ea5b..6a5053ec 100644
--- a/sgzb-ui/src/api/system/notice.js
+++ b/sgzb-ui/src/api/system/notice.js
@@ -41,4 +41,20 @@ export function delNotice(noticeId) {
     url: '/system/notice/' + noticeId,
     method: 'delete'
   })
+}
+
+// 首页公告查询 
+export function getHomeNoticeApi() {
+  return request({
+    url: '/system/notice/getList',
+    method: 'get'
+  })
+}
+// 首页公告关闭时通知后台 下次登录将不会提醒
+export function setQueryNoticeApi(data) {
+  return request({
+    url: '/system/notice/addUserId',
+    method: 'post',
+    data: data
+  })
 }
\ No newline at end of file
diff --git a/sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn.vue b/sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn.vue
index cacd5599..def11236 100644
--- a/sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn.vue
+++ b/sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn.vue
@@ -100,8 +100,6 @@
                     v-model="queryParams.phone"
                     placeholder="请输入退料人电话"
                     clearable
-                    maxlength="11"
-                    onkeyup="this.value = this.value.replace(/[^\d]/g,'');"
                     style="width: 240px"
                 />
             </el-form-item>
@@ -429,10 +427,15 @@ export default {
                     {
                         required: true,
                         message: '请输入退料人手机号',
-                        trigger: 'change',
+                        trigger: 'blur',
                     },
-                    { validator: validatePhone, trigger: 'blur' },
-                    { min: 11, message: '手机号不足11位', trigger: 'blur' },
+                    {
+                        pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+                        message: '请输入正确的手机号码',
+                        trigger: 'blur',
+                    },
+                    // { validator: validatePhone, trigger: 'blur' },
+                    // { min: 11, message: '手机号不足11位', trigger: 'blur' },
                 ],
             },
             unitList: [], //单位 集合
diff --git a/sgzb-ui/src/views/claimAndreturn/return/receive/component/home.vue b/sgzb-ui/src/views/claimAndreturn/return/receive/component/home.vue
index bb1d2e4b..d8cfdefe 100644
--- a/sgzb-ui/src/views/claimAndreturn/return/receive/component/home.vue
+++ b/sgzb-ui/src/views/claimAndreturn/return/receive/component/home.vue
@@ -224,7 +224,10 @@
                         @click="handleReturn(scope.row, 'see')"
                         icon="el-icon-d-arrow-right"
                         v-hasPermi="['return:receive:handler']"
-                        v-if="scope.row.taskStatus != '40'"
+                        v-if="
+                            scope.row.taskStatus == 38 ||
+                            scope.row.taskStatus == 39
+                        "
                     >
                         退料
                     </el-button>