xiaochan 11 months ago
parent
commit
55ea64fdec

+ 19 - 16
src/components/cy/CyDialog/index.vue

@@ -73,26 +73,29 @@ function setRef(el, item) {
       @cyDialogConfirm="
         (value: any, isEmits = true) => handleConfirm(item, isEmits, value)
       "
+      :teleport="`Cy-dialog-${item.dialogKey}`"
     />
 
     <template #footer>
-      <el-button
-        size="default"
-        v-if="item.showCancel"
-        @click="handleCancel(item)"
-      >
-        {{ item.cancelText || "取消" }}
-      </el-button>
+      <div :id="`Cy-dialog-${item.dialogKey}_footer`">
+        <el-button
+          size="default"
+          v-if="item.showCancel"
+          @click="handleCancel(item)"
+        >
+          {{ item.cancelText || "取消" }}
+        </el-button>
 
-      <el-button
-        v-if="item.showConfirm"
-        type="primary"
-        size="default"
-        color="hsl(240 5.9% 10%)"
-        @click="handleConfirm(item)"
-      >
-        {{ item.confirmText || "确认" }}
-      </el-button>
+        <el-button
+          v-if="item.showConfirm"
+          type="primary"
+          size="default"
+          color="hsl(240 5.9% 10%)"
+          @click="handleConfirm(item)"
+        >
+          {{ item.confirmText || "确认" }}
+        </el-button>
+      </div>
     </template>
   </el-dialog>
 </template>

+ 12 - 20
src/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/emr-func/ca/EmrCAComp.vue

@@ -7,11 +7,7 @@ import {
 } from "@/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/emr-func/ca/emr-ca";
 import XEUtils from "xe-utils";
 import { BizException, ExceptionEnum } from "@/utils/BizException";
-import {
-  completeQrCode,
-  hBoardSignV2,
-  sendMoreEventSign,
-} from "@/api/ca/ca-api";
+import { completeQrCode, sendMoreEventSign } from "@/api/ca/ca-api";
 import { useDialog } from "@/components/cy/CyDialog/index";
 import EmrCaSign from "@/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/emr-func/ca/EmrCaSign.vue";
 import { ElMessageBox } from "element-plus";
@@ -64,7 +60,6 @@ const changeSignType = val => {
 };
 
 function change() {
-  moveSendCode.value = patientInfo.value.ward;
   selectList.value = [];
   const editor = store.getEditor();
 
@@ -99,19 +94,18 @@ function handleClick(id) {
   store.editFun.jumpById(id);
 }
 
-const sendSignature = async (value: SignComp) => {
+const sendSignature = async () => {
   const editor = store.getEditor();
   const documentId = editor.documentData._id;
 
-  editor.setEditorMode("readonly");
-  const rst = await hBoardSignV2({
-    documentId,
-    content: value.content,
-    clear: forTheFirstTime.value,
-    name: value.signName,
-    idCard: XEUtils.encrypt(value.idCard, idCardPublicKey),
-    signType: value.signType,
-  });
+  // const rst = await hBoardSignV2({
+  //   documentId,
+  //   content: value.content,
+  //   clear: forTheFirstTime.value,
+  //   name: value.signName,
+  //   idCard: XEUtils.encrypt(value.idCard, idCardPublicKey),
+  //   signType: value.signType,
+  // });
 
   useDialog(EmrCaSign, {
     dialogProps: {
@@ -120,13 +114,11 @@ const sendSignature = async (value: SignComp) => {
       fullscreen: true,
     },
     params: {
-      url: rst.result,
-      id: rst.id,
       documentId,
     },
     showCancel: false,
+    showConfirm: false,
   }).then(res => {
-    value.complete = true;
     completeSignature();
   });
 };
@@ -185,7 +177,7 @@ const checkParams = () => {
 };
 
 function sendClick() {
-  checkParams();
+  // checkParams();
   if (signTypeValue.value === 1) {
     sendSignature();
   }

+ 8 - 2
src/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/emr-func/ca/EmrCaSign.vue

@@ -1,9 +1,9 @@
 <script setup lang="ts">
 import { scanCodeVerification } from "@/api/ca/ca-api";
-import * as url from "node:url";
 
 const props = defineProps<{
   documentId: string;
+  teleport: string;
 }>();
 
 const url = ref("");
@@ -17,5 +17,11 @@ defineExpose({
 </script>
 
 <template>
-  <iframe :src="url" class="layout_full_iframe" />
+  <div class="layout_h-w_max">
+    <iframe :src="url" class="layout_full_iframe" />
+    <Teleport :to="`${props.teleport}_footer`">
+      <el-button>取消</el-button>
+      <el-button>下一个</el-button>
+    </Teleport>
+  </div>
 </template>