Merge branch 'by' into warning

boyang
2 parents 07dd077f a11effeb
Showing 3 changed files with 4826 additions and 19 deletions
.umirc.ts
order-erp.service-1.0-SNAPSHOT.jar
src/pages/Client/Components/ClientDrawer.tsx → src/pages/Client/Client/Components/ClientDrawer.tsx
@@ -141,10 +141,21 @@ export default defineConfig({
     },
     {
       name: '客户管理',
-      path: '/client',
-      component: './Client',
+      path: '/Client',
       icon: 'BookOutlined',
       access: 'canReadAdminAndSales',
+      routes: [
+        {
+          name: '客户列表',
+          path: 'clint',
+          component: './Client/Client',
+        },
+        {
+          name: '跟进记录',
+          path: 'FollowRecord',
+          component: './Client/FollowRecord',
+        },
+      ],
     },
     {
       name: '打印',
@@ -6,23 +6,34 @@ import {
   postDistrictSelectByNameAndLevel,
   postDistrictSelOrderProvince,
   postServiceConstClientLevels,
+  postServiceConstClientSource,
   postServiceConstTradeStatus,
 } from '@/services';
+
 import { enumToSelect } from '@/utils';
 import {
   DrawerForm,
-  ProFormDateTimePicker,
+  ProFormDatePicker,
   ProFormSelect,
   ProFormText,
 } from '@ant-design/pro-components';
 import { Button, Form, message } from 'antd';
+// import { options } from 'node_modules/axios/index.cjs';
 import { useState } from 'react';
  
 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('');
+  const [showReferrers, setShowReferrers] = useState(false); // 控制显示的状态，初始为false
+  const [showQuoteDatetime, setShowQuoteDatetime] = useState(false); // 控制显示的状态，初始为false
   const optTypeEnum = {
     add: {
       text: '新增',
@@ -42,7 +53,7 @@ export default ({ optType, record, onFinish }) =&gt; {
     },
     edit: {
       text: '编辑',
-      button: <a type="primary">编辑</a>,
+      button: <a type="link">编辑</a>,
       readonly: false,
       onFinish: async (values) => {
         const res = await postAdminClientModifyClientInfo({
@@ -58,11 +69,43 @@ export default ({ optType, record, onFinish }) =&gt; {
     },
     detail: {
       text: '详情',
-      button: <a type="primary">详情</a>,
+      // button: <a type="primary">详情</a>,
       readonly: true,
     },
   };
  
+  const handleSourceChange = (value) => {
+    if (value === 'REFERRAL_BY_ACQUAINTANCE') {
+      setShowReferrers(true);
+    } else {
+      setShowReferrers(false);
+    }
+    // 在这里可以添加其他逻辑，比如根据选择更新其他表单项的值
+  };
+  const handleSchemeChange = (value) => {
+    console.log(value);
+    if (value === true) {
+      setShowQuoteDatetime(true);
+    } else {
+      setShowQuoteDatetime(false);
+    }
+    // 在这里可以添加其他逻辑，比如根据选择更新其他表单项的值
+  };
+
+  // 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}
@@ -73,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
@@ -98,7 +141,7 @@ export default ({ optType, record, onFinish }) =&gt; {
           },
         ]}
       />
-      <ProFormText
+      {/* <ProFormText
         name="companyName"
         label="单位名称"
         placeholder="请输入单位名称"
@@ -108,7 +151,7 @@ export default ({ optType, record, onFinish }) =&gt; {
             message: '请输入单位名称',
           },
         ]}
-      />
+      /> */}
       <div
         style={{
           display: 'flex',
@@ -260,7 +303,7 @@ export default ({ optType, record, onFinish }) =&gt; {
         />
       </div>
       <ProFormText
-        name="companyAddress"
+        name="detailAddress"
         label="详细地址"
         placeholder="请输入单位地址"
         rules={[
@@ -271,6 +314,17 @@ export default ({ optType, record, onFinish }) =&gt; {
         ]}
       />
       <ProFormText
+        name="contacts"
+        label="联系人"
+        placeholder="请输入联系人"
+        rules={[
+          {
+            required: true,
+            message: '请输入联系人',
+          },
+        ]}
+      />
+      <ProFormText
         name="phoneNumber"
         label="联系电话"
         placeholder="请输入联系电话"
@@ -281,23 +335,52 @@ export default ({ optType, record, onFinish }) =&gt; {
           },
         ]}
       />
-      <ProFormText
+      <ProFormSelect
         name="source"
         label="客户来源"
-        placeholder="请输入客户来源"
+        placeholder="请选择客户来源"
+        request={async () => {
+          const res = await postServiceConstClientSource();
+          return enumToSelect(res.data);
+        }}
+        rules={[
+          {
+            required: true,
+            message: '请选择客户来源',
+          },
+        ]}
+        fieldProps={{
+          onChange: handleSourceChange, // 添加onChange事件处理函数
+        }}
       />
-      <ProFormText
+      {showReferrers && (
+        <ProFormText
+          name="referrers"
+          label="推荐人"
+          placeholder="请输入推荐人"
+        />
+      )}
+      <ProFormSelect
         name="requirements"
         label="客户需求"
         placeholder="请输入客户需求"
+        valueEnum={requirementsEnum}
+        fieldProps={{
+          mode: 'multiple',
+        }}
         rules={[
           {
             required: true,
             message: '请输入客户需求',
+            type: 'array',
           },
         ]}
+        // request={async () => {
+        //   const res = await postServiceConstClientRequirements();
+        //   console.log(res.data, '5656require');
+        //   return enumToSelect(res.data);
+        // }}
       />
-      <ProFormText name="referrers" label="推荐人" placeholder="请输入推荐人" />
       <ProFormSelect
         name="hasScheme"
         label="是否已报方案"
@@ -318,12 +401,17 @@ export default ({ optType, record, onFinish }) =&gt; {
             message: '请选择是否已报方案',
           },
         ]}
+        fieldProps={{
+          onChange: handleSchemeChange, // 添加onChange事件处理函数
+        }}
       />
-      <ProFormDateTimePicker
-        name="quoteDatetime"
-        label="报价时间"
-        placeholder="请输入报价时间"
-      />
+      {showQuoteDatetime && (
+        <ProFormDatePicker
+          name="quoteDatetime"
+          label="报价时间"
+          placeholder="请输入报价时间"
+        />
+      )}
       <ProFormSelect
         name="level"
         label="客户等级"
@@ -336,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