lanjianrong 3 rokov pred
rodič
commit
be0e42212b

+ 9 - 5
src/pages/Project/Created/index.tsx

@@ -3,6 +3,7 @@ import { useState, useEffect, useRef } from 'react'
 import ProTable from '@ant-design/pro-table'
 import type { ActionType } from '@ant-design/pro-table'
 import { ModalForm } from '@ant-design/pro-form'
+import type { ProFormInstance } from '@ant-design/pro-form'
 import type { ProFormColumnsType } from '@ant-design/pro-form'
 import { DeleteOutlined } from '@ant-design/icons'
 import { queryAcountList } from '@/services/api/institution'
@@ -20,6 +21,7 @@ enum CreatedModalType {
 
 const Created = () => {
   const tRef = useRef<ActionType>(null)
+  const mRef = useRef<ProFormInstance>(null)
   const [state, setState] = useState({
     dataID: null,
     modalType: CreatedModalType.ADD,
@@ -92,11 +94,12 @@ const Created = () => {
   const onFinish = async formData => {
     try {
       if (state.modalType === CreatedModalType.ADD) {
-        await trySaveCreator({ ...formData, isCreated: true })
+        await trySaveCreator({ ...formData, isCreated: 1 })
       } else {
-        await trySaveCreator({ ID: state.dataID, isCreated: false })
+        await trySaveCreator({ ID: state.dataID, isCreated: 0 })
       }
-      tRef?.current?.reset()
+      tRef?.current?.reload()
+      mRef?.current?.resetFields()
       setState({ ...state, modalVisible: false })
       return true
     } catch (error) {
@@ -126,7 +129,7 @@ const Created = () => {
           const {
             code = -1,
             data: { items, total }
-          } = await queryAcountList({ ...params, ...filter, ...sort, isCreated: true })
+          } = await queryAcountList({ ...params, ...filter, ...sort, isCreated: 1 })
           return {
             success: code === consts.RET_CODE.SUCCESS,
             data: items,
@@ -137,6 +140,7 @@ const Created = () => {
       <ModalForm
         title={state.modalType === CreatedModalType.ADD ? '添加创建人' : '移除创建人'}
         onFinish={onFinish}
+        formRef={mRef}
         submitter={{
           submitButtonProps: {
             danger: true
@@ -152,7 +156,7 @@ const Created = () => {
               name="ID"
               label="创建人可在前台创建项目、上传项目数据、编制项目等"
               rules={[{ required: true, message: '请选择创建人' }]}>
-              <TreeNodeSelect params={{ isCreated: false }} />
+              <TreeNodeSelect params={{ isCreated: 0 }} />
             </Form.Item>
             {/* <ProFormSelect
               name="ID"

+ 1 - 1
src/pages/Project/Management/components/Detail.tsx

@@ -207,7 +207,7 @@ const DetailModal: React.FC<ProjectModalProps> = ({
             label="创建人:创建项目、管理编辑者、上传项目数据、编制项目、添加批注"
             name="createdID"
             rules={[{ required: true, message: '请选择创建人' }]}>
-            <TreeNodeSelect params={{ isCreated: true }} />
+            <TreeNodeSelect params={{ isCreated: 1 }} />
           </Form.Item>
           <Form.Item label="编辑者:编制项目、上传项目数据、添加批注" name="reportAccount">
             <TreeNodeSelect multiple />

+ 1 - 1
src/services/api/user.ts

@@ -114,7 +114,7 @@ export async function deleteUser(
 }
 
 // 报错创建人
-export async function saveCreator(params: { ID: string; isCreated?: boolean }) {
+export async function saveCreator(params: { ID: string; isCreated?: 1 | 0 }) {
   return request('/account/save/create', {
     method: 'POST',
     data: params