xiaochan 2 лет назад
Родитель
Сommit
9fd5a05141

+ 1 - 1
src/components/zhu-yuan-yi-sheng/jian-cha-shen-qing/TianJiaJianYan.vue

@@ -84,7 +84,7 @@ import {stringIsBlank, stringNotBlank} from '@/utils/blank-utils'
 import {
   cuoWuXinXi,
   huanZheXinXi,
-  xuanZhongJianYan, yzHeaderSize, yzMitt, yzSize
+  xuanZhongJianYan, yzMitt, yzSize
 } from '@/views/hospitalization/zhu-yuan-yi-sheng/public-js/zhu-yuan-yi-sheng'
 import {getServerDateApi, yaoPinXiangMuPiPeiYiBao} from '@/api/public-api'
 import Sleep from '@/utils/sleep'

+ 1 - 1
src/components/zhu-yuan-yi-sheng/jian-cha-shen-qing/da-ying/PrintCheckTable.vue

@@ -185,7 +185,7 @@ const printDirectly = () => {
   let LODOP = getLodop();
   LODOP.PRINT_INIT('检查检验申请单');
   LODOP.SET_PRINT_PAGESIZE(1, '148mm', '210mm', '');
-  LODOP.SET_PRINT_MODE('PRINT_PAGE_PERCENT', 'Full-Width')
+  LODOP.SET_PRINT_MODE('PRINT_PAGE_PERCENT', 'Full-Width');
   LODOP.SET_PRINT_MODE("PRINT_START_PAGE", 1);
   LODOP.SET_PRINT_MODE("PRINT_END_PAGE", 1);
   LODOP.ADD_PRINT_HTM('1mm', '1mm', '100%', '100%', html)

+ 1 - 1
src/data/index.js

@@ -1,5 +1,5 @@
 // A4: 210毫米 × 297毫米 = 793.70px *  1122.52px
-// A5: 148毫米 × 210毫米 = 559.37px * 793.70px
+// A5: 148毫米 × 210毫米 = 559.37px * 793.70px  148mm 210mm
 
 export const statusFlags = [
     {code: 0, name: '待审核'},

+ 1 - 3
src/views/hospitalization/zhu-yuan-yi-sheng/Home.vue

@@ -7,7 +7,7 @@
     </el-header>
     <el-main style="padding: 0 ; display: flex" ref="mainRef">
       <div style="width: 158px ">
-        <patient-list :height="yzSize.h"/>
+        <patient-list :height="yzSize.h - 22 "/>
       </div>
       <div class="yz_main">
         <yz-tag :patient-info="patientInfo"/>
@@ -90,8 +90,6 @@ watch(() => yzHeaderHeight.value, () => {
 }, {immediate: true})
 
 
-
-
 onMounted(async () => {
   await nextTick()
   getJyJcZdTree().then((res) => {

+ 106 - 106
src/views/hospitalization/zhu-yuan-yi-sheng/hui-zhen/HuiZhenShenQing.vue

@@ -1,84 +1,84 @@
 <template>
-    <div style="display: flex">
-        <div>
-            <el-button icon="Search" type="primary" @click="chaKanHuiZhenShenQingClick">会诊查询</el-button>
-            <el-button icon="Plus" type="success" @click="dianJiHuiZhenShenQing">会诊申请</el-button>
-            <div style="width: 400px">
-                <xc-table
-                        :final-height="getWindowSize.h  - yzHeaderSize"
-                        :local-data="chaKanHuiZhenList"
-                        @rowClick="chaKanHuiZhenDan"
-                        layout='total, prev,  next'>
-                    <el-table-column label="申请时间" prop="inputDate" width="70">
-                        <template #default="scope">
-                            {{ scope.row.inputDate + '_' + scope.row.reqTimes }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="科室" prop="deptName"></el-table-column>
-                    <el-table-column label="接受日期" prop="hzDate" show-overflow-tooltip></el-table-column>
-                    <el-table-column label="接受医生" prop="hzDoctor2Name"></el-table-column>
-                    <el-table-column label="申请人" prop="inputName" width="60"></el-table-column>
-                    <el-table-column label="申请科室" prop="reqDeptName"></el-table-column>
-                    <el-table-column label="类别" prop="hzLevelName"></el-table-column>
-                    <el-table-column label="医生" prop="hzDoctor1Name"></el-table-column>
-                    <el-table-column label="级别" prop="hzType">
-                        <template #default="scope">
-                            <span>{{ hzTypeName(scope.row.hzType) }}</span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="接受意见" prop="hzComment" show-overflow-tooltip></el-table-column>
-                    <el-table-column fixed="left" label="操作" width="50">
-                        <template #default="scope">
-                            <el-popconfirm
-                                    cancel-button-text="取消"
-                                    confirm-button-text="确定"
-                                    icon="InfoFilled"
-                                    icon-color="red"
-                                    title="确定要删除吗?"
-                                    @confirm="shanChuHuiZhenShenQingClick(scope.$index, scope.row)"
-                            >
-                                <template #reference>
-                                    <el-button :disabled="scope.row.statusFlag === '2'"
-                                               title="删除"
-                                               circle
-                                               @click.stop.prevent
-                                               icon="Delete"
-                                               type="danger"/>
-                                </template>
-                            </el-popconfirm>
-                        </template>
-                    </el-table-column>
-                </xc-table>
-            </div>
-        </div>
-
-        <div>
-            <el-tabs type="border-card"
-                     closable
-                     v-model="tabs"
-                     @tab-remove="tabRemove">
-                <el-tab-pane label="会诊详情"
-                             :name="0">
-                    <print-the-consultation-form ref="daYingHuiZhenRef" :lai-yuan="2"/>
-                </el-tab-pane>
-                <el-tab-pane :name="1"
-                             label="添加会诊申请"
-                             v-if="consultationApplication">
-                    <tian-jia-hui-zhen-shen-qing @successfulApplication="successfulApplication"/>
-                </el-tab-pane>
-            </el-tabs>
-        </div>
+  <div style="display: flex">
+    <div>
+      <el-button icon="Search" type="primary" @click="chaKanHuiZhenShenQingClick">会诊查询</el-button>
+      <el-button icon="Plus" type="success" @click="dianJiHuiZhenShenQing">会诊申请</el-button>
+      <div style="width: 400px">
+        <xc-table
+            :final-height="yzSize.h  -  50"
+            :local-data="chaKanHuiZhenList"
+            @rowClick="chaKanHuiZhenDan"
+            layout='total, prev,  next'>
+          <el-table-column label="申请时间" prop="inputDate" width="70">
+            <template #default="scope">
+              {{ scope.row.inputDate + '_' + scope.row.reqTimes }}
+            </template>
+          </el-table-column>
+          <el-table-column label="科室" prop="deptName"></el-table-column>
+          <el-table-column label="接受日期" prop="hzDate" show-overflow-tooltip></el-table-column>
+          <el-table-column label="接受医生" prop="hzDoctor2Name"></el-table-column>
+          <el-table-column label="申请人" prop="inputName" width="60"></el-table-column>
+          <el-table-column label="申请科室" prop="reqDeptName"></el-table-column>
+          <el-table-column label="类别" prop="hzLevelName"></el-table-column>
+          <el-table-column label="医生" prop="hzDoctor1Name"></el-table-column>
+          <el-table-column label="级别" prop="hzType">
+            <template #default="scope">
+              <span>{{ hzTypeName(scope.row.hzType) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="接受意见" prop="hzComment" show-overflow-tooltip></el-table-column>
+          <el-table-column fixed="left" label="操作" width="50">
+            <template #default="scope">
+              <el-popconfirm
+                  cancel-button-text="取消"
+                  confirm-button-text="确定"
+                  icon="InfoFilled"
+                  icon-color="red"
+                  title="确定要删除吗?"
+                  @confirm="shanChuHuiZhenShenQingClick(scope.$index, scope.row)"
+              >
+                <template #reference>
+                  <el-button :disabled="scope.row.statusFlag === '2'"
+                             title="删除"
+                             circle
+                             @click.stop.prevent
+                             icon="Delete"
+                             type="danger"/>
+                </template>
+              </el-popconfirm>
+            </template>
+          </el-table-column>
+        </xc-table>
+      </div>
     </div>
 
+    <div>
+      <el-tabs type="border-card"
+               closable
+               v-model="tabs"
+               @tab-remove="tabRemove">
+        <el-tab-pane label="会诊详情"
+                     :name="0">
+          <print-the-consultation-form ref="daYingHuiZhenRef" :lai-yuan="2"/>
+        </el-tab-pane>
+        <el-tab-pane :name="1"
+                     label="添加会诊申请"
+                     v-if="consultationApplication">
+          <tian-jia-hui-zhen-shen-qing @successfulApplication="successfulApplication"/>
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+  </div>
+
 </template>
 <script setup name="HuiZhenShenQing">
 import TianJiaHuiZhenShenQing from '@/components/zhu-yuan-yi-sheng/hui-zhen-shen-qing/TianJiaHuiZhenShenQing.vue'
 import {computed, onActivated, ref, watch} from 'vue'
 import {chaKanHuiZhenShenQing, shanChuHuiZhenShenQing} from '@/api/case-front-sheet'
 import {
-    consultationApplication,
-    huanZheXinXi,
-    youWuXuanZheHuanZhe, yzHeaderSize
+  consultationApplication,
+  huanZheXinXi,
+  youWuXuanZheHuanZhe, yzHeaderSize, yzSize
 } from '@/views/hospitalization/zhu-yuan-yi-sheng/public-js/zhu-yuan-yi-sheng'
 import store from '@/store'
 import {getHuanZheXinXi} from '@/api/case-front-sheet/jie-shou-hui-zhen'
@@ -88,7 +88,7 @@ import PrintTheConsultationForm from "@/components/hui-zhen-da-ying/PrintTheCons
 import {getWindowSize} from "@/utils/window-size";
 
 const windowSize = computed(() => {
-    return store.state.app.windowSize
+  return store.state.app.windowSize
 })
 
 
@@ -97,33 +97,33 @@ const chaKanHuiZhenList = ref([])
 const tabs = ref(0)
 
 const chaKanHuiZhenShenQingClick = () => {
-    if (youWuXuanZheHuanZhe()) return
-    chaKanHuiZhenShenQing(huanZheXinXi.value.inpatientNo, huanZheXinXi.value.admissTimes).then((res) => {
-        chaKanHuiZhenList.value = res
-    })
+  if (youWuXuanZheHuanZhe()) return
+  chaKanHuiZhenShenQing(huanZheXinXi.value.inpatientNo, huanZheXinXi.value.admissTimes).then((res) => {
+    chaKanHuiZhenList.value = res
+  })
 }
 
 const shanChuHuiZhenShenQingClick = (index, val) => {
-    shanChuHuiZhenShenQing(val.inpatientNo, val.admissTimes, val.actOrderNo, val.reqTimes).then((res) => {
-        chaKanHuiZhenList.value.splice(index, 1)
-    })
+  shanChuHuiZhenShenQing(val.inpatientNo, val.admissTimes, val.actOrderNo, val.reqTimes).then((res) => {
+    chaKanHuiZhenList.value.splice(index, 1)
+  })
 }
 
 
 const daYingHuiZhenRef = ref(null)
 
 const chaKanHuiZhenDan = (val) => {
-    getHuanZheXinXi(val.admissTimes, val.reqTimes, val.inpatientNo).then((res) => {
-        setTimeout(() => {
-            daYingHuiZhenRef.value.huiZhenXinXiXiangQing(res)
-        }, 100)
-    })
+  getHuanZheXinXi(val.admissTimes, val.reqTimes, val.inpatientNo).then((res) => {
+    setTimeout(() => {
+      daYingHuiZhenRef.value.huiZhenXinXiXiangQing(res)
+    }, 100)
+  })
 }
 
 const successfulApplication = () => {
-    chaKanHuiZhenShenQingClick()
-    consultationApplication.value = false
-    tabs.value = 0
+  chaKanHuiZhenShenQingClick()
+  consultationApplication.value = false
+  tabs.value = 0
 }
 
 /**
@@ -131,40 +131,40 @@ const successfulApplication = () => {
  *
  */
 const dianJiHuiZhenShenQing = async () => {
-    if (youWuXuanZheHuanZhe()) return
-    if (consultationApplication.value) {
-        BizException(ExceptionEnum.MESSAGE_ERROR, '请先保存正在编辑的会诊申请')
-    }
-    consultationApplication.value = true
-    tabs.value = 1
+  if (youWuXuanZheHuanZhe()) return
+  if (consultationApplication.value) {
+    BizException(ExceptionEnum.MESSAGE_ERROR, '请先保存正在编辑的会诊申请')
+  }
+  consultationApplication.value = true
+  tabs.value = 1
 }
 
 // 移除标签
 const tabRemove = () => {
-    consultationApplication.value = false
-    tabs.value = 0
+  consultationApplication.value = false
+  tabs.value = 0
 }
 
 watch(
     () => huanZheXinXi.value,
     () => {
-        chaKanHuiZhenShenQingClick()
+      chaKanHuiZhenShenQingClick()
     }
 )
 
 onActivated(() => {
-    chaKanHuiZhenShenQingClick()
+  chaKanHuiZhenShenQingClick()
 })
 
 function hzTypeName(val) {
-    switch (val) {
-        case '1':
-            return '主治医师'
-        case '2':
-            return '副主任医生'
-        case '3':
-            return '主任医生'
-    }
+  switch (val) {
+    case '1':
+      return '主治医师'
+    case '2':
+      return '副主任医生'
+    case '3':
+      return '主任医生'
+  }
 }
 </script>
 

+ 0 - 1
src/views/hospitalization/zhu-yuan-yi-sheng/jian-cha-jian-yan-shen-qing/JianChaShenQing.vue

@@ -141,7 +141,6 @@ const dianJiaJianChaXiangQing = (row) => {
   huoQuShengQingXiangQing(row.reqNo).then((res) => {
     daYingJianChaRef.value.fillData(res)
     mainTabs.value = 0
-    console.log(res)
   })
 
   queryCheckTextResults(row.inpatientNo, row.reqNo).then((res) => {