提交merge1.3

openhis-ui-vue3/src/views/inHospitalManagement/charge/advanceDeposit/index.vue

@@ -139,6 +139,7 @@
       ref="showPatientRef"
       :wardListOptions="wardListOptions"
       @patientSelected="handlePatientSelected"
+      @triggerSearch="handleTriggerSearch"
     />
     <ChargeDialog
       ref="chargeListRef"
@@ -178,7 +179,6 @@ const queryParams = ref({
   pageNo: 1,
   pageSize: 10,
   searchKey: undefined, // 供应商名称
-  searchKey: 'ZY202507310001',
 });
 const tableRowClassName = ({ row, rowIndex }) => {
   if (row.amount < 0) {
@@ -201,6 +201,7 @@ function getPatientInfo() {
   }
   console.log(queryParams.value, 'queryParams.value');
   getDepositInfo({ busNo: queryParams.value.searchKey }).then((res) => {
+    queryParams.value.searchKey = '';
     if (res.code == 200 && res.data.records[0].encounterId) {
       patientInfo.value = res.data.records[0];
       getDepositInfoPage({ encounterId: res.data.records[0].encounterId }).then((res) => {
@@ -240,12 +241,12 @@ function refund() {
 
 /** 选择病人 */
 function handlePatientSelected(row) {
-  console.log(row, 'rowwwwwwwwhandlePatientSelected');
-  queryParams.value.searchKey = row.admissionNo;
+  // console.log(row, 'rowwwwwwwwhandlePatientSelected');
+  // queryParams.value.searchKey = row.admissionNo;
   patientInfo.value = row;
-  nextTick(() => {
-    getPatientInfo();
-  });
+  // nextTick(() => {
+  //   getPatientInfo();
+  // });
 }
 /** 重置操作表单 */
 function reset() {
@@ -286,14 +287,19 @@ function formatValue(value) {
  *
  * @returns {void} 无返回值
  */
-function handleClose(str) {
+function handleClose(data) {
   openDialog.value = false;
   openRefundDialog.value = false;
-  if (str === 'success') {
+  if (data?.status === 'success' && data?.busNo) {
+    queryParams.value.searchKey = data.busNo;
     getPatientInfo();
-    proxy.$modal.msgSuccess('操作成功！');
   }
 }
+//在院患者查询
+function handleTriggerSearch(busNo) {
+  queryParams.value.searchKey = busNo; // 将选中患者的住院号赋值给搜索参数
+  getPatientInfo(); // 调用现有查询方法
+}
 </script>
 
 <style lang="scss" scoped>