提交merge1.3

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

@@ -1,5 +1,6 @@
 <template>
   <div>
+<<<<<<< HEAD
     <el-scrollbar height="200px">
       <el-table
         ref="emrTemplateRef"
@@ -18,11 +19,30 @@
       </el-table>
     </el-scrollbar>
 
+=======
+    <el-table
+      ref="emrTemplateRef"
+      :data="emrTemplate"
+      row-key="id"
+      highlight-current-row
+      max-height="400"
+      @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>
+>>>>>>> v1.3
     <pagination
       v-show="total > 0"
       :total="total"
-      v-model:page="queryParams.pageNum"
+      v-model:page="queryParams.pageNo"
       v-model:limit="queryParams.pageSize"
+      layout="prev, pager, next"
       @pagination="getList"
     />
   </div>
@@ -31,9 +51,13 @@
 <script setup>
 import { getEmrTemplateList, deleteEmrTemplate } from '../api';
 
-const queryParams = ref({});
+const queryParams = ref({
+  pageSize: 10,
+  pageNo: 1,
+});
 const emrTemplate = ref([]);
 const emrTemplateRef = ref();
+const total = ref(0);
 const emits = defineEmits(['selectRow']);
 const { proxy } = getCurrentInstance();
 const selectRow = ref({});
@@ -43,10 +67,15 @@ const props = defineProps({
     required: true,
   },
 });
+<<<<<<< HEAD
 getList(); 
+=======
+getList();
+>>>>>>> v1.3
 function getList() {
   queryParams.value.useScopeCode = 1;
   getEmrTemplateList(queryParams.value).then((res) => {
+    total.value = res.data.total;
     emrTemplate.value = res.data.records;
     console.log(emrTemplate.value, 'emrTemplate.value');
   });