xiaochan před 1 rokem
rodič
revize
f099c4ce4d

+ 1 - 0
src/api/settings/menu-settings.ts

@@ -14,6 +14,7 @@ export interface IntergrationMenu {
     mainCard?: boolean;
     mainOverflowAuto?: boolean;
     metaShowMenu?: boolean;
+    metaLink?: boolean;
     sort: number;
     component: string;
     redirect?: string;

+ 0 - 55
src/css/hui-zhen-ji-lv-dan.css

@@ -1,55 +0,0 @@
-.main-info-parent {
-  width: 794px;
-  overflow-x: hidden;
-  display: inline-block;
-  vertical-align: top;
-}
-textarea {
-  overflow: hidden;
-  background-color: rgb(238, 238, 238);
-}
-.divHuanZheXinXi {
-  border-bottom: 1px solid;
-}
-.huanZheXinXi {
-  display: inline-block;
-  margin-left: 5px;
-  width: 120px;
-}
-.huiZhenBody {
-  height: 450px;
-  border-bottom: 1px solid;
-  margin-top: 10px;
-}
-.reqDept {
-  width: 120px;
-  display: inline-block;
-  border-bottom: 1px solid;
-}
-.huiZhenJiBie {
-  width: 160px;
-  float: right;
-}
-.zhenDuanBianJu {
-  margin: 5px auto auto 20px;
-}
-.zhenDuanTextarea {
-  margin: 0px;
-  width: 771px;
-  border: 0px;
-  margin-top: 5px;
-  resize: none;
-}
-.qingQiuHuiZhenXinXi {
-  width: 450px;
-  margin-left: 360px;
-  margin-top: 20px;
-}
-.qingQiuHuiZhenXinXi .div1 {
-  width: 220px;
-  display: inline-block;
-}
-.qingQiuHuiZhenXinXi .div2 {
-  display: inline-block;
-  width: 220px;
-}

+ 4 - 4
src/css/layout.scss

@@ -57,8 +57,8 @@
 
   > .layout_main {
     flex: 1;
-    width: 0;
-    height: 100%;
+    width: 100%;
+    height: 0;
   }
 
 }
@@ -71,8 +71,8 @@
   }
 
   > .layout_main {
-    width: 0;
-    height: 100%;
+    width: 100%;
+    height: 0;
     flex: 1;
   }
 }

+ 112 - 111
src/views/clinic/TransferInOfExpenses.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="layout_display_flex_y">
-    <div>
+  <div class="layout_container">
+    <header>
       住院号:
       <el-input
           v-model="inpatientNo"
@@ -34,118 +34,119 @@
       <el-button style="margin-left: 10px" type="primary" @click="querySerialNo">查询机制号信息</el-button>
       <el-button style="margin-left: 10px" type="warning" @click="huanZheFeiYongDrawer = true">查看患者费用</el-button>
       <el-button style="margin-left: 10px" type="success" @click="baoCunClick">保存</el-button>
