Ver Fonte

小优化

xiaochan há 8 meses atrás
pai
commit
7721074f49

+ 1 - 2
src/components/cy/CyDialog/CyDialogContainer.vue

@@ -1,6 +1,6 @@
 <script setup lang="tsx">
 import { dialogKeyType } from "@/components/cy/CyDialog/index";
-import { useAttrs, useSlots } from "vue";
+import { useSlots } from "vue";
 import { ElButton } from "element-plus";
 
 const root = inject(dialogKeyType);
@@ -8,7 +8,6 @@ const hasFooter = useSlots().footer;
 const emits = defineEmits(["cancel", "confirm"]);
 
 onMounted(() => {
-  console.log(useAttrs());
   root.showFooter = false;
 });
 </script>

+ 3 - 5
src/components/zhu-yuan-yi-sheng/emr/emr-template/comp/PatientEmrData.vue

@@ -182,11 +182,9 @@ const contextmenuItemV2 = (e, data) => {
       {
         label: "删除文件夹",
         onClick: async () => {
-          await ElMessageBox.confirm(
-            "是否删除该文件夹,里面的病历并不会删除",
-            "删除",
-            { type: "error" }
-          );
+          await ElMessageBox.confirm("是否删除该文件夹", "删除", {
+            type: "error",
+          });
           await delDir(data.id);
           emits("refresh");
         },

+ 5 - 2
src/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/EmrRelieveRule.vue

@@ -72,7 +72,10 @@ const queryParam = ref({
 
 const queryData = (total = 0) => {
   queryParam.value.total = total;
-  getApplicationData(queryParam.value).then(res => {
+
+  const { data, ...params } = queryParam.value;
+
+  getApplicationData(params).then(res => {
     queryParam.value.data = res.records;
     queryParam.value.total = res.total;
   });
@@ -152,7 +155,7 @@ const stateHtml = val => {
         {
           type: "warning",
         },
-        { default: () => "申请替换" }
+        { default: () => "重新申请" }
       );
   }
 };

+ 2 - 5
src/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/emr-editor/components/add-emr-dialog/AddEmrDialog.vue

@@ -22,9 +22,7 @@ const defaultExpandedKeys = computed(() => {
   });
 });
 
-function contextmenu(event: Event, data) {
-  event.stopPropagation();
-  event.preventDefault();
+function contextmenu(data) {
   if (data.type === "group-category") return;
   emits("cyDialogConfirm", data);
 }
@@ -52,7 +50,7 @@ const TreeShow = defineComponent({
                 props={defaultProps}
                 defaultExpandedKeys={defaultExpandedKeys.value}
                 filterNodeMethod={handelFilter}
-                onNodeContextmenu={contextmenu}
+                onNodeClick={contextmenu}
                 defaultExpandAll={props.defaultExpandAll}
               />
             );
@@ -66,7 +64,6 @@ const TreeShow = defineComponent({
 
 <template>
   <div style="height: calc(100vh - 200px)" class="layout_container">
-    <el-alert type="warning" title="鼠标右键选中" />
     <el-tabs v-model="tabsValue" class="el-tabs__fill layout_main">
       <el-tab-pane label="全院" name="hospAll">
         <TreeShow :data="props.templateData" />