Browse Source

feature(消息通知):省二院到款及经费报销提醒消息通知开发

yanglingling 8 months ago
parent
commit
e6d08505fe

+ 1 - 1
src/router.ts

@@ -198,7 +198,7 @@ const router = createRouter({
   routes: routes as any[],
   history: createWebHistory()
 })
-const whiteList = ['/login', '/tenant', '/register', '/training', '/training/enroll']
+const whiteList = ['/login', '/tenant', '/register', '/training', '/training/enroll', '/fund/claim/edit', '/fund/reimbursement-remind/edit']
 router.beforeEach(async (to, from, next) => {
   const storesUseUserInfo = useUserInfo()
   // // 微信授权码获取openId

+ 28 - 2
src/view/fund/claim/edit.vue

@@ -61,12 +61,15 @@
   import { useDictApi } from '/@/api/system/dict'
   import { getDictLabel, formatAmountYuan } from '/@/utils/other'
   import { useClaimApi } from '/@/api/fund/claim'
+  import { useLoginApi } from '/@/api/login'
+  import { Local, Session } from '/@/utils/storage'
   const storesUseUserInfo = useUserInfo()
-  const { userInfos } = storeToRefs(storesUseUserInfo)
+  const { userInfos, openId, unionId } = storeToRefs(storesUseUserInfo)
   const route = useRoute()
   const router = useRouter()
   const configApi = useConfigApi()
   const fundApi = useFundApi()
+  const loginApi = useLoginApi()
   const dictApi = useDictApi()
   const claimApi = useClaimApi()
   const serviceList = ref([])
@@ -171,7 +174,30 @@
       }
     })
   }
-  onMounted(() => {
+  onMounted(async () => {
+    // 进行openId登录
+    const code: string = route.query.code ? route.query.code.toString() : ''
+    console.log('11111111111111111111111')
+    let param = {
+      code: code,
+      unionId: unionId.value,
+      user_name: userInfos.value?.userName,
+      tenant: Local.get('Tenant'),
+    }
+
+    if (code) {
+      console.log('2222222222222222222222')
+      const [err, res]: ToResponse = await to(loginApi.weChatLogin(param))
+      if (err) {
+        // 跳转到登录页面
+        Local.remove('token')
+        router.push('/login')
+        return
+      }
+      // 存储 token 到浏览器缓存
+      Local.set('token', res?.data?.token)
+    }
+
     const id = route.query.id ? +route.query.id : 0
     getDict()
     getFundDetail(id)

+ 27 - 1
src/view/fund/reimbursement/edit.vue

@@ -130,12 +130,15 @@
   import { useExpenseApi } from '/@/api/base/expense'
   import { useFundCardApi } from '/@/api/fund/card'
   import { useBaseReimburseApi } from '/@/api/fund/reimburse'
+  import { useLoginApi } from '/@/api/login'
+  import { Local, Session } from '/@/utils/storage'
   const storesUseUserInfo = useUserInfo()
-  const { userInfos } = storeToRefs(storesUseUserInfo)
+  const { userInfos, openId, unionId } = storeToRefs(storesUseUserInfo)
   const route = useRoute()
   const router = useRouter()
   const expenseRemindApi = useExpenseRemindApi()
   const fundApi = useFundApi()
+  const loginApi = useLoginApi()
   const dictApi = useDictApi()
   const expenseApi = useExpenseApi()
   const configApi = useConfigApi()
@@ -484,6 +487,29 @@
     })
   }
   onMounted(async () => {
+    // 进行openId登录
+    const code: string = route.query.code ? route.query.code.toString() : ''
+    console.log('11111111111111111111111')
+    let param = {
+      code: code,
+      unionId: unionId.value,
+      user_name: userInfos.value?.userName,
+      tenant: Local.get('Tenant'),
+    }
+
+    if (code) {
+      console.log('2222222222222222222222')
+      const [err, res]: ToResponse = await to(loginApi.weChatLogin(param))
+      if (err) {
+        // 跳转到登录页面
+        Local.remove('token')
+        router.push('/login')
+        return
+      }
+      // 存储 token 到浏览器缓存
+      Local.set('token', res?.data?.token)
+    }
+
     const id = route.query.id ? +route.query.id : 0
     await getDict()
     await getFundDetail(id)

+ 1 - 1
src/view/login/index.vue

@@ -68,7 +68,7 @@ import { useConfigApi } from '/@/api/system/config'
       password: '',
       idKeyC: '',
       idValueC: '',
-      tenantName: ''    
+      tenantName: ''
     }
   })
   const codeUrl = ref('')

+ 5 - 5
src/view/login/tenant.vue

@@ -37,10 +37,10 @@
     if (res?.data) {
       state.list = [
         ...res.data,
-        // {
-        //   id: 'default',
-        //   name: '默认'
-        // }
+        {
+          id: 'default',
+          name: '默认'
+        }
       ]
     }
   }
@@ -61,7 +61,7 @@
     padding: 0 10px;
     flex-direction: column;
     ul {
-    margin-top: 10px;   
+    margin-top: 10px;
       li {
         border-radius: 4px;
         background-color: #f8f9fd;