outaozhen 3 роки тому
батько
коміт
ca40e33504

+ 6 - 0
src/components/Flow/src/components/Drawer/index.tsx

@@ -6,6 +6,7 @@ import type { RadioChangeEvent } from 'antd'
 import { queryAcountList } from '@/services/api/institution'
 import consts from '@/utils/consts'
 import { ApprovalMethod, ApprovalType } from '../../enum'
+import TreeNodeSelect from '@/pages/Project/Management/components/TreeNodeSelect'
 const debounceTimeout = 800
 
 const FlowDrawer = () => {
@@ -124,6 +125,11 @@ const FlowDrawer = () => {
             <span className="font-medium mr-1 text-14px">添加员工</span>
             {/* <span className="text-hex-000000 text-opacity-45">不得超过20人</span> */}
           </div>
+          {/* <TreeNodeSelect
+            showSearch
+            onChange={triggerChange}
+            treeData={state.options?.filter(item => !staffIds.includes(item.value))}
+          /> */}
           <Select
             showSearch
             disabled={state.staffOptions.length}

+ 3 - 4
src/pages/Project/Management/components/Detail.tsx

@@ -77,8 +77,8 @@ const DetailModal: React.FC<ProjectModalProps> = ({
     }
     if (state.activeKey === '2') {
       const TabFormData = {
-        accountID: defaultFormData.reportAccount?.name,
-        approvalID: defaultFormData.approval?.name
+        accountID: defaultFormData.reportAccount?.ID,
+        approvalID: defaultFormData.approval?.ID
       }
       ref.current?.setFieldsValue({ ...TabFormData })
     }
@@ -131,8 +131,7 @@ const DetailModal: React.FC<ProjectModalProps> = ({
         <ProForm
           formRef={ref}
           submitter={{ resetButtonProps: { style: { display: 'none' } } }}
-          onFinish={onFinish}
-        >
+          onFinish={onFinish}>
           <Form.Item label="上报人" name="accountID">
             <TreeNodeSelect
               treeData={state.acountInstitutionList}

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

@@ -3,7 +3,7 @@ import { TreeSelect } from 'antd'
 
 const { TreeNode } = TreeSelect
 
-const TreeNodeSelect = ({ treeData = [], onChange, value, placeholder = '请选择上报人' }) => {
+const TreeNodeSelect = ({ treeData = [], onChange, value, placeholder = '请选择' }) => {
   const onNodeChange = values => {
     onChange(values)
   }