提交merge1.3

openhis-ui-vue3/src/views/doctorstation/components/emr/emrtemplate.vue

@@ -1,25 +1,5 @@
 <template>
   <div>
-<<<<<<< HEAD
-    <el-scrollbar height="200px">
-      <el-table
-        ref="emrTemplateRef"
-        :data="emrTemplate"
-        row-key="id"
-        highlight-current-row
-        @cell-click="clickRow"
-      >
-        <el-table-column label="模板名称" align="center" prop="templateName" />
-        <!-- <el-table-column label="使用范围" align="center" prop="useScopeCode" /> -->
-        <el-table-column label="操作" align="center" width="100">
-          <template #default="scope">
-            <el-button link type="primary" @click.stop="handelDelete(scope.row)">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-scrollbar>
-
-=======
     <el-table
       ref="emrTemplateRef"
       :data="emrTemplate"
@@ -36,7 +16,6 @@
         </template>
       </el-table-column>
     </el-table>
->>>>>>> v1.3
     <pagination
       v-show="total > 0"
       :total="total"
@@ -67,11 +46,7 @@ const props = defineProps({
     required: true,
   },
 });
-<<<<<<< HEAD
-getList(); 
-=======
 getList();
->>>>>>> v1.3
 function getList() {
   queryParams.value.useScopeCode = 1;
   getEmrTemplateList(queryParams.value).then((res) => {