优化

src/api/emr-control/emr-time-limit-prompt.ts

@@ -16,3 +16,11 @@ export function timeLimitPromptByPatientNo(patNo: string) {
         params: {patNo}
     })
 }
+
+export function myPatientQualityControl(doctor) {
+    return request({
+        url: '/timeLimitPrompt/myPatientQualityControl',
+        method: 'get',
+        params: {doctor}
+    })
+}

src/api/zhu-yuan-yi-sheng/emr-control-rule.ts

@@ -1,24 +1,6 @@
 import requestV2 from "../../utils/request-v2";
 import MybatisPage from "../../ts-type/mybatis-page";
 
-let url = '/emrControlRule'
-
-export function myPatientQualityControl() {
-    return requestV2({
-        url: url + '/myPatientQualityControl',
-        method: 'get',
-    })
-}
-
-
-/// 下面是新的
-export function requestToUnlockMedicalRecords(data) {
-    return requestV2({
-        url: url + '/requestToUnlockMedicalRecords',
-        method: 'post',
-        data
-    })
-}
 
 export interface Approval {
     id: number;
@@ -38,6 +20,18 @@ export interface Approval {
     stateName: string;
 }
 
+let url = '/emrControlRule'
+
+/// 下面是新的
+export function requestToUnlockMedicalRecords(data) {
+    return requestV2({
+        url: url + '/requestToUnlockMedicalRecords',
+        method: 'post',
+        data
+    })
+}
+
+
 export function getApplicationData(data: any) {
     return requestV2<MybatisPage<Approval>>({
         url: url + '/getApplicationData',
@@ -61,20 +55,3 @@ export function getMyUnlockByPatNo(patNo, times) {
         params: {patNo, times}
     })
 }
-
-
-export function specifyAdmissionQualityControl(start, end) {
-    return requestV2({
-        url: url + '/specifyAdmissionQualityControl',
-        method: 'get',
-        params: {start, end}
-    })
-}
-
-export function terminalPatients(data) {
-    return requestV2({
-        url: url + '/terminalPatients',
-        method: 'post',
-        data
-    })
-}

src/components/cy/dialog/src/CyDialog.vue

@@ -1,41 +1,62 @@
-<script setup lang="ts">
-import './cy-dialog.scss'
-import {UseCyDialog} from "./useCyDialog";
-import {onMounted} from "vue";
-import {useZIndex, ElButton} from "element-plus";
-import {ref} from 'vue'
+<!--<script setup lang="ts">-->
+<!--import './cy-dialog.scss'-->
+<!--import {UseCyDialog} from "./useCyDialog";-->
+<!--import {useZIndex, ElButton} from "element-plus";-->
+<!--import {ref} from 'vue'-->
 
-export declare type Props = {
-  title?: string,
-  emit: () => void,
-  fullScreen?: boolean
-}
+<!--export declare type Props = {-->
+<!--  title?: string,-->
+<!--  emit: () => void,-->
+<!--  fullScreen?: boolean,-->
+<!--}-->
 
-const props = withDefaults(
-    defineProps<Props>(),
-    {
-      fullScreen: false
-    }
-)
+<!--const props = withDefaults(-->
+<!--    defineProps<Props>(),-->
+<!--    {-->
+<!--      fullScreen: false-->
+<!--    }-->
+<!--)-->
 
-const {
-  ns,
-  headerRef,
-  footerRef,
-  containerRef,
-  bodyHeightStyle,
-  boxRef,
-  bodyRef,
-  observerHeight
-} = UseCyDialog(props)
 
-const zIndex = ref(useZIndex().nextZIndex())
+<!--const emits = defineEmits()-->
 
-onMounted(() => {
+<!--const {-->
+<!--  ns,-->
+<!--  headerRef,-->
+<!--  footerRef,-->
+<!--  containerRef,-->
+<!--  bodyHeightStyle,-->
+<!--  boxRef,-->
+<!--  bodyRef,-->
+<!--  observerHeight-->
+<!--} = UseCyDialog(props)-->
+
+<!--const zIndex = ref(useZIndex().nextZIndex())-->
+<!--</script>-->
+<script lang="ts">
+import {ElButton} from 'element-plus'
+import {CyDialogProps, UseCyDialog} from "@/components/cy/dialog/src/useCyDialog";
+import './cy-dialog.scss'
 
+const COMPONENT_NAME = 'CyDialog'
+export default defineComponent({
+  name: COMPONENT_NAME,
+  componentName: COMPONENT_NAME,
+  components: {
+    ElButton
+  },
+  props: CyDialogProps,
+  setup(props, {emit}) {
+    const API = UseCyDialog(props)
+
+    return {
+      ...API
+    }
+  }
 })
 </script>
 
+
 <template>
   <div
       ref="containerRef"

src/components/cy/dialog/src/cy-dialog.scss

@@ -23,11 +23,12 @@
   }
 
   .cy-combo-grid__header {
-    line-height: 40px;
+    line-height: 20px;
     text-align: center;
     padding: 10px;
     user-select: none;
     cursor: all-scroll;
+    border-bottom: 1px solid rgba(120, 116, 116, 0.68);
 
     span {
       line-height: 24px;

src/components/cy/dialog/src/useCyDialog.ts

@@ -1,10 +1,20 @@
-import {ref} from 'vue'
+import {ExtractPropTypes, ref} from 'vue'
 import {useCyNamespace} from "@/utils/xiaochan-element-plus";
-import {Props} from './CyDialog.vue'
 import {useResizeObserver} from "@vueuse/core";
 import {useDraggable} from "element-plus";
 
-export function UseCyDialog(props: Props) {
+
+export const CyDialogProps = buildProps({
+    title: String,
+    fullScreen: {
+        type: Boolean,
+        default: false
+    }
+})
+
+export type IsCyDialog = ExtractPropTypes<typeof CyDialogProps>
+
+export function UseCyDialog(props: IsCyDialog) {
     const ns = useCyNamespace('combo-grid')
     const headerRef = ref()
     const footerRef = ref()

src/components/zhu-yuan-yi-sheng/yi-zhu-lu-ru/EmrControlRuleDialog.vue

@@ -40,10 +40,9 @@
 
 </template>
 
-<script setup name='EmrControlRuleDialog'>
-import {myPatientQualityControl} from "@/api/zhu-yuan-yi-sheng/emr-control-rule";
+<script setup>
 import XcTable from "@/components/xiao-chan/xc-table/XcTable.vue";
-import {timeLimitPrompt} from "@/api/emr-control/emr-time-limit-prompt";
+import {myPatientQualityControl, timeLimitPrompt} from "@/api/emr-control/emr-time-limit-prompt";
 import {userInfoStore} from "@/utils/store-public";
 import XEUtils from 'xe-utils'
 import {yzMitt} from "@/views/hospitalization/zhu-yuan-yi-sheng/public-js/zhu-yuan-yi-sheng";
@@ -72,7 +71,7 @@ onMounted(() => {
     }
   })
 
-  myPatientQualityControl().then((res) => {
+  myPatientQualityControl(userInfoStore.value.code).then((res) => {
     suggestion.value = res
     if (suggestion.value.length > 0) {
       dialog.value = true