提交merge1.3

openhis-ui-vue3/src/views/ybmanagement/inhospital/register/index.vue

@@ -1,36 +1,5 @@
 <template>
   <div class="app-container">
-<<<<<<< HEAD
-    <el-tabs v-model="activeName" type="card" class="demo-tabs">
-      <el-tab-pane label="待登记入院" name="first">
-        <AwaitList v-if="activeName === 'first'" @okList="activeName = 'second'" />
-      </el-tab-pane>
-      <el-tab-pane label="已登记入院" name="second">
-        <AccomplishList v-if="activeName === 'second'" />
-      </el-tab-pane>
-      <!-- <el-tab-pane label="在院患者" name="third">
-        <ExistListt />
-      </el-tab-pane> -->
-    </el-tabs>
-  </div>
-</template>
-<script setup>
-import { getCurrentInstance, onBeforeMount, onMounted, reactive, ref } from 'vue';
-import { AwaitList, AccomplishList, ExistList } from './components/index.js';
-const { proxy } = getCurrentInstance();
-const emits = defineEmits([]);
-const props = defineProps({});
-const state = reactive({});
-defineExpose({ state });
-const activeName = ref('first');
-
-</script>
-<style lang="scss" scoped>
-.sds {
-  background-color: red;
-}
-</style>
-=======
     <el-form :model="queryParams" ref="queryRef" :inline="true" label-width="68px">
       <el-form-item label="内容" prop="searchKey">
         <el-input
@@ -305,4 +274,3 @@ function resetQuery() {
 
 getList();
 </script>
->>>>>>> v1.3