lighter 1 year ago
parent
commit
063b360fba

+ 1 - 1
src/App.vue

@@ -115,7 +115,7 @@ onMounted(() => {
   })
 
   setCallback('sidSingle', async () => {
-    await store.dispatch('user/loginOut')
+    await store.dispatch('user/logout')
     await ElMessageBox.alert('您的账号已在其他地方登陆,如需修改密码请在个人中心中修改。', '提示', {
       type: 'warning',
     })

+ 1 - 1
src/layout/HeaderV2/PasswordLayer.vue

@@ -58,7 +58,7 @@ export default defineComponent({
             }
             changePassword(params).then(() => {
               layerDom.value && layerDom.value.close()
-              store.dispatch('user/loginOut')
+              store.dispatch('user/logout')
             })
           } else {
             return false

+ 3 - 3
src/layout/HeaderV2/ToolInfoBar.vue

@@ -23,7 +23,7 @@
                 <theme/>
             </div>
             <div class="function-list-item" style="width: auto; margin-left: 6px;padding: 0 6px" id="tutorial_user_info">
-                <user-info @password="showPasswordLayer" @loginOut="loginOut"/>
+                <user-info @password="showPasswordLayer" @logout="logout"/>
             </div>
         </div>
         <!-- 修改密码 -->
@@ -55,8 +55,8 @@ const showPasswordLayer = () => {
     layer.show = true
 }
 
-const loginOut = () => {
-    store.dispatch('user/loginOut')
+const logout = () => {
+    store.dispatch('user/logout')
 }
 
 </script>

+ 2 - 2
src/layout/HeaderV2/function-list/user-info/UserInfo.vue

@@ -30,7 +30,7 @@
 
       <div class="button">
         <el-button type="primary" plain @click="emit('password')">修改密码</el-button>
-        <el-button type="danger" plain @click="emit('loginOut')">退出登录</el-button>
+        <el-button type="danger" plain @click="emit('logout')">退出登录</el-button>
       </div>
     </template>
   </el-popover>
@@ -44,7 +44,7 @@ import {genTextPortrait} from '@/utils/portrait'
 import UserInfoDisplay from "@/layout/HeaderV2/function-list/user-info/UserInfoDisplay.vue";
 
 const store = useStore()
-const emit = defineEmits(['password', 'loginOut'])
+const emit = defineEmits(['password', 'logout'])
 
 const userInfo = computed(() => {
   return store.getters['user/info']

+ 7 - 1
src/store/modules/app.js

@@ -22,7 +22,12 @@ const state = () => ({
     emrAutoSave: true
 })
 
-// mutations
+const getters = {
+    windowSize(state) {
+        return state['windowSize']
+    }
+}
+
 const mutations = {
     isCollapseChange(state, type) {
         state.isCollapse = type
@@ -82,6 +87,7 @@ const actions = {}
 export default {
     namespaced: true,
     state,
+    getters,
     actions,
     mutations,
 }

+ 4 - 4
src/store/modules/user.js

@@ -97,7 +97,7 @@ const actions = {
                 commit('sidChange', res.sid)
                 commit('infoChange', res)
 
-                dispatch('getWards').then((infoRes) => {
+                dispatch('getWards').then(() => {
                     resolve(res)
                 })
             })
@@ -108,7 +108,7 @@ const actions = {
         return new Promise((resolve, reject) => {
             getWardsApi().then((res) => {
                 commit('wardsChange', res)
-                dispatch('getMenus').then((menusRes) => {
+                dispatch('getMenus').then(() => {
                     resolve(res)
                 })
             })
@@ -127,8 +127,8 @@ const actions = {
         })
     },
 
-    // login out the system after user click the loginOut button
-    loginOut({commit}) {
+    // login out the system after user click the logout button
+    logout({commit}) {
         localStorage.clear()
         router.push('/login')
     },

+ 6 - 8
src/utils/public.ts

@@ -81,14 +81,9 @@ export const chineseEncrypt = {
 }
 
 export const copyStrFunc = (val: string) => {
-    let input = document.createElement('input')
-    document.body.appendChild(input);
-    input.value = val;
-    input.select();
-    input.setSelectionRange(0, input.value.length);
-    document.execCommand("copy");
-    document.body.removeChild(input);
-    xcMessage.success("复制成功。")
+    navigator.clipboard.writeText(val).then(() => {
+        xcMessage.success("复制成功。")
+    })
 }
 
 // 判断字符串是否包含中文
@@ -109,7 +104,10 @@ export function isContain(element: HTMLElement) {
 }
 
 export const SYSTEM_CONFIG = {
+    // @ts-ignore
     HOSPITAL_NAME: import.meta.env.VITE_HOSPITAL_NAME,
+    // @ts-ignore
     SYSTEM_NAME: import.meta.env.VITE_SYSTEM_NAME,
+    // @ts-ignore
     HOSPITAL_CODE: import.meta.env.VITE_HOSPITAL_CODE,
 }

+ 13 - 19
src/views/medical-insurance/management/LogAnalyse.vue

@@ -74,7 +74,6 @@
           </div>
         </div>
       </el-drawer>
-      <textarea style="opacity: 0; position: fixed" id="copyArea"></textarea>
     </template>
   </page-layer>
 </template>
@@ -83,15 +82,18 @@
 import { computed, reactive, ref } from 'vue'
 import { useStore } from 'vuex'
 import { setlShtcuts } from '@/data/shortcuts'
-import { infnos } from '@/data/index'
-import { selectSiLogs, selectSiLogBody } from '../../../api/medical-insurance/si-log'
-import { recoveryTradePermission } from '../../../utils/permission'
-import { autoRecoveryTrade } from '../../../api/medical-insurance/si-manage'
-import { getDateRangeFormatDate } from '../../../utils/date'
+import { infnos } from '@/data'
+import { selectSiLogs, selectSiLogBody } from '@/api/medical-insurance/si-log'
+import { recoveryTradePermission } from '@/utils/permission'
+import { autoRecoveryTrade } from '@/api/medical-insurance/si-manage'
+import { getDateRangeFormatDate } from '@/utils/date'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import PageLayer from "@/layout/PageLayer";
+import {copyStrFunc} from "@/utils/public";
+
 const store = useStore()
-const windowSize = store.state.app.windowSize
+
+const windowSize = store.getters['app/windowSize']
 const tableHeight = windowSize.h - 85
 const dateRange = ref(null)
 
@@ -192,16 +194,8 @@ const coloredResult = (infcode) => {
 }
 
 const copyLogBodyResult = (flag) => {
-  const copyArea = document.getElementById('copyArea')
-  copyArea.value = flag === 1 ? formattedBody.value : formattedResult.value
-  copyArea.select()
-  document.execCommand('Copy')
-  ElMessage({
-    message: '复制成功',
-    type: 'success',
-    duration: 2500,
-    showClose: true,
-  })
+  const copyValue = flag === 1 ? formattedBody.value : formattedResult.value
+  copyStrFunc(copyValue)
 }
 
 const exportBodyResultTxt = (row) => {
@@ -217,9 +211,9 @@ const exportBodyResultTxt = (row) => {
   })
 }
 
-const recoveriableInfnos = ['2207', '2208', '2401', '2304', '2305']
+const recoverableInfnos = ['2207', '2208', '2401', '2304', '2305']
 const showRecoveryTrade = (infno) => {
-  return recoveryTradePermission() && recoveriableInfnos.indexOf(infno) !== -1
+  return recoveryTradePermission() && recoverableInfnos.indexOf(infno) !== -1
 }
 
 const recoveryTrade = (row) => {