Merge branch 'master' of http://39.108.227.113:8001/zhusen/canrd-erp-front

曾国涛
2 parents 631ce122 f794b05d
Showing 1 changed file with 19 additions and 11 deletions
src/pages/Client/Client/Components/ClientDrawer.tsx
@@ -345,31 +345,39 @@ export default ({ optType, record, onFinish }) =&gt; {
         name="institutionContactName"
         rules={[{ required: true, message: '请输入课题组名称!' }]}
         request={async (value) => {
-          const keywords = value.keyWords;
+          const keywords = value.keyWords || '';
           const res = await postResearchGroupsNameSet({
             data: {
               status: 'ADD_AUDIT_PASS',
               groupName: keywords,
             },
           });
-          let options = res?.data?.map((c: any) => {
-            return {
-              label: c,
-              value: c,
-              key: c,
-            };
-          });
-          return options;
+          return Object.entries(res?.data || {}).map(
+            ([researchGroupsId, researchGroupsName]) => ({
+              label: researchGroupsName,
+              value: researchGroupsName, // 使用 researchGroupsId 作为 value
+              key: researchGroupsId,
+              id: researchGroupsId,
+            }),
+          );
         }}
         fieldProps={{
-          filterOption() {
-            return true;
+          filterOption: () => true,
+          onChange: (_, option) => {
+            form.setFieldsValue({
+              researchGroupId: option?.id || '',
+            });
           },
         }}
         debounceTime={1000}
         label="课题组名称"
         placeholder="请输入名称"
       />
+      <ProFormText
+        hidden={true}
+        key="researchGroupId"
+        name="researchGroupId"
+      ></ProFormText>
       <Form.Item label="关联销售" name="affiliateSales">
         <ProFormSelect
           name="affiliateSales"