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

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

@@ -75,16 +75,16 @@ function StaffCertificatePage(props) {
         loading={loading}
         formLine={[
           <Form.Item key="certName" name="certName">
-            <ControlWrapper.Input label="证照名称" placeholder="请输入证照名称" allowClear />
+            <ControlWrapper.Input label="证照名称" placeholder="请输入证照名称" allowClear maxLength={50} />
           </Form.Item>,
           <Form.Item key="certNo" name="certNo">
-            <ControlWrapper.Input label="证书编号" placeholder="请输入证书编号" allowClear />
+            <ControlWrapper.Input label="证书编号" placeholder="请输入证书编号" allowClear maxLength={50} />
           </Form.Item>,
           <Form.Item key="certCategoryName" name="certCategoryName">
-            <ControlWrapper.Input label="证书类别名称" placeholder="请输入证书类别名称" allowClear />
+            <ControlWrapper.Input label="证书类别名称" placeholder="请输入证书类别名称" allowClear maxLength={50} />
           </Form.Item>,
           <Form.Item key="operationCategoryName" name="operationCategoryName">
-            <ControlWrapper.Input label="证书作业类别名称" placeholder="请输入证书作业类别名称" allowClear />
+            <ControlWrapper.Input label="证书作业类别名称" placeholder="请输入证书作业类别名称" allowClear maxLength={50} />
           </Form.Item>,
         ]}
         onReset={(values) => {
@@ -278,13 +278,13 @@ function CertModal({
     >
       <Form form={form} layout="vertical" onFinish={handleSubmit}>
         <Form.Item name="certName" label="证照名称" rules={[{ required: true, message: "请输入证照名称" }]}>
-          <Input placeholder="请输入证照名称" />
+          <Input placeholder="请输入证照名称" maxLength={50} showCount />
         </Form.Item>
         <Form.Item name="certNo" label="证书编号" rules={[{ required: true, message: "请输入证书编号" }]}>
-          <Input placeholder="请输入证书编号" />
+          <Input placeholder="请输入证书编号" maxLength={50} showCount />
         </Form.Item>
         <Form.Item name="issueOrg" label="发证机关" rules={[{ required: true, message: "请输入发证机关" }]}>
-          <Input placeholder="请输入发证机关" />
+          <Input placeholder="请输入发证机关" maxLength={100} showCount />
         </Form.Item>
         <Form.Item
           name="validDate"
@@ -294,22 +294,22 @@ function CertModal({
           <DatePicker.RangePicker style={{ width: "100%" }} />
         </Form.Item>
         <Form.Item name="certTypeCode" label="证书类型编码">
-          <Input placeholder="请输入证书类型编码" />
+          <Input placeholder="请输入证书类型编码" maxLength={50} />
         </Form.Item>
         <Form.Item name="certTypeName" label="证书类型名称">
-          <Input placeholder="请输入证书类型名称" />
+          <Input placeholder="请输入证书类型名称" maxLength={50} />
         </Form.Item>
         <Form.Item name="certCategoryCode" label="证书类别编码">
-          <Input placeholder="请输入证书类别编码" />
+          <Input placeholder="请输入证书类别编码" maxLength={50} />
         </Form.Item>
         <Form.Item name="certCategoryName" label="证书类别名称">
-          <Input placeholder="请输入证书类别名称" />
+          <Input placeholder="请输入证书类别名称" maxLength={50} />
         </Form.Item>
         <Form.Item name="operationCategoryCode" label="证书作业类别编码">
-          <Input placeholder="请输入证书作业类别编码" />
+          <Input placeholder="请输入证书作业类别编码" maxLength={50} />
         </Form.Item>
         <Form.Item name="operationCategoryName" label="证书作业类别名称">
-          <Input placeholder="请输入证书作业类别名称" />
+          <Input placeholder="请输入证书作业类别名称" maxLength={50} />
         </Form.Item>
         <Form.Item name="reviewDate" label="复核日期">
           <DatePicker style={{ width: "100%" }} />

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

@@ -156,6 +156,8 @@ function PersonnelInfoPage(props) {
               label="用户名称"
               placeholder="请输入用户名称"
               allowClear
+              maxLength={20}
+              showCount
             />
           </Form.Item>,
           <Form.Item key="deptId" name="deptId">
@@ -199,7 +201,7 @@ function PersonnelInfoPage(props) {
       <Table
         rowKey="id"
         columns={[
-          { title: "用户名称", dataIndex: "userName" },
+          { title: "用户名称", dataIndex: "userName", ellipsis: true },
           { title: "账号", dataIndex: "account" },
           { title: "部门", dataIndex: "deptName" },
           { title: "岗位", dataIndex: "postName" },
@@ -211,7 +213,7 @@ function PersonnelInfoPage(props) {
           },
           {
             title: "操作",
-            width: 320,
+            width: 200,
             render: (_, record) => (
               <TableAction>
                 <Button
@@ -492,7 +494,7 @@ function StaffFormModal({
               label="姓名"
               rules={[{ required: true, message: "请输入姓名" }]}
             >
-              <Input placeholder="请输入姓名" />
+              <Input placeholder="请输入姓名" maxLength={20} showCount />
             </Form.Item>
           </Col>
           <Col span={12}>
@@ -521,7 +523,7 @@ function StaffFormModal({
               label="账号"
               rules={[mobileRule("账号", true)]}
             >
-              <Input placeholder="请输入账号" />
+              <Input placeholder="请输入账号" maxLength={11} showCount />
             </Form.Item>
           </Col>
           <Col span={12}>
@@ -567,7 +569,7 @@ function StaffFormModal({
               label="身份证号"
               rules={[idCardRule(true)]}
             >
-              <Input placeholder="请输入身份证号" />
+              <Input placeholder="请输入身份证号" maxLength={18} showCount />
             </Form.Item>
           </Col>
           <Col span={12}>
@@ -598,7 +600,7 @@ function StaffFormModal({
           </Col>
           <Col span={12}>
             <Form.Item name="evaluatorCertNo" label="证书编号">
-              <Input placeholder="请输入安全评价师证书编号" />
+              <Input placeholder="请输入安全评价师证书编号" maxLength={50} showCount />
             </Form.Item>
           </Col>
           <Col span={12}>
@@ -621,7 +623,7 @@ function StaffFormModal({
           </Col>
           <Col span={12}>
             <Form.Item name="titleName" label="职称">
-              <Input placeholder="请输入职称" />
+              <Input placeholder="请输入职称" maxLength={50} showCount />
             </Form.Item>
           </Col>
           <Col span={12}>
@@ -641,7 +643,7 @@ function StaffFormModal({
               name="publications"
               label="出版学术专著、专利、获奖、发表学术论文等"
             >
-              <Input.TextArea rows={2} placeholder="请输入" />
+              <Input.TextArea rows={2} placeholder="请输入" maxLength={200} showCount />
             </Form.Item>
           </Col>
           <Col span={24}>
@@ -649,12 +651,12 @@ function StaffFormModal({
               name="abilityDeclaration"
               label="自我申报的专业能力及认定方式"
             >
-              <Input.TextArea rows={2} placeholder="请输入" />
+              <Input.TextArea rows={2} placeholder="请输入" maxLength={200} showCount />
             </Form.Item>
           </Col>
           <Col span={24}>
             <Form.Item name="workExperience" label="主要学习工作经历">
-              <Input.TextArea rows={3} placeholder="请输入" />
+              <Input.TextArea rows={3} placeholder="请输入" maxLength={300} showCount />
             </Form.Item>
           </Col>
           <Col span={24}>
@@ -666,22 +668,22 @@ function StaffFormModal({
           </Col>
           <Col span={12}>
             <Form.Item name="currentAddress" label="现住地址">
-              <Input placeholder="请输入现住地址" />
+              <Input placeholder="请输入现住地址" maxLength={100} showCount />
             </Form.Item>
           </Col>
           <Col span={12}>
             <Form.Item name="officeAddress" label="办公地址">
-              <Input placeholder="请输入办公地址" />
+              <Input placeholder="请输入办公地址" maxLength={100} showCount />
             </Form.Item>
           </Col>
           <Col span={12}>
             <Form.Item name="graduateSchool" label="毕业院校">
-              <Input placeholder="请输入毕业院校" />
+              <Input placeholder="请输入毕业院校" maxLength={50} showCount />
             </Form.Item>
           </Col>
           <Col span={12}>
             <Form.Item name="major" label="专业">
-              <Input placeholder="请输入专业" />
+              <Input placeholder="请输入专业" maxLength={50} showCount />
             </Form.Item>
           </Col>
         </Row>