xiaochan 4 meses atrás
pai
commit
2c812dac3f

+ 1 - 0
src/api/zhu-yuan-yi-sheng/yi-zhu-lu-ru.ts

@@ -335,6 +335,7 @@ export function confirmYzCheck(patNo, times, ledgerSn) {
   return requestV2({
     url: url + "/confirmYzCheck",
     method: "get",
+    showLoading: false,
     params: { patNo, times, ledgerSn },
   });
 }

+ 8 - 5
src/components/cy/CyDialog/index.vue

@@ -110,11 +110,14 @@ const style = (item: DialogState) => {
     </template>
     <ConfigProvider :item="item">
       <component
-        :style="{
-          height: item.dialogProps.height
-            ? XEUtils.addUnit(item.dialogProps.height)
-            : '',
-        }"
+        :style="
+          () => {
+            if (item.dialogProps.height) {
+              return { height: XEUtils.addUnit(item.dialogProps.height) };
+            }
+            return {};
+          }
+        "
         :is="item.component"
         :ref="el => setRef(el, item)"
         v-bind="item.params"

+ 5 - 5
src/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/emr-editor/plugins/opinion/AuditRecord.vue

@@ -8,9 +8,7 @@ import {
 import { useUserStore } from "@/pinia/user-store";
 import { formatDateToStr } from "@/utils/moment-utils";
 import AuditDisplayComponent from "@/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/emr-editor/plugins/opinion/AuditDisplayComponent.vue";
-import { ElMessageBox } from "element-plus";
 import { needRule } from "@/utils/public";
-import XEUtils from "xe-utils";
 import XcElOption from "@/components/xiao-chan/xc-el-option/XcElOption.vue";
 import { CyMessageBox } from "@/utils/cy-message-box";
 
@@ -32,8 +30,10 @@ async function delById(row: EmrAuditDetail, index: number) {
     message: "是否删除该意见",
     type: "delete",
   });
-  await deleteEmrAuditByEmrId(row.id);
-  root!.state.currentAudit.splice(index, 1);
+  await deleteEmrAuditByEmrId(row.id).then(() => {
+    const findIndex = root.state.currentAudit.findIndex(i => (i.id = row.id));
+    findIndex > -1 && root!.state.currentAudit.splice(findIndex, 1);
+  });
 }
 
 function showDel(item: EmrAuditDetail) {
@@ -44,7 +44,7 @@ const tmpData = computed(() => {
   if (remediationStatus.value === 0) {
     return root.state.currentAudit;
   }
-  return XEUtils.filter(root.state.currentAudit, (audit: EmrAuditDetail) => {
+  return root.state.currentAudit.filter((audit: EmrAuditDetail) => {
     return remediationStatus.value === 1
       ? audit.remediationStatus === null
       : audit.remediationStatus !== null;

+ 0 - 1
src/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/emr-editor/plugins/opinion/SendAudit.vue

@@ -69,7 +69,6 @@ function handleSendAudit() {
     xcMessage.error("请先选中需要审核的数据");
     return;
   }
-
   CyMessageBox.confirm({
     title: "发送审核",
     message: `请确认是否发送给【${sendDoctor.value.name}】医生`,