提交merge1.3

openhis-ui-vue3/src/views/inpatientDoctor/home/emr/index.vue

@@ -5,10 +5,6 @@
 -->
 <template>
   <div class="emr-use-container">
-<<<<<<< HEAD
-    <div class="disBtn" :class="{'disLeftBtnNor':leftShow,'disLeftBtnAct':!leftShow}" @click="disNode"><img src="../../../../assets/icons/svg/foldup.svg"></div>
-    <div class="disBtn" :class="{'disRightBtnNor':rightShow,'disRightBtnAct':!rightShow}" @click="disNode_R"><img src="../../../../assets/icons/svg/foldup.svg"></div>
-=======
     <div
       class="disBtn"
       :class="{ disLeftBtnNor: leftShow, disLeftBtnAct: !leftShow }"
@@ -23,7 +19,6 @@
     >
       <img src="../../../../assets/icons/svg/foldup.svg" />
     </div>
->>>>>>> v1.3
     <transition name="el-zoom-in-left">
       <div class="template-tree-container" v-if="leftShow">
         <div class="search-box">
@@ -35,15 +30,6 @@
         </div>
         <el-scrollbar class="template-tree-scrollbar">
           <el-tree
-<<<<<<< HEAD
-              ref="templateTree"
-              :data="templateData"
-              :props="defaultProps"
-              auto-expand-parent
-              node-key="id"
-              @node-click="handleNodeClick"
-              class="template-tree"
-=======
             ref="templateTree"
             :data="templateData"
             :props="defaultProps"
@@ -51,7 +37,6 @@
             node-key="id"
             @node-click="handleNodeClick"
             class="template-tree"
->>>>>>> v1.3
           ></el-tree>
         </el-scrollbar>
       </div>
@@ -91,31 +76,18 @@
         <el-tabs v-model="quicklyactiveName" type="card">
           <el-tab-pane label="历史" name="history">
             <History
-<<<<<<< HEAD
-                @historyClick="handleHistoryClick"
-                ref="historyRef"
-                v-model:definitionId="currentSelectTemplate.id"
-=======
               @historyClick="handleHistoryClick"
               ref="historyRef"
               v-model:definitionId="currentSelectTemplate.id"
               :selectedRecordId="selectedHistoryRecordId"
->>>>>>> v1.3
             />
           </el-tab-pane>
           <el-tab-pane label="模版" name="model">
             <Template
-<<<<<<< HEAD
-                @templateClick="handleTemplateClick"
-                ref="templateRef"
-                v-model:definitionId="currentSelectTemplate.id"
-                @edit="templateEdit"
-=======
               @templateClick="handleTemplateClick"
               ref="templateRef"
               v-model:definitionId="currentSelectTemplate.id"
               @edit="templateEdit"
->>>>>>> v1.3
             />
           </el-tab-pane>
         </el-tabs>
@@ -176,9 +148,6 @@ const emrComponentRef = ref(null);
 const quicklyactiveName = ref('history');
 const leftShow = ref(true);
 const rightShow = ref(true);
-<<<<<<< HEAD
-
-=======
 watch(patientInfo, () => {
   historyRef.value?.queryList();
   templateRef.value?.queryList();
@@ -187,7 +156,6 @@ const templateTree = ref(null);
 
 // 当前选中的历史病历ID，用于在History组件中高亮显示
 const selectedHistoryRecordId = ref('');
->>>>>>> v1.3
 
 // 树配置（模板树）
 const defaultProps = {
@@ -790,17 +758,10 @@ defineExpose({ state });
 
 const disNode = () => {
   leftShow.value = !leftShow.value;
-<<<<<<< HEAD
-}
-const disNode_R = () => {
-  rightShow.value = !rightShow.value;
-}
-=======
 };
 const disNode_R = () => {
   rightShow.value = !rightShow.value;
 };
->>>>>>> v1.3
 </script>
 <style lang="scss" scoped>
 .emr-use-container {
@@ -827,11 +788,7 @@ const disNode_R = () => {
     height: 60px;
     z-index: 1111;
     img {
-<<<<<<< HEAD
-      transform: rotate(-90deg) ;
-=======
       transform: rotate(-90deg);
->>>>>>> v1.3
     }
   }
   .disLeftBtnAct {