+    </header>
+    <div>
+      <el-descriptions border title="基本信息">
+        <el-descriptions-item>
+          <template #label>
+            <i class="el-icon-user"></i>
+            患者姓名
+          </template>
+          {{ huanZheXinXi.name }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template #label>
+            <i class="el-icon-user"></i>
+            住院次数
+          </template>
+          {{ huanZheXinXi.admissTimes }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template #label>
+            <i class="el-icon-user-solid"></i>
+            性别
+          </template>
+          {{ cptSex(huanZheXinXi.sex) }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template #label>
+            <i class="el-icon-house"></i>
+            床号
+          </template>
+          {{ huanZheXinXi.bedNo }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template #label>
+            <i class="el-icon-s-home"></i>
+            病房
+          </template>
+          {{ huanZheXinXi.wardName }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template #label>
+            <i class="el-icon-date"></i>
+            入院日期
+          </template>
+          {{ huanZheXinXi.admissDate }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template #label>
+            <i class="el-icon-tickets"></i>
+            身份
+          </template>
+          {{ huanZheXinXi.responceTypeName }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template #label>
+            <i class="el-icon-coin"></i>
+            总费用
+          </template>
+          {{ huanZheXinXi.totalCharge }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template #label>
+            <i class="el-icon-coin"></i>
+            余额
+          </template>
+          <span style="color: red">{{ huanZheXinXi.balance }}</span>
+        </el-descriptions-item>
+      </el-descriptions>
     </div>
-    <div class="layout_flex_1-y layout_display_flex_y">
-      <div>
-        <el-descriptions border title="基本信息">
-          <el-descriptions-item>
-            <template #label>
-              <i class="el-icon-user"></i>
-              患者姓名
-            </template>
-            {{ huanZheXinXi.name }}
-          </el-descriptions-item>
-          <el-descriptions-item>
-            <template #label>
-              <i class="el-icon-user"></i>
-              住院次数
-            </template>
-            {{ huanZheXinXi.admissTimes }}
-          </el-descriptions-item>
-          <el-descriptions-item>
-            <template #label>
-              <i class="el-icon-user-solid"></i>
-              性别
-            </template>
-            {{ cptSex(huanZheXinXi.sex) }}
-          </el-descriptions-item>
-          <el-descriptions-item>
-            <template #label>
-              <i class="el-icon-house"></i>
-              床号
-            </template>
-            {{ huanZheXinXi.bedNo }}
-          </el-descriptions-item>
-          <el-descriptions-item>
-            <template #label>
-              <i class="el-icon-s-home"></i>
-              病房
-            </template>
-            {{ huanZheXinXi.wardName }}
-          </el-descriptions-item>
-          <el-descriptions-item>
-            <template #label>
-              <i class="el-icon-date"></i>
-              入院日期
-            </template>
-            {{ huanZheXinXi.admissDate }}
-          </el-descriptions-item>
-          <el-descriptions-item>
-            <template #label>
-              <i class="el-icon-tickets"></i>
-              身份
-            </template>
-            {{ huanZheXinXi.responceTypeName }}
-          </el-descriptions-item>
-          <el-descriptions-item>
-            <template #label>
-              <i class="el-icon-coin"></i>
-              总费用
-            </template>
-            {{ huanZheXinXi.totalCharge }}
-          </el-descriptions-item>
-          <el-descriptions-item>
-            <template #label>
-              <i class="el-icon-coin"></i>
-              余额
-            </template>
-            <span style="color: red">{{ huanZheXinXi.balance }}</span>
-          </el-descriptions-item>
-        </el-descriptions>
+    <div>
+      收费日期:
+      <el-date-picker v-model="chargeDate" type="datetime" style="width: 165px"/>
+      执行科室:
+      <SystemDeptSelect
+          clearable
+          style="width: 120px"
+          v-model="huanZheXinXi.execUnit"
+      />
+    </div>
+    <div class="layout_main layout_container layout-horizontal">
+      <div class="layout_flex_1-x layout_el-table">
+        <el-tag>
+          门诊发票信息: 合计 【{{ mzSum }}】
+        </el-tag>
+        <el-table ref="multipleTable"
+                  :data="mzXinXiList"
+                  highlight-current-row
+                  @selection-change="mzSelectChecked">
+          <el-table-column :label="`门诊发票信息: 合计 【${mzSum}】`">
+            <el-table-column label="项目名称" prop="itemName"></el-table-column>
+            <el-table-column label="收费编码" prop="chargeCodeMx"></el-table-column>
+            <el-table-column label="数量" prop="chargeQuantity"></el-table-column>
+            <el-table-column label="单价" prop="unitPrice"></el-table-column>
+            <el-table-column label="金额" prop="chargeFee"></el-table-column>
+            <el-table-column label="选择" type="selection" width="60"></el-table-column>
+          </el-table-column>
+        </el-table>
       </div>
-      <div>
-        收费日期:
-        <el-date-picker v-model="chargeDate" type="datetime" style="width: 165px"/>
-        执行科室:
-        <SystemDeptSelect
-            clearable
-            style="width: 120px"
-            v-model="huanZheXinXi.execUnit"
-        />
+      <div style="display: flex;align-items: center; margin: 0 20px">
+        <el-button icon="Right" type="primary"></el-button>
       </div>
-      <div class="layout_flex_1-y layout_display_flex">
-        <div class="layout_flex_1-x">
-          <el-table ref="multipleTable"
-                    :data="mzXinXiList"
-                    height="100%"
-                    highlight-current-row
-                    @selection-change="mzSelectChecked">
-            <el-table-column :label="`门诊发票信息: 合计 【${mzSum}】`">
-              <el-table-column label="项目名称" prop="itemName"></el-table-column>
-              <el-table-column label="收费编码" prop="chargeCodeMx"></el-table-column>
-              <el-table-column label="数量" prop="chargeQuantity"></el-table-column>
-              <el-table-column label="单价" prop="unitPrice"></el-table-column>
-              <el-table-column label="金额" prop="chargeFee"></el-table-column>
-              <el-table-column label="选择" type="selection" width="60"></el-table-column>
-            </el-table-column>
-          </el-table>
-        </div>
-        <div style="display: flex;align-items: center; margin: 0 20px">
-          <el-button icon="Right" type="primary"></el-button>
-        </div>
-        <div class="layout_flex_1-x">
-          <el-table :data="zyXinXiList"
-                    height="100%"
-                    stripe>
-            <el-table-column :label="`住院收费项目:合计【${zySum}】`">
-              <el-table-column label="项目名称" prop="itemName"></el-table-column>
-              <el-table-column label="收费编码" prop="chargeCodeMx"></el-table-column>
-              <el-table-column label="数量" prop="chargeQuantity"></el-table-column>
-              <el-table-column label="单价" prop="unitPrice"></el-table-column>
-              <el-table-column label="金额" prop="chargeFee"></el-table-column>
-            </el-table-column>
-          </el-table>
-        </div>
+      <div class="layout_flex_1-x layout_el-table">
+        <el-tag>
+          住院收费项目:合计【{{ zySum }}】
+        </el-tag>
+        <el-table :data="zyXinXiList"
+                  height="100%"
+                  stripe>
+          <el-table-column label="项目名称" prop="itemName"></el-table-column>
+          <el-table-column label="收费编码" prop="chargeCodeMx"></el-table-column>
+          <el-table-column label="数量" prop="chargeQuantity"></el-table-column>
+          <el-table-column label="单价" prop="unitPrice"></el-table-column>
+          <el-table-column label="金额" prop="chargeFee"></el-table-column>
+        </el-table>
       </div>
     </div>
   </div>

+ 2 - 6
src/views/med-tec-mod/MenZhenXiangMu.vue

@@ -50,7 +50,7 @@
                       }}
                     </el-button>
                   </template>
-                  <el-table :data="feiYongData" :height="windowsHeight / 2" highlight-current-row stripe>
+                  <el-table :data="feiYongData" height="calc(100vh - 50%)" highlight-current-row stripe>
                     <el-table-column label="缴费明细信息">
                       <el-table-column label="待确认标志" prop="confirmFlag">
                         <template #default="scope">
@@ -117,7 +117,7 @@
   <el-dialog v-model="kuaiSuChaZhaoDialog" title="点击表格中的姓名即可">
     <el-table
         :data="kuaiSuChaZhaoData.list.slice((kuaiSuChaZhaoData.currentPage - 1) * kuaiSuChaZhaoData.pageSize, kuaiSuChaZhaoData.pageSize * kuaiSuChaZhaoData.currentPage)"
-        :height="windowsHeight / 2"
+        height="calc(100vh - 50%)"
         highlight-current-row
         stripe
         @cell-click="chaZhaoTable"
@@ -165,16 +165,12 @@ import {needRule} from "@/utils/public";
 import XEUtils from 'xe-utils'
 import {useUserStore} from "@/pinia/user-store";
 
-
-const windowsHeight = window.innerHeight
 const userInfo = useUserStore().userInfo
 const dateRange = ref(shortcuts[0].value)
 const patientId = ref('') //12117-4
 const xiangMuZhuangTai = ref(0)
 const chargeDate = ref('')
-
 const patient = ref({})
-
 const shouFeiData = ref([])
 const feiYongData = ref([])
 const keQueRenData = ref([])

+ 11 - 0
src/views/settings/menu-settings/dialog.vue

@@ -352,6 +352,17 @@ defineExpose({
           </el-form-item>
         </el-col>
 
+        <el-col :span="12">
+          <el-form-item label="外联打开">
+            <el-switch v-model="currentData.metaLink"
+                       :active-value="true"
+                       :inactive-value="false"
+                       active-text="是"
+                       inactive-text="否"
+            />
+          </el-form-item>
+        </el-col>
+
       </el-row>
     </el-form>