Browse Source

修复环节质控问题

xiaochan 1 year ago
parent
commit
360fc7fcdb

+ 0 - 3
src/components/zhu-yuan-yi-sheng/cao-yao-yi-zhu/CaoYaoMuBan.vue

@@ -59,9 +59,6 @@ import {useUserStore} from "@/pinia/user-store";
 import CyDialog from "@/components/cy/dialog/src/CyDialog.vue";
 
 const emits = defineEmits(['close', 'xuanZhongShuJu'])
-
-const innerHeight = window.innerHeight
-
 const userStore = useUserStore().userInfo
 
 const queryName = ref('')

+ 2 - 10
src/layout/HeaderV2/Logo.vue

@@ -23,20 +23,12 @@ const systemStore = useSystemStore()
 
 </script>
 
-<style lang="scss" scoped>
-.box {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  height: 40px;
-  background-color: white;
-}
-
+<style lang="scss">
 .logo-container {
   display: flex;
   align-items: center;
   width: 100%;
-  background-color: white;
+  background-color: var(--el-menu-bg-color);
 
   img {
     width: 28px

+ 1 - 1
src/layout/default-layout/index.vue

@@ -93,7 +93,7 @@ watch(() => router.currentRoute.value, () => {
   margin: 0 !important;
   display: flex;
   flex-direction: column;
-  background: white;
+  background: var(--el-menu-bg-color);
 }
 
 .layout-default_logo {

+ 0 - 1
src/layout/function-list/Theme.vue

@@ -14,7 +14,6 @@
           v-model="pageName"
       />
       <el-collapse v-model="activeNames">
-
         <el-collapse-item title="菜单配置" name="0">
           <el-form>
             <el-form-item label="侧边菜单栏背景色">

+ 1 - 1
src/views/hospitalization/zhu-yuan-yi-sheng/cao-yao-yi-zhu/XinZhengCaoYao.vue

@@ -368,7 +368,7 @@ const dianJiXuanZhongMuBanShuJu = (data, next) => {
     if (mingXi.value.weiYi.indexOf(key) > -1) {
       flag = true
     } else {
-      item.je = (item.quantity * item.retprice).toFixed(2)
+      item.je = Dig.multiply(item.quantity, item.retprice).toFixed(2)
       item.groupName = item.groupNo === '81' ? '门诊中药房' : '颗粒剂药房'
       mingXi.value.list.push(item)
       mingXi.value.weiYi.push(key)

+ 6 - 6
src/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/emr_control_rule/RuleSift.vue

@@ -1,7 +1,7 @@
 <template>
   <CyVxeTable :data="props.data">
-    <vxe-column type="expand">
-      <template #default="{row}">
+    <vxe-column type="expand" fixed="left" width="30">
+      <template #content="{row}">
         <JsonViewer :value="row.mapMessage"
                     copyable
                     :expandDepth="3"/>
@@ -24,15 +24,15 @@
     <vxe-column field="deptDirectorName" title="主任医生" width="100"/>
     <vxe-column field="consultPhysicianName" title="主治医生" width="100"/>
     <vxe-column field="tubeBedDoctorName" title="管床医生" width="284"/>
-    <vxe-column field="opinion" title="质控意见" show-overflow-tooltip width="140"/>
-    <vxe-column field="approverName" title="审核人" show-overflow-tooltip width="177"/>
-    <vxe-column field="reviewTime" title="审核时间" show-overflow-tooltip width="120"/>
+    <vxe-column field="opinion" title="质控意见" show-overflow width="140"/>
+    <vxe-column field="approverName" title="审核人" show-overflow width="177"/>
+    <vxe-column field="reviewTime" title="审核时间" show-overflow width="120"/>
     <vxe-column title="病历" fixed="right" width="80">
       <template #default="{row}">
         <el-button type="primary" @click="toEmrClick(row)">病历</el-button>
       </template>
     </vxe-column>
-    <vxe-column field="mapMessage" title="详情" show-overflow-tooltip width="250">
+    <vxe-column field="mapMessage" title="详情" show-overflow width="250">
       <template #header>
         <el-button @click="exportExcel">导出Excel</el-button>
       </template>