fix: 客户需求改为多选

boyang
1 parent c62f707b
Showing 2 changed files with 49 additions and 12 deletions
src/pages/Client/Client/Components/ClientDrawer.tsx
src/pages/Client/Client/index.tsx
@@ -6,7 +6,6 @@ import {
   postDistrictSelectByNameAndLevel,
   postDistrictSelOrderProvince,
   postServiceConstClientLevels,
-  postServiceConstClientRequirements,
   postServiceConstClientSource,
   postServiceConstTradeStatus,
 } from '@/services';
@@ -24,6 +23,12 @@ import { useState } from &#39;react&#39;;
 export default ({ optType, record, onFinish }) => {
   const [form] = Form.useForm();
+  const requirementsEnum = {
+    EXPERIMENTAL_EQUIPMENT: '实验设备',
+    EXPERIMENTAL_MATERIALS: '实验材料',
+    OTHER: '其他',
+    PILOT_TEST_VALIDATION_SERVICES: '中式验证服务',
+  };
   //省市区
   const [province, setProvince] = useState('');
   const [city, setCity] = useState('');
@@ -87,6 +92,20 @@ export default ({ optType, record, onFinish }) =&gt; {
     // 在这里可以添加其他逻辑，比如根据选择更新其他表单项的值
   };
+  // MODIFIED: 增加处理非 JSON 格式字符串的逻辑
+  const parsedRecord = record
+    ? {
+        ...record,
+        requirements: (() => {
+          try {
+            return JSON.parse(record.requirements); // 尝试解析 JSON
+          } catch (error) {
+            return record.requirements ? record.requirements.split(',') : []; // 如果不是 JSON，则按逗号分隔字符串
+          }
+        })(),
+      }
+    : {}; // 如果 record 为空，返回一个空对象
+
   return (
     <DrawerForm
       title={optTypeEnum[optType].text}
@@ -97,7 +116,7 @@ export default ({ optType, record, onFinish }) =&gt; {
         maxWidth: window.innerWidth * 0.8,
         minWidth: 300,
       }}
-      initialValues={record}
+      initialValues={parsedRecord}
       form={form}
       trigger={optTypeEnum[optType].button}
       autoFocusFirstInput
@@ -345,20 +364,22 @@ export default ({ optType, record, onFinish }) =&gt; {
         name="requirements"
         label="客户需求"
         placeholder="请输入客户需求"
-        // fieldProps={{
-        //   mode: 'multiple',
-        // }}
+        valueEnum={requirementsEnum}
+        fieldProps={{
+          mode: 'multiple',
+        }}
         rules={[
           {
             required: true,
             message: '请输入客户需求',
-            // type: 'array',
+            type: 'array',
           },
         ]}
-        request={async () => {
-          const res = await postServiceConstClientRequirements();
-          return enumToSelect(res.data);
-        }}
+        // request={async () => {
+        //   const res = await postServiceConstClientRequirements();
+        //   console.log(res.data, '5656require');
+        //   return enumToSelect(res.data);
+        // }}
       />
       <ProFormSelect
         name="hasScheme"
@@ -403,7 +424,17 @@ export default ({ optType, record, onFinish }) =&gt; {
         ]}
         request={async () => {
           const res = await postServiceConstClientLevels();
-          return enumToSelect(res.data);
+          function enumToSelectLevel(data: any) {
+            const order = [
+              'PRIMARY_CLIENT',
+              'SECONDARY_CLIENT',
+              'TERTIARY_CLIENT',
+            ];
+            return order.map((key) => {
+              return { label: data[key], value: key };
+            });
+          }
+          return enumToSelectLevel(res.data);
         }}
       />
       <ProFormSelect
@@ -87,7 +87,7 @@ const columns = [
   },
   {
     title: '客户需求',
-    width: 150,
+    width: 240,
     ellipsis: true,
     dataIndex: 'requirementsText',
     hideInSearch: true,
@@ -99,6 +99,12 @@ const columns = [
     hideInTable: true,
     request: async () => {
       const res = await postServiceConstClientRequirements();
+      // function enumToSelect(data: any) {
+      //   const keys = Object.keys(data);
+      //   return keys.map((value) => {
+      //     return { label: data[value], value: value };
+      //   });
+      // }
       return enumToSelect(res.data);
     },
   },