Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP20_WEB_GLOBAL

src/packages/pc/components/layouts/header/components/modify/index.vue

@@ -71,9 +71,8 @@ const onSubmit = () => {
     formRef.value?.validate((valid) => {
         if (valid) {
             formSubmit().then(() => {
-                ElMessage.success('密码修改成功').then.then(() => {
-                    eventBus.$emit('LogoutNotify')
-                })
+                ElMessage.success('密码修改成功')
+                eventBus.$emit('LogoutNotify')
             }).catch((err) => {
                 ElMessage.error('提交失败：' + err)
             })

src/packages/pc/components/layouts/header/components/report/index.vue

@@ -0,0 +1,31 @@
+<!-- 交易商结算单 -->
+<template>
+    <app-drawer title="交易商结算单" width="80%" v-model:show="show" :loading="loading" :refresh="refresh">
+        <template #footer>
+            <el-button type="info" @click="onAgree(false)">同意进入系统</el-button>
+            <el-button type="danger" @click="onDisAgree">不同意，退出系统</el-button>
+        </template>
+    </app-drawer>
+</template>
+
+<script lang="ts" setup>
+import { ref } from 'vue'
+import { useRouter } from 'vue-router'
+import eventBus from '@/services/bus'
+import AppDrawer from '@pc/components/base/drawer/index.vue'
+
+const show = ref(true)
+const refresh = ref(false)
+const router = useRouter()
+
+const onAgree = (isRefresh = false) => {
+    show.value = false
+    refresh.value = isRefresh
+}
+
+const onDisAgree = () => {
+    eventBus.$emit('LogoutNotify')
+    router.replace({ name: 'login' })
+}
+
+</script>

src/packages/pc/components/layouts/header/index.vue

@@ -10,6 +10,7 @@
                 <el-badge type="danger" :is-dot="noticeStore.unreadList.length > 0">
                     <app-icon icon="g-icon--notice" @click="openComponent('notice')" />
                 </el-badge>
+                <app-icon icon="Tickets" size="20" @click="openComponent('report')" />
                 <span class="g-icon--minimize" @click="exitFullSreen" v-if="fullScreen"></span>
                 <span class="g-icon--maximize" @click="setFullSreen" v-else></span>
             </div>
@@ -48,6 +49,7 @@ const componentMap = new Map<string, unknown>([
     ['modify', defineAsyncComponent(() => import('./components/modify/index.vue'))],
     ['cancel', defineAsyncComponent(() => import('./components/cancel/index.vue'))],
     ['avater', defineAsyncComponent(() => import('./components/avater/index.vue'))],
+    ['report', defineAsyncComponent(() => import('./components/report/index.vue'))],
 ])
 
 const { componentId, openComponent, closeComponent } = useComponent()