Merge remote-tracking branch 'origin/develop' into develop

healthlink-his-ui/src/views/inHospitalManagement/charge/register/components/accomplishList.vue

@@ -54,8 +54,7 @@
       <vxe-table
         ref="tableRef"
         :data="treatHospitalizedData"
-        style="width: 100%"
-        height="100%"
+        min-width="1600px"
         show-overflow="title"
         @radio-change="handleRadioChange"
       >
@@ -68,6 +67,7 @@
         />
         <vxe-column
           field="patientName"
+          min-width="120"
           align="center"
           title="申请患者"
         />
@@ -85,6 +85,7 @@
         />
         <vxe-column
           field="busNo"
+          min-width="140"
           align="center"
           title="患者住院号"
         >
@@ -94,6 +95,7 @@
         </vxe-column>
         <vxe-column
           field="contractNo"
+          min-width="140"
           align="center"
           title="费用性质"
         >
@@ -105,7 +107,7 @@
           field="idCard"
           align="center"
           title="身份证号码"
-          width="180"
+          width="200"
         >
           <template #default="scope">
             {{ scope.row.idCard || '-' }}
@@ -113,9 +115,9 @@
         </vxe-column>
         <vxe-column
           field="organizationName"
+          min-width="140"
           align="center"
           title="入院科室"
-          width="120"
         >
           <template #default="scope">
             {{ scope.row.organizationName || '-' }}
@@ -125,10 +127,11 @@
           field="requestTime"
           align="center"
           title="登记时间"
-          width="160"
+          width="170"
         />
         <vxe-column
           field="admitSourceCode"
+          min-width="100"
           align="center"
           title="入院类型"
         >
@@ -149,6 +152,7 @@
         </vxe-column>
         <vxe-column
           field="sourceName"
+          min-width="120"
           align="center"
           title="申请来源"
         >
@@ -159,11 +163,13 @@
 
         <vxe-column
           field="wardName"
+          min-width="120"
           align="center"
           title="入院病区"
         />
         <vxe-column
           field="registrar"
+          min-width="100"
           align="center"
           title="登记员"
         />
@@ -269,6 +275,10 @@ const queryParams = ref({
   pageSize: 10,
   registeredFlag: '1',
   searchKey: '',
+  idCard: '',
+  organizationId: '',
+  startTime: '',
+  endTime: '',
 });
 
 const treatHospitalizedData = ref([]);
@@ -326,8 +336,8 @@ const doVoid = (row) => {
     .catch(() => {});
 };
 
-const handleRadioChange = ({ newValue }) => {
-  selectedRow.value = newValue;
+const handleRadioChange = ({ row }) => {
+  selectedRow.value = row;
 };
 
 const handlePrintCertificate = async () => {
@@ -508,6 +518,7 @@ const getList = () => {
   }
   .table-container {
     padding: 8px 16px;
+    overflow-x: auto;
   }
 }
 </style>