فهرست منبع

fix: 修改bug

bill 2 سال پیش
والد
کامیت
efda0c43f6
3فایلهای تغییر یافته به همراه13 افزوده شده و 7 حذف شده
  1. 3 3
      src/views/material/edit.vue
  2. 9 3
      src/views/material/list.vue
  3. 1 1
      src/views/member/list.vue

+ 3 - 3
src/views/material/edit.vue

@@ -52,10 +52,10 @@
 <script lang="ts" setup>
 import { ref, defineProps, toRaw } from 'vue'
 
-import type { Member } from '@/api'
+import type { Member, SetMemberProps } from '@/api'
 import type { FormInstance } from 'ant-design-vue'
 
-export type EditMember = PartialPart<Member, 'teamId' | 'projectId'>
+export type EditMember = PartialPart<SetMemberProps, 'projectId'>
 
 defineOptions<{ name: 'edit-member' }>()
 
@@ -68,7 +68,7 @@ const props = defineProps<{
 const editMember = ref<EditMember>(
   props.member
     ? { ...props.member }
-    : { userName: '', remark: '', bindAccount: '', roles: [] }
+    : { userName: '', remark: '', bindAccount: '', roles: [], nickName: '' }
 )
 const fromRef = ref<FormInstance>()
 const visible = ref(true)

+ 9 - 3
src/views/material/list.vue

@@ -40,7 +40,8 @@ import {
   fetchMembers,
   checkMemberUserName,
   addMember,
-  updateMember
+  updateMember,
+  SetMemberProps
 } from '@/api'
 
 import type { Member } from '@/api'
@@ -77,14 +78,19 @@ const [materials, updateMaterials] = useRealtime(async () => {
   return result.list
 }, [])
 
+const params = reactive({
+  userName: '',
+  projectId: computed(() => Number(router.currentRoute.value.params.id))
+})
+
 const addMaterial = () => {
   renderModal(EditMember, {
     async onSave(member) {
       if (member.teamId) {
-        await updateMember(member as Member)
+        await updateMember({ ...member, teamId: member.teamId })
       } else {
         await checkMemberUserName(member.userName)
-        await addMember(projectId.value, member)
+        await addMember({ ...member, projectId: params.projectId })
       }
       await updateMaterials()
     }

+ 1 - 1
src/views/member/list.vue

@@ -74,7 +74,7 @@ const setMember = (member?: Member) => {
     },
     async onSave(member) {
       if (member.teamId) {
-        await updateMember(member as any)
+        await updateMember({ ...member, teamId: member.teamId })
       } else {
         await checkMemberUserName(member.userName)
         await addMember({ ...member, projectId: params.projectId })