提交merge1.3

openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/accomplishList.vue

@@ -26,14 +26,6 @@
       >
         <el-table-column type="index" width="80" align="center" label="序号" />
         <el-table-column prop="patientName" align="center" label="申请患者" />
-<<<<<<< HEAD
-        <el-table-column prop="genderEnum_enumText" label="性别" align="center" />
-        <el-table-column label="年龄" align="center">
-  <template #default="scope">
-    {{ scope.row.age ? `${scope.row.age}岁` : '-' }}
-  </template>
-</el-table-column>
-=======
         <el-table-column prop="genderEnum_enumText" width="80" label="性别" align="center" />
         <el-table-column prop="age" width="80" label="年龄" align="center" />
         <el-table-column prop="busNo" align="center" label="患者住院号">
@@ -51,7 +43,6 @@
             {{ scope.row.admitSourceCode || '-' }}
           </template>
         </el-table-column>
->>>>>>> v1.3
         <el-table-column prop="sourceName" align="center" label="申请来源">
           <template #default="scope">
             {{ scope.row.sourceName || '-' }}