修复机构服务包引入问题

src/service/EditSystemService.vue

@@ -29,6 +29,7 @@ const props = defineProps<{ data: FollowModel }>();
 const fileList = ref<UploadFile[]>([]);
 const uploadProps = reactive({ showRemoveIcon: true });
 const emit = defineEmits<{ submit: [data?: SystemCwModel] }>();
+const deptId = ref<string>('');
 // 获取所有的机构
 const branch = ref<any[]>([]);
 const { loading: branchLoading } = useRequest(branchMethod).onSuccess(({ data }) => {
@@ -550,6 +551,9 @@ function removeTableRow(idx: number) {
 }
 // 引入服务包
 function addInstitution() {
+  deptId.value = localStorage.getItem('deptId') || '';
+  console.log(deptId.value, '当前机构');
+  console.log(formData.institutionId, '选择的机构');
   VxeUI.modal.open({
     title: '选择引入',
     width: 1000,
@@ -563,6 +567,7 @@ function addInstitution() {
       default() {
         return h(ServicePackageList, {
           data: formData,
+          institutionId: formData.institutionId ? formData.institutionId : deptId.value,
           onSubmit(data: SystemCwModel) {
             VxeUI.modal.close(`systemService-list-modal`);
           },
@@ -629,11 +634,11 @@ function openPopover() {
           style="width: 220px"
           :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
           placeholder="请选择"
-          allow-clear
           tree-default-expand-all
           :tree-data="branch"
           @select="handleSelect"
           :loading="branchLoading"
+          :getPopupContainer="(triggerNode: any) => triggerNode.parentNode"
         />
       </div>
       <!-- 服务包名称 -->
@@ -668,7 +673,14 @@ function openPopover() {
         <span class="w-20">使用限制</span>
         <div class="mr-10">
           <span>性别：</span>
-          <a-select placeholder="请选择" v-model:value="formData.conditioningWrapPatientMatchRule.sex" style="width: 150px; margin: 0 5px" allowClear :loading="gendersLoading">
+          <a-select
+            placeholder="请选择"
+            v-model:value="formData.conditioningWrapPatientMatchRule.sex"
+            style="width: 150px; margin: 0 5px"
+            allowClear
+            :loading="gendersLoading"
+            :getPopupContainer="(triggerNode: any) => triggerNode.parentNode"
+          >
             <a-select-option v-for="option in genders" :key="option.id" :value="option.id" placeholder="请选择">
               {{ option.name }}
             </a-select-option>
@@ -676,7 +688,13 @@ function openPopover() {
         </div>
         <div>
           <span>年龄：</span>
-          <a-select v-model:value="formData.conditioningWrapPatientMatchRule.age" style="width: 150px; margin: 0 8px" placeholder="请选择" allowClear>
+          <a-select
+            v-model:value="formData.conditioningWrapPatientMatchRule.age"
+            style="width: 150px; margin: 0 8px"
+            placeholder="请选择"
+            allowClear
+            :getPopupContainer="(triggerNode: any) => triggerNode.parentNode"
+          >
             <a-select-option v-for="option in ages" :key="option.id" :value="option.id" placeholder="请选择">{{ option.name }}</a-select-option>
           </a-select>
         </div>
@@ -712,6 +730,7 @@ function openPopover() {
             placeholder="请选择"
             allowClear
             mode="multiple"
+            :getPopupContainer="(triggerNode: any) => triggerNode.parentNode"
           >
             <a-select-option v-for="option in constitutionGroups" :key="option.id" :value="option.id" placeholder="请选择">{{ option.name }}</a-select-option>
           </a-select>
@@ -725,6 +744,7 @@ function openPopover() {
             placeholder="请选择"
             allowClear
             mode="multiple"
+            :getPopupContainer="(triggerNode: any) => triggerNode.parentNode"
             @change="(value) => (formData.conditioningWrapPatientMatchRule.willillStateNames = value)"
           >
             <a-select-option v-for="option in desiredConditions" :key="option.id" :value="option.id" placeholder="请选择">{{ option.name }}</a-select-option>

src/service/ServicePackageList.vue

@@ -6,7 +6,7 @@ import { getSystemCpListMethod, getCopyCwMethod } from '@/request/api/care.api';
 import { usePagination } from 'alova/client';
 import type { SystemCwModel } from '@/model/care.model';
 type FollowModel = Partial<SystemCwModel>;
-const props = defineProps<{ data: FollowModel }>();
+const props = defineProps<{ data: FollowModel; institutionId: string }>();
 const emit = defineEmits(['update:data']);
 const tableData = ref<SystemCwModel[]>([]);
 const { loading, page, pageSize, total, onSuccess, replace, refresh, remove } = usePagination((page, size) => getSystemCpListMethod(page, size), {
@@ -20,7 +20,6 @@ onSuccess(({ data: { data } }) => {
   loading.value = false;
 });
 const id = ref<string>('');
-const institutionId = ref<string>('');
 async function handleSubmit() {
   const res: any = await getCopyCwMethod(parms.value);
   if (res && res.items && res.items.length > 0) {
@@ -45,12 +44,11 @@ const parms = ref<any>({});
 async function handleSelect(model?: SystemCwModel) {
   if (model?.id) {
     id.value = model.id;
-    institutionId.value = model.institutionId || '';
     try {
       parms.value = {
         types: 'institution',
         id: model.id,
-        institutionId: model.institutionId,
+        institutionId: props.institutionId,
       };
     } catch (err) {
       console.error('Error fetching data:', err);
@@ -71,7 +69,7 @@ async function handleSelect(model?: SystemCwModel) {
         return h(IntroduceProjectList, {
           data: { ...props.data },
           id: id.value,
-          institutionId: institutionId.value,
+          institutionId: props.institutionId,
           onSubmit() {
             handleSubmit();
             VxeUI.modal.close(`introduceProjectList-modal`);