Merge branch 'feature-organization-yjl-1101' into dev

src/views/system/org/APIAuthModal.vue

@@ -36,7 +36,7 @@
   const isUpdate = ref(true)
   const loading = ref(false)
   const rowId = ref('')
-  const linkId = ref('')
+  const orgId = ref('')
   const { createMessage } = useMessage()
   const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
     labelWidth: 100,
@@ -48,7 +48,7 @@
     resetFields()
     setModalProps({ confirmLoading: false, loading: true })
     isUpdate.value = !!data?.isUpdate
-    linkId.value = data.linkId ? data.linkId : ''
+    orgId.value = data.orgId ? data.orgId : ''
     if (unref(isUpdate)) {
       rowId.value = data.record.id ? data.record.id : data.record.value
       const res: API.DataResult = await getOrgAuthInfo({ id: unref(rowId) })
@@ -77,7 +77,7 @@
     try {
       const values = await validate()
       setModalProps({ confirmLoading: true, loading: true })
-      values.linkId = values.linkId ? values.linkId : linkId.value
+      values.orgId = values.orgId ? values.orgId : orgId.value
       if (values.status) {
         values.status = 0
       } else {

src/views/system/org/OrgModal.vue

@@ -334,7 +334,7 @@
       })
     },
     beforeFetch: (p) => {
-      return formatParams(p)
+      return formatParams({ ...p, orgId: rowId.value })
     },
     maxHeight: 400,
     columns: APIColumns,
@@ -355,13 +355,14 @@
       isParent: false,
       isUpdate: false,
       orgFullName: getFieldsValue().orgFullName,
-      linkId: linkId.value,
+      orgId: linkId.value,
     })
   }
   function EditAPIAuth(record: Recordable) {
     openAPIModal(true, {
       record,
       isUpdate: true,
+      orgId: linkId.value,
     })
   }
 </script>

src/views/system/org/columns.tsx

@@ -776,7 +776,7 @@ export const APIformSchema: FormSchema[] = [
   },
   {
     label: '',
-    field: 'linkId',
+    field: 'orgId',
     component: 'Input',
     defaultValue: '',
     show: false,