优化

src/components/zhu-yuan-yi-sheng/emr/auxiliary-tools/EmrAuxiliaryTools.vue

@@ -61,11 +61,9 @@
                    :pat-no="patInfo.inpatientNo"
                    :times="patInfo.admissTimes"
                    @to-fill-in-data="toFillInData"/>
-    <EmrTestV2 :pat-no="patInfo.inpatientNo" v-if="index === 6" @close="close"/>
-
-    <!--    <emr-test @close="close" v-if="index === 6"-->
-    <!--              :times="patInfo.admissTimes"-->
-    <!--              :pat-no="patInfo.inpatientNo"/>-->
+    <EmrTestV2 :pat-no="patInfo.inpatientNo"
+               v-if="index === 6"
+               @close="close"/>
     <emr-herbs v-if="index === 7"
                @close="close"
                :pat-no="patInfo.inpatientNo"
@@ -77,7 +75,7 @@
                      :times="patInfo.admissTimes"/>
     <pims-web-view v-if="index === 10" :pat-no="patInfo.inpatientNo"/>
     <div style="width: 100%;height: 100%" v-if="index === 11">
-      <fluorescence-test v-bind="patProps" show-copy/>
+      <fluorescence-test show-copy :pat-no="patInfo.inpatientNo" :times="patInfo.admissTimes"/>
     </div>
   </el-drawer>
 
@@ -127,7 +125,6 @@ const end = ref('')
 const start = ref('')
 
 const drawer = ref(false)
-let patProps = $ref()
 
 
 const toFillInData = (data) => {
@@ -162,10 +159,6 @@ const emrChannelClick = (name) => {
 }
 
 onMounted(async () => {
-  patProps = {
-    patNo: props.patInfo.inpatientNo,
-    times: props.patInfo.admissTimes
-  }
   patInfo.value = props.patInfo
   end.value = formatDate(await getServerDateApi())
   start.value = formatDate(props.patInfo.admissDate)

src/components/zhu-yuan-yi-sheng/emr/auxiliary-tools/emr-tools-store.ts

@@ -1,5 +1,4 @@
-import {reactive, ref} from 'vue'
-import {VxeGridProps} from "vxe-table";
+import {ref} from 'vue'
 
 export const patInfo = ref({
     inpatientNo: '',
@@ -7,8 +6,3 @@ export const patInfo = ref({
 })
 
 
-export const gridOptions = reactive<VxeGridProps>({
-    border: true,
-    showOverflow: true,
-
-})

src/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/emr-editor/EmrMain.vue

@@ -1632,13 +1632,13 @@ const emrMittInit = () => {
   emrMitt.on("forceRefresh", forceTheRecipientToBeKickedOut)
   emrMitt.on('queryHistoryFunc', queryHistoryFunc)
 
-  emrMitt.on('reloadDocument', (): Promise<void> => {
+  emrMitt.on('reloadDocument', (): Promise<null> => {
     return new Promise((resolve, reject) => {
       const param = {
         documentId: getId()
       }
       editMain.loadAndSetDocument(param).then(() => {
-        resolve(void)
+        resolve(null)
       }).catch(() => {
         reject()
       })

src/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/emr-editor/emr-init.ts

@@ -108,7 +108,6 @@ export function emrCopyFunc(str) {
     xcMessage.success('复制成功')
 }
 
-
 /**
  * 复制为数据元
  * @param value 数据
@@ -129,7 +128,7 @@ export function copyAsDataSource(value: string, elementName: string) {
  * @param str 文字
  * @param name 数据元名称
  */
-export function elementReplication(str, name) {
+export function elementReplication(str: string, name: string): void {
     let data = [{
         type: 'smarttext',
         value: str,
@@ -359,7 +358,7 @@ export interface Audit {
 }
 
 export interface EmrMitt {
-    getDocumentSocket: () => null | WebSocket | any
+    getDocumentSocket: () => null | WebSocket
     openTools: (val: number) => void
     患者病区判断: () => boolean
     querySidebar: () => void
@@ -416,7 +415,7 @@ export const unlockEnum = {
  * @param val 需要解锁的限制
  * @returns {boolean}
  */
-export function canIUnlockIt(val) {
+export function canIUnlockIt(val: string): boolean {
     if (applicationData.value === null) {
         return false
     }