提交merge1.3

2025-12-27 15:30:25 +08:00
parent 8c607c8749
commit 088861f66e
1245 changed files with 220442 additions and 77616 deletions
--- a/openhis-ui-vue3/src/views/basicservices/registrationfee/index.vue
+++ b/openhis-ui-vue3/src/views/basicservices/registrationfee/index.vue
@@ -160,6 +160,7 @@
                  @click="
                    () => {
                      form.ybNo = item.ybNo;
+                      form.busNo = item.busNo;
                      form.price = item.retailPrice;
                    }
                  "
@@ -756,7 +757,11 @@ const transformFormData = (form) => {
    ybNo,
    title,
    comment,
+<<<<<<< HEAD
    practitionerId,
+=======
+    busNo,
+>>>>>>> v1.3
  } = form.value;

  return {
@@ -774,7 +779,11 @@ const transformFormData = (form) => {
      appointmentRequiredFlag,
      extraDetails,
      comment,
+<<<<<<< HEAD
      practitionerId,
+=======
+      busNo,
+>>>>>>> v1.3
    },
    chargeItemDefinitionFormData: {
      id,
@@ -813,7 +822,11 @@ const transformFormEditData = (form) => {
    ybNo,
    title,
    comment,
+<<<<<<< HEAD
    practitionerId,
+=======
+    busNo,
+>>>>>>> v1.3
  } = form.value;

  return {
@@ -831,7 +844,11 @@ const transformFormEditData = (form) => {
      appointmentRequiredFlag,
      extraDetails,
      comment,
+<<<<<<< HEAD
      practitionerId,
+=======
+      busNo,
+>>>>>>> v1.3
    },
  };
 };