修复问题

src/components/cy/date-range/CyDateRange.vue

@@ -8,7 +8,8 @@ import {
 } from "@/utils/moment-utils";
 import moment from "moment/moment";
 import XEUtils from "xe-utils";
-import { ComputedRef, WritableComputedRef } from "vue";
+import { WritableComputedRef } from "vue";
+import { useVModel } from "@vueuse/core";
 
 const shortcuts = [
   {
@@ -56,6 +57,7 @@ const shortcuts = [
 
 const props = withDefaults(
   defineProps<{
+    modelValue?: any;
     start?: string;
     end?: string;
     clearable?: boolean;
@@ -71,8 +73,10 @@ const props = withDefaults(
   }
 );
 
-const model = defineModel<string[] | object>();
-const isArr = XEUtils.isArray(model);
+const emits = defineEmits(["update:modelValue"]);
+
+const model = useVModel(props, "modelValue", emits);
+const isArr = XEUtils.isArray(model.value);
 
 const dateRange: WritableComputedRef<string[]> = computed({
   get() {

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

@@ -2,7 +2,6 @@
   <div class="layout_container">
     <header>
       <cy-date-range v-model="queryParam" />
-      <!--      <xc-date-picker v-model="queryParam.dateRange" />-->
       <el-select v-model="queryParam.flag" style="width: 120px">
         <el-option label="全部" :value="-1" />
         <el-option label="待审核" :value="0" />

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

@@ -1,53 +1,59 @@
 <script lang="ts" setup>
-import {onMounted, ref} from "vue";
-import {xcMessage} from "@/utils/xiaochan-element-plus";
+import { onMounted, ref } from "vue";
+import { xcMessage } from "@/utils/xiaochan-element-plus";
 import CyDialog from "@/components/cy/dialog/src/CyDialog.vue";
 
 const props = defineProps<{
-  extractData: any,
-  patientData: any
-}>()
+  extractData: any;
+  patientData: any;
+}>();
 
-const checkboxs = ref([])
-const patients = ref([])
+const checkboxs = ref([]);
+const patients = ref([]);
 
 function confirm(next) {
   if (checkboxs.value.length === 0) {
-    return xcMessage.error('至少选择一项')
+    return xcMessage.error("至少选择一项");
   }
-  next({checkboxs: checkboxs.value, patients: patients.value})
+  next({ checkboxs: checkboxs.value, patients: patients.value });
 }
 
 onMounted(() => {
   for (let key in props.extractData) {
-    checkboxs.value.push(key)
+    checkboxs.value.push(key);
   }
-})
+});
 </script>
 
 <template>
-  <CyDialog title="选择性填充"
-            body-width="60%"
-            :confirm-click="confirm"
-            confirm-text="填充"
-            body-height="max-content"
+  <CyDialog
+    title="选择性填充"
+    body-width="60%"
+    :confirm-click="confirm"
+    confirm-text="填充"
+    body-height="max-content"
   >
     <el-form label-position="top">
       <el-form-item label="病历提取数据：">
         <el-checkbox-group v-model="checkboxs">
-          <el-checkbox :label="key" :value="key"
-                       v-for="(_value, key) in extractData"
-                       :key="key">
+          <el-checkbox
+            :label="key"
+            :value="key"
+            v-for="(_value, key) in extractData"
+            :key="key"
+          >
             {{ key }}
           </el-checkbox>
         </el-checkbox-group>
       </el-form-item>
       <el-form-item label="患者基本信息：">
         <el-checkbox-group v-model="patients">
-          <el-checkbox :label="key"
-                       :value="key"
-                       v-for="(_value, key) in patientData"
-                       :key="key">
+          <el-checkbox
+            :label="key"
+            :value="key"
+            v-for="(_value, key) in patientData"
+            :key="key"
+          >
             {{ key }}
           </el-checkbox>
         </el-checkbox-group>
@@ -55,5 +61,3 @@ onMounted(() => {
     </el-form>
   </CyDialog>
 </template>
-
-

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

@@ -433,11 +433,6 @@ const emrEvent = {
     const node = view.model;
     const values = parsingFragmentDataElements(editor, node);
     const editorCode = getBcjlUserInfo(values).code;
-    // 因为签名只有在保存时才有所以，如果是空的就是本人创建的
-    if (stringIsBlank(editorCode)) {
-      editor!.setRevisionMode("off");
-      return;
-    }
     openTheTraceByUser(editorCode);
   },
   beforeCopy: (evt, data) => {
@@ -830,9 +825,6 @@ const objectValuesCannotBeNull = object => {
 const clickDelete = () => {
   waitForLoadingToComplete();
   whetherThereIsAMedicalRecordId();
-  if (createId.value !== userInfo.code) {
-    BizException(ExceptionEnum.LOGICAL_ERROR, "创建人不是您，无法删除。");
-  }
   CyMessageBox.confirm({
     message:
       "是否要删除该模板，\n删除的模板可以在回收站中找回，出院患者需要召回才能删除。",
@@ -850,7 +842,7 @@ const clickDelete = () => {
       }
     }
     emrStore.store.isEditorChange = false;
-    emrSidebarRef.value!.queryData();
+    emrSidebarRef.value?.queryData?.();
     emptyEditor();
   });
 };
@@ -1077,10 +1069,10 @@ const setEditorModeFun = () => {
 
 /**
  * 根据用户的id来判断是否开启流痕，没有创建人不需要判断。
- * @param editorCode
+ * @param editorCode 创建人
  */
 const openTheTraceByUser = editorCode => {
-  if (readonlyPattern() || stringIsBlank(createId.value)) {
+  if (readonlyPattern() || stringIsBlank(editorCode)) {
     editor!.setRevisionMode("off");
     return;
   }
@@ -1546,10 +1538,6 @@ const emrMittInit = () => {
   });
   emrMitt.on("dataSourcePadding", dataSourcePadding);
 
-  emrMitt.on("getIframe", () => {
-    return editMain!.iframe;
-  });
-
   emrMitt.on("setShowIframe", val => {
     showIframe.value = val;
   });
@@ -1654,12 +1642,6 @@ const initEdit = () => {
     emrStore.mutation.installPlugins(res, emrStore);
     if (isDev) {
       await sleep(500);
-      loadDocument({
-        documentId: "927936636556216320",
-        categoryCode: "wqzjsqb",
-        name: "病程记录",
-        parent: "38ed7f50a6ba11eda4de571d638b2c14",
-      });
     }
   });
 };

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

@@ -16,7 +16,6 @@ import XcElOption from "@/components/xiao-chan/xc-el-option/XcElOption.vue";
 import { useUserStore } from "@/pinia/user-store";
 import { patientInfo } from "@/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/emr-editor/emr-init";
 import { stringIsBlank } from "@/utils/blank-utils";
-import sleep from "@/utils/sleep";
 
 const { store } = inject(emrRootContextKey);
 const selectList = ref<SignComp[]>([]);
@@ -255,16 +254,6 @@ const addCompByInternal = (name: string) => {
   change();
 };
 
-onMounted(async () => {
-  await sleep(1000);
-  signTypeValue.value = 1;
-  selectList.value.forEach((item, index) => {
-    item.signType = index + 1;
-    item.idCard = "430922200002078519";
-    item.signName = "肖蟾";
-  });
-});
-
 const addAuthorizedSignatureDataElement = () => {
   const editor = store.getEditor();