fix

src/pages/Container/SafetyEvalBusiness/CustomerManage/index.js

@@ -134,14 +134,17 @@ const CustomerManage = (props) => {
 
   const handleCreateSubmit = () => {
     modalForm.validateFields().then(async (values) => {
+      let res;
       if (editingId) {
-        await props.customerModify({ ...values, id: editingId });
+        res = await props.customerModify({ ...values, id: editingId });
       } else {
-        await props.customerSave(values);
+        res = await props.customerSave(values);
       }
+      if (res.success) {
         message.success(editingId ? "修改成功" : "创建成功");
         setModalOpen(false);
         getData();
+      }
     });
   };
 
@@ -184,7 +187,7 @@ const CustomerManage = (props) => {
     },
     {
       title: "操作",
-      width: 260,
+      width: 220,
       fixed: "right",
       render: (_, record) => (
         <Space>
@@ -335,9 +338,13 @@ const CustomerManage = (props) => {
               </Form.Item>
             </Col>
             <Col span={12}>
-              <Form.Item name="industryCode" label="所属行业"
+              <Form.Item
+                name="industryCode"
+                label="所属行业"
                 getValueFromEvent={(value) => value.join(",")}
-                getValueProps={(value) => ({ value: value ? value.split(",").filter(Boolean) : [] })}
+                getValueProps={(value) => ({
+                  value: value ? value.split(",").filter(Boolean) : [],
+                })}
               >
                 <Select mode="multiple" placeholder="请选择" allowClear>
                   {QUALIFICATION_INDUSTRY_OPTIONS.map((opt) => (

src/pages/Container/SafetyEvalBusiness/EvalProject/Create/index.js

@@ -13,10 +13,11 @@ import {
   Tag,
 } from "antd";
 import dayjs from "dayjs";
-import {tools} from "@cqsjjb/jjb-common-lib";
+import { tools } from "@cqsjjb/jjb-common-lib";
 import PageLayout from "@cqsjjb/jjb-react-admin-component/PageLayout";
 import { NS_SAFETY_EVAL_BUSINESS } from "~/enumerate/namespace";
 import { Connect } from "@cqsjjb/jjb-dva-runtime";
+import { QUALIFICATION_INDUSTRY_OPTIONS } from "~/enumerate/enterpriseOptions";
 import BaiduMapPicker from "~/components/BaiduMapPicker";
 import { district } from "~/enumerate/constant";
 import { phoneRule } from "~/utils/validators";
@@ -39,7 +40,11 @@ const EvalProjectCreate = (props) => {
   const projectId = router.query?.id;
   const isView = projectId;
 
-  const { evalProjectSaveLoading, evalProjectDetailLoading, customerPage: customerList } = props.safetyEvalBusiness;
+  const {
+    evalProjectSaveLoading,
+    evalProjectDetailLoading,
+    customerPage: customerList,
+  } = props.safetyEvalBusiness;
 
   useEffect(() => {
     props.customerPage({ current: 1, size: 999 });
@@ -55,12 +60,18 @@ const EvalProjectCreate = (props) => {
           const data = res.data;
           form.setFieldsValue({
             ...data,
-            planStartDate: data.planStartDate ? dayjs(data.planStartDate) : undefined,
+            planStartDate: data.planStartDate
+              ? dayjs(data.planStartDate)
+              : undefined,
             planEndDate: data.planEndDate ? dayjs(data.planEndDate) : undefined,
           });
           if (data.participants?.length) {
             setSelectedParticipants(
-              data.participants.map((p) => ({ id: p.id, userName: p.name, ...p })),
+              data.participants.map((p) => ({
+                id: p.id,
+                userName: p.name,
+                ...p,
+              })),
             );
           }
         }
@@ -115,7 +126,8 @@ const EvalProjectCreate = (props) => {
       history={props.history}
       previous
       footer={
-        !isView && <Flex gap={24}>
+        !isView && (
+          <Flex gap={24}>
             <Button onClick={() => props.history.goBack()}>取消</Button>
             <Button
               type="primary"
@@ -125,6 +137,7 @@ const EvalProjectCreate = (props) => {
               提交并返回项目列表
             </Button>
           </Flex>
+        )
       }
       loading={detailLoading}
     >
@@ -174,7 +187,9 @@ const EvalProjectCreate = (props) => {
                   showSearch
                   optionFilterProp="label"
                   onChange={(value, option) => {
-                    const customer = customerList?.find((item) => item.id === value);
+                    const customer = customerList?.find(
+                      (item) => item.id === value,
+                    );
                     console.log(customer);
                     form.setFieldsValue({
                       customerContactName: customer?.principalName || "",
@@ -226,7 +241,7 @@ const EvalProjectCreate = (props) => {
             </Col>
             <Col span={12}>
               <Form.Item name="projectLeaderName" label="项目负责人">
-                <Input placeholder="请输入" maxLength={50} />
+                <Input placeholder="请输入" maxLength={30} />
               </Form.Item>
             </Col>
           </Row>
@@ -241,6 +256,21 @@ const EvalProjectCreate = (props) => {
                 <DatePicker style={{ width: "100%" }} placeholder="请选择" />
               </Form.Item>
             </Col>
+            <Col span={12}>
+              <Form.Item
+                name="industryCode"
+                label="所属行业"
+                
+              >
+                <Select  placeholder="请选择" allowClear>
+                  {QUALIFICATION_INDUSTRY_OPTIONS.map((opt) => (
+                    <Select.Option key={opt.value} value={opt.value}>
+                      {opt.label}
+                    </Select.Option>
+                  ))}
+                </Select>
+              </Form.Item>
+            </Col>
           </Row>
         </Card>