解决合并冲突

2025-12-10 14:20:24 +08:00
parent e1385cb3e6
commit 18f6a845e6
804 changed files with 61881 additions and 13577 deletions
--- a/openhis-ui-vue3/src/layout/components/Navbar.vue
+++ b/openhis-ui-vue3/src/layout/components/Navbar.vue
@@ -49,7 +49,7 @@
      </div>
    </div>
    <el-dialog title="切换科室" v-model="showDialog" width="400px" append-to-body destroy-on-close>
-      <el-select v-model="orgId">
+      <el-select v-model="orgId" filterable clearable>
        <el-option
          v-for="item in orgOptions"
          :key="item.orgId"
--- a/openhis-ui-vue3/src/layout/components/TagsView/index.vue
+++ b/openhis-ui-vue3/src/layout/components/TagsView/index.vue
@@ -14,42 +14,40 @@
      >
        {{ tag.title }}
        <span v-if="!isAffix(tag)" @click.prevent.stop="closeSelectedTag(tag)">
-          <close class="el-icon-close" style="width: 1em; height: 1em;vertical-align: middle;" />
+          <close class="el-icon-close" style="width: 1em; height: 1em; vertical-align: middle" />
        </span>
      </router-link>
    </scroll-pane>
    <ul v-show="visible" :style="{ left: left + 'px', top: top + 'px' }" class="contextmenu">
      <li @click="refreshSelectedTag(selectedTag)">
-        <refresh-right style="width: 1em; height: 1em;" /> 刷新页面
+        <refresh-right style="width: 1em; height: 1em" /> 刷新页面
      </li>
      <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)">
-        <close style="width: 1em; height: 1em;" /> 关闭当前
-      </li>
-      <li @click="closeOthersTags">
-        <circle-close style="width: 1em; height: 1em;" /> 关闭其他
+        <close style="width: 1em; height: 1em" /> 关闭当前
      </li>
+      <li @click="closeOthersTags"><circle-close style="width: 1em; height: 1em" /> 关闭其他</li>
      <li v-if="!isFirstView()" @click="closeLeftTags">
-        <back style="width: 1em; height: 1em;" /> 关闭左侧
+        <back style="width: 1em; height: 1em" /> 关闭左侧
      </li>
      <li v-if="!isLastView()" @click="closeRightTags">
-        <right style="width: 1em; height: 1em;" /> 关闭右侧
+        <right style="width: 1em; height: 1em" /> 关闭右侧
      </li>
      <li @click="closeAllTags(selectedTag)">
-        <circle-close style="width: 1em; height: 1em;" /> 全部关闭
+        <circle-close style="width: 1em; height: 1em" /> 全部关闭
      </li>
    </ul>
  </div>
 </template>

 <script setup>
-import ScrollPane from './ScrollPane'
-import { getNormalPath } from '@/utils/openhis'
-import useTagsViewStore from '@/store/modules/tagsView'
-import useSettingsStore from '@/store/modules/settings'
-import usePermissionStore from '@/store/modules/permission'
-import { toRaw } from 'vue'
-import { toArray } from 'lodash'
-import { toReactive, toRef } from '@vueuse/core'
+import ScrollPane from './ScrollPane';
+import { getNormalPath } from '@/utils/openhis';
+import useTagsViewStore from '@/store/modules/tagsView';
+import useSettingsStore from '@/store/modules/settings';
+import usePermissionStore from '@/store/modules/permission';
+import { toRaw } from 'vue';
+import { toArray } from 'lodash';
+import { toReactive, toRef } from '@vueuse/core';

 const visible = ref(false);
 const top = ref(0);
