Merge branch 'dev' of http://47.92.113.182:3000/cq_anquan/safety-eval-service-frontend into dev

jjb.config.js

@@ -10,7 +10,7 @@ module.exports = {
       javaGitBranch: "dev",
       // 本地联调 safetyEval-service（context-path: /safetyEval，默认端口 8095）
       // 可通过环境变量覆盖: SAFETY_EVAL_API_HOST=http://192.168.x.x:8095
-      API_HOST:  "http://192.168.0.103",
+      API_HOST:  "http://192.168.0.152",
     },
     production: {
       // 应用后端分支名称，部署上线需要

src/pages/Container/EnterpriseInfo/PersonnelInfo/Certificate/index.js

@@ -74,16 +74,32 @@ function StaffCertificatePage(props) {
         form={searchForm}
         loading={loading}
         formLine={[
-          <Form.Item key="certName" name="certName">
-            <ControlWrapper.Input label="证照名称" placeholder="请输入证照名称" allowClear maxLength={50} />
+          <Form.Item
+            key="certName"
+            name="certName"
+            rules={[{ max: 200, message: "证照名称不能超过200个字符" }]}
+          >
+            <ControlWrapper.Input label="证照名称" placeholder="请输入证照名称" allowClear maxLength={200} />
           </Form.Item>,
-          <Form.Item key="certNo" name="certNo">
-            <ControlWrapper.Input label="证书编号" placeholder="请输入证书编号" allowClear maxLength={50} />
+          <Form.Item
+            key="certNo"
+            name="certNo"
+            rules={[{ max: 100, message: "证书编号不能超过100个字符" }]}
+          >
+            <ControlWrapper.Input label="证书编号" placeholder="请输入证书编号" allowClear maxLength={100} />
           </Form.Item>,
-          <Form.Item key="certCategoryName" name="certCategoryName">
+          <Form.Item
+            key="certCategoryName"
+            name="certCategoryName"
+            rules={[{ max: 50, message: "证书类别名称不能超过50个字符" }]}
+          >
             <ControlWrapper.Input label="证书类别名称" placeholder="请输入证书类别名称" allowClear maxLength={50} />
           </Form.Item>,
-          <Form.Item key="operationCategoryName" name="operationCategoryName">
+          <Form.Item
+            key="operationCategoryName"
+            name="operationCategoryName"
+            rules={[{ max: 50, message: "证书作业类别名称不能超过50个字符" }]}
+          >
             <ControlWrapper.Input label="证书作业类别名称" placeholder="请输入证书作业类别名称" allowClear maxLength={50} />
           </Form.Item>,
         ]}
@@ -258,7 +274,7 @@ function CertModal({
         handleCancel();
         onSuccess();
       } else {
-      
+        message.error(res?.message || res?.errMessage || "保存失败，请重试");
       }
     } finally {
       setSubmitting(false);
@@ -277,14 +293,35 @@ function CertModal({
       onOk={form.submit}
     >
       <Form form={form} layout="vertical" onFinish={handleSubmit}>
-        <Form.Item name="certName" label="证照名称" rules={[{ required: true, message: "请输入证照名称" }]}>
-          <Input placeholder="请输入证照名称" maxLength={50} showCount />
+        <Form.Item
+          name="certName"
+          label="证照名称"
+          rules={[
+            { required: true, message: "请输入证照名称" },
+            { max: 200, message: "证照名称不能超过200个字符" },
+          ]}
+        >
+          <Input placeholder="请输入证照名称" maxLength={200} showCount />
         </Form.Item>
-        <Form.Item name="certNo" label="证书编号" rules={[{ required: true, message: "请输入证书编号" }]}>
-          <Input placeholder="请输入证书编号" maxLength={50} showCount />
+        <Form.Item
+          name="certNo"
+          label="证书编号"
+          rules={[
+            { required: true, message: "请输入证书编号" },
+            { max: 100, message: "证书编号不能超过100个字符" },
+          ]}
+        >
+          <Input placeholder="请输入证书编号" maxLength={100} showCount />
         </Form.Item>
-        <Form.Item name="issueOrg" label="发证机关" rules={[{ required: true, message: "请输入发证机关" }]}>
-          <Input placeholder="请输入发证机关" maxLength={100} showCount />
+        <Form.Item
+          name="issueOrg"
+          label="发证机关"
+          rules={[
+            { required: true, message: "请输入发证机关" },
+            { max: 200, message: "发证机关不能超过200个字符" },
+          ]}
+        >
+          <Input placeholder="请输入发证机关" maxLength={200} showCount />
         </Form.Item>
         <Form.Item
           name="validDate"
@@ -293,23 +330,47 @@ function CertModal({
         >
           <DatePicker.RangePicker style={{ width: "100%" }} />
         </Form.Item>
-        <Form.Item name="certTypeCode" label="证书类型编码">
-          <Input placeholder="请输入证书类型编码" maxLength={50} />
+        <Form.Item
+          name="certTypeCode"
+          label="证书类型编码"
+          rules={[{ max: 32, message: "证书类型编码不能超过32个字符" }]}
+        >
+          <Input placeholder="请输入证书类型编码" maxLength={32} showCount />
         </Form.Item>
-        <Form.Item name="certTypeName" label="证书类型名称">
-          <Input placeholder="请输入证书类型名称" maxLength={50} />
+        <Form.Item
+          name="certTypeName"
+          label="证书类型名称"
+          rules={[{ max: 50, message: "证书类型名称不能超过50个字符" }]}
+        >
+          <Input placeholder="请输入证书类型名称" maxLength={50} showCount />
         </Form.Item>
-        <Form.Item name="certCategoryCode" label="证书类别编码">
-          <Input placeholder="请输入证书类别编码" maxLength={50} />
+        <Form.Item
+          name="certCategoryCode"
+          label="证书类别编码"
+          rules={[{ max: 32, message: "证书类别编码不能超过32个字符" }]}
+        >
+          <Input placeholder="请输入证书类别编码" maxLength={32} showCount />
         </Form.Item>
-        <Form.Item name="certCategoryName" label="证书类别名称">
-          <Input placeholder="请输入证书类别名称" maxLength={50} />
+        <Form.Item
+          name="certCategoryName"
+          label="证书类别名称"
+          rules={[{ max: 50, message: "证书类别名称不能超过50个字符" }]}
+        >
+          <Input placeholder="请输入证书类别名称" maxLength={50} showCount />
         </Form.Item>
-        <Form.Item name="operationCategoryCode" label="证书作业类别编码">
-          <Input placeholder="请输入证书作业类别编码" maxLength={50} />
+        <Form.Item
+          name="operationCategoryCode"
+          label="证书作业类别编码"
+          rules={[{ max: 32, message: "证书作业类别编码不能超过32个字符" }]}
+        >
+          <Input placeholder="请输入证书作业类别编码" maxLength={32} showCount />
         </Form.Item>
-        <Form.Item name="operationCategoryName" label="证书作业类别名称">
-          <Input placeholder="请输入证书作业类别名称" maxLength={50} />
+        <Form.Item
+          name="operationCategoryName"
+          label="证书作业类别名称"
+          rules={[{ max: 50, message: "证书作业类别名称不能超过50个字符" }]}
+        >
+          <Input placeholder="请输入证书作业类别名称" maxLength={50} showCount />
         </Form.Item>
         <Form.Item name="reviewDate" label="复核日期">
           <DatePicker style={{ width: "100%" }} />
@@ -389,4 +450,4 @@ function ViewModal({ open, currentId, staffCertificateInfo, onCancel }) {
   );
 }
 
-export default Connect([NS_STAFF_CERTIFICATE], true)(AntdTableFuncControl(StaffCertificatePage));
+export default Connect([NS_STAFF_CERTIFICATE], true)(AntdTableFuncControl(StaffCertificatePage));

src/pages/Container/EnterpriseInfo/PersonnelInfo/List/index.js

@@ -151,13 +151,16 @@ function PersonnelInfoPage(props) {
         form={searchForm}
         loading={loading}
         formLine={[
-          <Form.Item key="userName" name="userName">
+          <Form.Item
+            key="userName"
+            name="userName"
+            rules={[{ max: 50, message: "用户名称不能超过50个字符" }]}
+          >
             <ControlWrapper.Input
               label="用户名称"
               placeholder="请输入用户名称"
               allowClear
-              maxLength={20}
-              showCount
+              maxLength={50}
             />
           </Form.Item>,
           <Form.Item key="deptId" name="deptId">
@@ -201,7 +204,7 @@ function PersonnelInfoPage(props) {
       <Table
         rowKey="id"
         columns={[
-          { title: "用户名称", dataIndex: "userName", ellipsis: true },
+          { title: "用户名称", dataIndex: "userName" },
           { title: "账号", dataIndex: "account" },
           { title: "部门", dataIndex: "deptName" },
           { title: "岗位", dataIndex: "postName" },
@@ -213,7 +216,7 @@ function PersonnelInfoPage(props) {
           },
           {
             title: "操作",
-            width: 200,
+            width: 320,
             render: (_, record) => (
               <TableAction>
                 <Button
@@ -464,6 +467,7 @@ function StaffFormModal({
         handleCancel();
         onSuccess();
       } else {
+        message.error(res?.message || res?.errMessage || "保存失败，请重试");
       }
     } finally {
       setSubmitting(false);
@@ -492,9 +496,12 @@ function StaffFormModal({
             <Form.Item
               name="userName"
               label="姓名"
-              rules={[{ required: true, message: "请输入姓名" }]}
+              rules={[
+                { required: true, message: "请输入姓名" },
+                { max: 50, message: "姓名不能超过50个字符" },
+              ]}
             >
-              <Input placeholder="请输入姓名" maxLength={20} showCount />
+              <Input placeholder="请输入姓名" maxLength={50} showCount />
             </Form.Item>
           </Col>
           <Col span={12}>
@@ -521,9 +528,12 @@ function StaffFormModal({
             <Form.Item
               name="account"
               label="账号"
-              rules={[mobileRule("账号", true)]}
+              rules={[
+                mobileRule("账号", true),
+                { max: 50, message: "账号不能超过50个字符" },
+              ]}
             >
-              <Input placeholder="请输入账号" maxLength={11} showCount />
+              <Input placeholder="请输入账号" maxLength={50} showCount />
             </Form.Item>
           </Col>
           <Col span={12}>
@@ -567,9 +577,12 @@ function StaffFormModal({
             <Form.Item
               name="idCardNo"
               label="身份证号"
-              rules={[idCardRule(true)]}
+              rules={[
+                idCardRule(true),
+                { max: 18, message: "身份证号不能超过18个字符" },
+              ]}
             >
-              <Input placeholder="请输入身份证号" maxLength={18} showCount />
+              <Input placeholder="请输入身份证号" maxLength={18} />
             </Form.Item>
           </Col>
           <Col span={12}>
@@ -599,8 +612,12 @@ function StaffFormModal({
             </Form.Item>
           </Col>
           <Col span={12}>
-            <Form.Item name="evaluatorCertNo" label="证书编号">
-              <Input placeholder="请输入安全评价师证书编号" maxLength={50} showCount />
+            <Form.Item
+              name="evaluatorCertNo"
+              label="证书编号"
+              rules={[{ max: 100, message: "证书编号不能超过100个字符" }]}
+            >
+              <Input placeholder="请输入安全评价师证书编号" maxLength={100} showCount />
             </Form.Item>
           </Col>
           <Col span={12}>
@@ -622,7 +639,11 @@ function StaffFormModal({
             </Form.Item>
           </Col>
           <Col span={12}>
-            <Form.Item name="titleName" label="职称">
+            <Form.Item
+              name="titleName"
+              label="职称"
+              rules={[{ max: 50, message: "职称不能超过50个字符" }]}
+            >
               <Input placeholder="请输入职称" maxLength={50} showCount />
             </Form.Item>
           </Col>
@@ -642,21 +663,27 @@ function StaffFormModal({
             <Form.Item
               name="publications"
               label="出版学术专著、专利、获奖、发表学术论文等"
+              rules={[{ max: 1000, message: "不能超过1000个字符" }]}
             >
-              <Input.TextArea rows={2} placeholder="请输入" maxLength={200} showCount />
+              <Input.TextArea rows={2} placeholder="请输入" maxLength={1000} showCount />
             </Form.Item>
           </Col>
           <Col span={24}>
             <Form.Item
               name="abilityDeclaration"
               label="自我申报的专业能力及认定方式"
+              rules={[{ max: 1000, message: "不能超过1000个字符" }]}
             >
-              <Input.TextArea rows={2} placeholder="请输入" maxLength={200} showCount />
+              <Input.TextArea rows={2} placeholder="请输入" maxLength={1000} showCount />
             </Form.Item>
           </Col>
           <Col span={24}>
-            <Form.Item name="workExperience" label="主要学习工作经历">
-              <Input.TextArea rows={3} placeholder="请输入" maxLength={300} showCount />
+            <Form.Item
+              name="workExperience"
+              label="主要学习工作经历"
+              rules={[{ max: 10000, message: "不能超过10000个字符" }]}
+            >
+              <Input.TextArea rows={3} placeholder="请输入" maxLength={10000} showCount />
             </Form.Item>
           </Col>
           <Col span={24}>
@@ -667,23 +694,39 @@ function StaffFormModal({
             />
           </Col>
           <Col span={12}>
-            <Form.Item name="currentAddress" label="现住地址">
-              <Input placeholder="请输入现住地址" maxLength={100} showCount />
+            <Form.Item
+              name="currentAddress"
+              label="现住地址"
+              rules={[{ max: 500, message: "现住地址不能超过500个字符" }]}
+            >
+              <Input placeholder="请输入现住地址" maxLength={500} showCount />
             </Form.Item>
           </Col>
           <Col span={12}>
-            <Form.Item name="officeAddress" label="办公地址">
-              <Input placeholder="请输入办公地址" maxLength={100} showCount />
+            <Form.Item
+              name="officeAddress"
+              label="办公地址"
+              rules={[{ max: 500, message: "办公地址不能超过500个字符" }]}
+            >
+              <Input placeholder="请输入办公地址" maxLength={500} showCount />
             </Form.Item>
           </Col>
           <Col span={12}>
-            <Form.Item name="graduateSchool" label="毕业院校">
-              <Input placeholder="请输入毕业院校" maxLength={50} showCount />
+            <Form.Item
+              name="graduateSchool"
+              label="毕业院校"
+              rules={[{ max: 200, message: "毕业院校不能超过200个字符" }]}
+            >
+              <Input placeholder="请输入毕业院校" maxLength={200} showCount />
             </Form.Item>
           </Col>
           <Col span={12}>
-            <Form.Item name="major" label="专业">
-              <Input placeholder="请输入专业" maxLength={50} showCount />
+            <Form.Item
+              name="major"
+              label="专业"
+              rules={[{ max: 100, message: "专业不能超过100个字符" }]}
+            >
+              <Input placeholder="请输入专业" maxLength={100} showCount />
             </Form.Item>
           </Col>
         </Row>