@@ -67,103 +65,115 @@ const routes = computed(() => usePermissionStore().routes);
 const theme = computed(() => useSettingsStore().theme);

 watch(route, () => {
-  addTags()
-  moveToCurrentTag()
-})
+  addTags();
+  moveToCurrentTag();
+});
 watch(visible, (value) => {
  if (value) {
-    document.body.addEventListener('click', closeMenu)
+    document.body.addEventListener('click', closeMenu);
  } else {
-    document.body.removeEventListener('click', closeMenu)
+    document.body.removeEventListener('click', closeMenu);
  }
-})
+});
 onMounted(() => {
-  initTags()
-  addTags()
-  if(sessionStorage.getItem('visitedViews')){
-    isVisitedViews()
+  initTags();
+  addTags();
+  if (sessionStorage.getItem('visitedViews')) {
+    isVisitedViews();
  }
-})
-function isVisitedViews(){
-  if(sessionStorage.getItem('visitedViews')!= "TransferManagent"){ //调拨单据号删除
-    sessionStorage.setItem('busNo',"")
-  }  
-  if(sessionStorage.getItem('visitedViews')!= "BatchTransfer"){ //批量调拨单据号删除
-    sessionStorage.setItem('busNopl',"")
-  }  
-  if(sessionStorage.getItem('visitedViews')!= "RequisitionManagement"){ //领用单据号删除
-    sessionStorage.setItem('busNoLY',"")
-  }  
-  if(sessionStorage.getItem('visitedViews')!= "ReturningInventory"){ //领用退货单据号删除
-    sessionStorage.setItem('busNoLYTH',"")
-  } 
-  if(sessionStorage.getItem('visitedViews')!= "LossReportingManagement"){ //报损单据号删除
-    sessionStorage.setItem('busNoBS',"")
-  } 
-  if(sessionStorage.getItem('visitedViews')!= "ChkstockPart"){ //盘点单据号删除
-    sessionStorage.setItem('busNopd',"")
-  } 
-  if(sessionStorage.getItem('visitedViews')!= "ChkstockBatch"){ //批量盘点单据号删除
-    sessionStorage.setItem('busNoplpd',"")
-  } 
-  if(sessionStorage.getItem('visitedViews')&&sessionStorage.getItem('visitedViewsQuery')!=""){
-    sessionStorage.setItem('busNo',"")
-    sessionStorage.setItem('busNopl',"")
-    sessionStorage.setItem('busNoLY',"")
-    sessionStorage.setItem('busNoLYTH',"")
-    sessionStorage.setItem('busNoBS',"")
-    sessionStorage.setItem('busNopd',"")
-    sessionStorage.setItem('busNoplpd',"")
+});
+function isVisitedViews() {
+  if (sessionStorage.getItem('visitedViews') != 'TransferManagent') {
+    //调拨单据号删除
+    sessionStorage.setItem('busNo', '');
+  }
+  if (sessionStorage.getItem('visitedViews') != 'BatchTransfer') {
+    //批量调拨单据号删除
+    sessionStorage.setItem('busNopl', '');
+  }
+  if (sessionStorage.getItem('visitedViews') != 'RequisitionManagement') {
+    //领用单据号删除
+    sessionStorage.setItem('busNoLY', '');
+  }
+  if (sessionStorage.getItem('visitedViews') != 'ReturningInventory') {
+    //领用退货单据号删除
+    sessionStorage.setItem('busNoLYTH', '');
+  }
+  if (sessionStorage.getItem('visitedViews') != 'LossReportingManagement') {
+    //报损单据号删除
+    sessionStorage.setItem('busNoBS', '');
+  }
+  if (sessionStorage.getItem('visitedViews') != 'ChkstockPart') {
+    //盘点单据号删除
+    sessionStorage.setItem('busNopd', '');
+  }
+  if (sessionStorage.getItem('visitedViews') != 'ChkstockBatch') {
+    //批量盘点单据号删除
+    sessionStorage.setItem('busNoplpd', '');
+  }
+  if (sessionStorage.getItem('visitedViews') && sessionStorage.getItem('visitedViewsQuery') != '') {
+    sessionStorage.setItem('busNo', '');
+    sessionStorage.setItem('busNopl', '');
+    sessionStorage.setItem('busNoLY', '');
+    sessionStorage.setItem('busNoLYTH', '');
+    sessionStorage.setItem('busNoBS', '');
+    sessionStorage.setItem('busNopd', '');
+    sessionStorage.setItem('busNoplpd', '');
  }
 }

 function isActive(r) {
-  return r.path === route.path
+  return r.path === route.path;
 }
 function activeStyle(tag) {
  if (!isActive(tag)) return {};
  return {
-    "background-color": theme.value,
-    "border-color": theme.value
+    'background-color': theme.value,
+    'border-color': theme.value,
  };
 }
 function isAffix(tag) {
-  return tag.meta && tag.meta.affix
+  return tag.meta && tag.meta.affix;
 }
 function isFirstView() {
  try {
-    return selectedTag.value.fullPath === '/index' || selectedTag.value.fullPath === visitedViews.value[1].fullPath
+    return (
+      selectedTag.value.fullPath === '/index' ||
+      selectedTag.value.fullPath === visitedViews.value[1].fullPath
+    );
  } catch (err) {
-    return false
+    return false;
  }
 }
 function isLastView() {
  try {
-    return selectedTag.value.fullPath === visitedViews.value[visitedViews.value.length - 1].fullPath
+    return (
+      selectedTag.value.fullPath === visitedViews.value[visitedViews.value.length - 1].fullPath
+    );
  } catch (err) {
-    return false
+    return false;
  }
 }
 function filterAffixTags(routes, basePath = '') {
-  let tags = []
-  routes.forEach(route => {
+  let tags = [];
+  routes.forEach((route) => {
    if (route.meta && route.meta.affix) {
-      const tagPath = getNormalPath(basePath + '/' + route.path)
+      const tagPath = getNormalPath(basePath + '/' + route.path);
      tags.push({
        fullPath: tagPath,
        path: tagPath,
        name: route.name,
-        meta: { ...route.meta }
-      })
+        meta: { ...route.meta },
+      });
    }
    if (route.children) {
-      const tempTags = filterAffixTags(route.children, route.path)
+      const tempTags = filterAffixTags(route.children, route.path);
      if (tempTags.length >= 1) {
-        tags = [...tags, ...tempTags]
+        tags = [...tags, ...tempTags];
      }
    }
-  })
-  return tags
+  });
+  return tags;
 }
 function initTags() {
  const res = filterAffixTags(routes.value);
@@ -171,19 +181,19 @@ function initTags() {
  for (const tag of res) {
    // Must have tag name
    if (tag.name) {
-       useTagsViewStore().addVisitedView(tag)
+      useTagsViewStore().addVisitedView(tag);
    }
  }
 }
 function addTags() {
-  const { name } = route
+  const { name } = route;
  if (name) {
-    useTagsViewStore().addView(route)
+    useTagsViewStore().addView(route);
    if (route.meta.link) {
      useTagsViewStore().addIframeView(route);
    }
  }
-  return false
+  return false;
 }
 function moveToCurrentTag() {
  nextTick(() => {
@@ -192,118 +202,118 @@ function moveToCurrentTag() {
        scrollPaneRef.value.moveToTarget(r);
        // when query is different then update
        if (r.fullPath !== route.fullPath) {
-          useTagsViewStore().updateVisitedView(route)
+          useTagsViewStore().updateVisitedView(route);
        }
      }
    }
-  })
+  });
 }
 function refreshSelectedTag(view) {
-     console.log("latestViewall11www1770",view)
  proxy.$tab.refreshPage(view);
  if (route.meta.link) {
    useTagsViewStore().delIframeView(route);
  }
 }
 function closeSelectedTag(view) {
-   console.log("latestViewall11www177",view)
  proxy.$tab.closePage(view).then(({ visitedViews }) => {
    if (isActive(view)) {
-      toLastView(visitedViews, view)
+      toLastView(visitedViews, view);
    }
-  })
+  });
 }
 function closeRightTags() {
-    console.log("latestViewall11www1",selectedTag.value,3)
-  proxy.$tab.closeRightPage(selectedTag.value).then(visitedViews => {
-    if (!visitedViews.find(i => i.fullPath === route.fullPath)) {
-      toLastView(visitedViews)
+  proxy.$tab.closeRightPage(selectedTag.value).then((visitedViews) => {
+    if (!visitedViews.find((i) => i.fullPath === route.fullPath)) {
+      toLastView(visitedViews);
    }
-  })
+  });
 }
 function closeLeftTags() {
-      console.log("latestViewall11177",selectedTag.value,11)
-  proxy.$tab.closeLeftPage(selectedTag.value).then(visitedViews => {
-    if (!visitedViews.find(i => i.fullPath === route.fullPath)) {
-      toLastView(visitedViews)
+  proxy.$tab.closeLeftPage(selectedTag.value).then((visitedViews) => {
+    if (!visitedViews.find((i) => i.fullPath === route.fullPath)) {
+      toLastView(visitedViews);
    }
-  })
+  });
 }
 function closeOthersTags() {
-    console.log("latestViewall111",selectedTag.value,view)
-  router.push(selectedTag.value).catch(() => { });
+  router.push(selectedTag.value).catch(() => {});
  proxy.$tab.closeOtherPage(selectedTag.value).then(() => {
-    moveToCurrentTag()
-  })
+    moveToCurrentTag();
+  });
 }
 function closeAllTags(view) {
-   console.log("latestViewall",visitedViews,view)
  proxy.$tab.closeAllPage().then(({ visitedViews }) => {
-    if (affixTags.value.some(tag => tag.path === route.path)) {
-      return
+    if (affixTags.value.some((tag) => tag.path === route.path)) {
+      return;
    }
-    toLastView(visitedViews, view)
-  })
+    toLastView(visitedViews, view);
+  });
 }
 function toLastView(visitedViews, view) {
-  const latestView = visitedViews.slice(-1)[0]
-  console.log(latestView,"latestView",visitedViews,view)
-  if(view.name== "TransferManagent"){ //调拨单据号删除
-    sessionStorage.setItem('busNo',"")
-  }  
-  if(view.name== "BatchTransfer"){ //批量调拨单据号删除
-    sessionStorage.setItem('busNopl',"")
-  }  
-  if(view.name== "RequisitionManagement"){ //领用单据号删除
-    sessionStorage.setItem('busNoLY',"")
-  }  
-  if(view.name== "ReturningInventory"){ //领用退货单据号删除
-    sessionStorage.setItem('busNoLYTH',"")
-  } 
-  if(view.name== "LossReportingManagement"){ //报损单据号删除
-    sessionStorage.setItem('busNoBS',"")
-  } 
-  if(view.name== "ChkstockPart"){ //盘点单据号删除
-    sessionStorage.setItem('busNopd',"")
-  } 
-  if(view.name== "ChkstockBatch"){ //批量盘点单据号删除
-    sessionStorage.setItem('busNoplpd',"")
-  } 
+  const latestView = visitedViews.slice(-1)[0];
+  if (view.name == 'TransferManagent') {
+    //调拨单据号删除
+    sessionStorage.setItem('busNo', '');
+  }
+  if (view.name == 'BatchTransfer') {
+    //批量调拨单据号删除
+    sessionStorage.setItem('busNopl', '');
+  }
+  if (view.name == 'RequisitionManagement') {
+    //领用单据号删除
+    sessionStorage.setItem('busNoLY', '');
+  }
+  if (view.name == 'ReturningInventory') {
+    //领用退货单据号删除
+    sessionStorage.setItem('busNoLYTH', '');
+  }
+  if (view.name == 'LossReportingManagement') {
+    //报损单据号删除
+    sessionStorage.setItem('busNoBS', '');
+  }
+  if (view.name == 'ChkstockPart') {
+    //盘点单据号删除
+    sessionStorage.setItem('busNopd', '');
+  }
+  if (view.name == 'ChkstockBatch') {
+    //批量盘点单据号删除
+    sessionStorage.setItem('busNoplpd', '');
+  }
  if (latestView) {
-    router.push(latestView.fullPath)
+    router.push(latestView.fullPath);
  } else {
    // now the default is to redirect to the home page if there is no tags-view,
    // you can adjust it according to your needs.
    if (view.name === 'Dashboard') {
      // to reload home page
-      router.replace({ path: '/redirect' + view.fullPath })
-    }else {
-      router.push('/')
+      router.replace({ path: '/redirect' + view.fullPath });
+    } else {
+      router.push('/');
    }
  }
 }
 function openMenu(tag, e) {
-  const menuMinWidth = 105
-  const offsetLeft = proxy.$el.getBoundingClientRect().left // container margin left
-  const offsetWidth = proxy.$el.offsetWidth // container width
-  const maxLeft = offsetWidth - menuMinWidth // left boundary
-  const l = e.clientX - offsetLeft + 15 // 15: margin right
+  const menuMinWidth = 105;
+  const offsetLeft = proxy.$el.getBoundingClientRect().left; // container margin left
+  const offsetWidth = proxy.$el.offsetWidth; // container width
+  const maxLeft = offsetWidth - menuMinWidth; // left boundary
+  const l = e.clientX - offsetLeft + 15; // 15: margin right

  if (l > maxLeft) {
-    left.value = maxLeft
+    left.value = maxLeft;
  } else {
-    left.value = l
+    left.value = l;
  }

-  top.value = e.clientY
-  visible.value = true
-  selectedTag.value = tag
+  top.value = e.clientY;
+  visible.value = true;
+  selectedTag.value = tag;
 }
 function closeMenu() {
-  visible.value = false
+  visible.value = false;
 }
 function handleScroll() {
-  closeMenu()
+  closeMenu();
 }
 </script>

@@ -339,7 +349,7 @@ function handleScroll() {
        color: #fff;
        border-color: #42b983;
        &::before {
-          content: "";
+          content: '';
          background: #fff;
          display: inline-block;
          width: 8px;