修改issue

src/military/expert/expertList/index.jsx

@@ -87,7 +87,7 @@ function RegisterList({ showNotification }) {
       width: 80,
     },
     {
-      title: '专业类别',
+      title: '专家类别',
       dataIndex: 'expertType',
       width: 80,
     },

src/military/expert/expertUser/index.scss

@@ -13,13 +13,14 @@
       display: flex;
       flex-direction: column;
       height: 10em;
-      width: 10em;
+      width: 9.375rem;
       font-size: 0.7em;
       background-color: white;
       padding: 0.4vw;
       flex: none;
       a{
         padding: 0 1.3em;
+        margin: 5px;
         height: 2.55em;
         line-height: 2.55em;
         border-radius: 4px;
@@ -36,10 +37,19 @@
 
       }
       
+
     }
     .register_right {
       flex: auto;
-      margin-left: 2em;
+      margin-left: .95rem;
+      .user-title{
+        border-bottom: 1px solid #eeeeee;
+        padding: 0.5em 2em;
+        color: #181818;
+        font-size: 1rem;
+        font-weight: bold;
+        background: white;
+      }
     }
   }
 }

src/military/expert/register/index.jsx

@@ -215,9 +215,19 @@ export default Form.create()(({ match, history, showNotification, form, current_
           userId: current_user.user_id,
           status: 3
         };
-        expertRegister(params).then(res => {
-          dealBack(res);
-        });
+
+        if (lastRegister && [2, 3].includes(lastRegister.status)) {
+          expertUpdate({
+            ...params,
+            id: lastRegister.id
+          }).then(res => {
+            dealBack(res);
+          });
+        } else {
+          expertRegister(params).then(res => {
+            dealBack(res)
+          });
+        }
       }
     })
   }
@@ -245,27 +255,23 @@ export default Form.create()(({ match, history, showNotification, form, current_
     <div className='register_right'>
       {
         lastRegister && lastRegister.status === -1 && <p className='checking'>
-          您的资料正在审核，请稍候
+          您的资料正在审核，请耐心等待！
         </p>
       }
       {
         lastRegister && lastRegister.status === 2 && <p className='fail'>
           您提交的资料已被拒绝，请完善资料后重新提交
-          {lastRegister.reviewerAdvice&&<span className='advance'>拒绝原因：{lastRegister.reviewerAdvice}</span>}
+          {lastRegister.reviewerAdvice&&<div className='advance'>拒绝原因：{lastRegister.reviewerAdvice}</div>}
         </p>
       }
       {
         lastRegister && lastRegister.status === 1 && <p className='succeed'>
-          您已经是专家了，如果修改资料，修改后的资料需要管理员重新审核，审核过程中不会影响您的专家身份
+          您的资料已审核通过，已成为专家！若修改资料，修改后需要管理员重新审核，审核过程中不会影响您的专家身份
         </p>
       }
-      {
-        (!lastRegister || (lastRegister && lastRegister.status === 3)) && <p>专家资料</p>
-      }
      
-
+     <div className='user-title'>专家资料</div>
       <Form>
-        {/* <div className='expert_Register_form'> */}
           {
             helper('姓名',
               'expertName',
@@ -311,7 +317,9 @@ export default Form.create()(({ match, history, showNotification, form, current_
            {
             helper('工作单位',
               'workplace',
-              [{ required: true, message: "工作单位不能为空" }],
+              [{ required: true, message: "工作单位不能为空" },
+              { max: 50, message: '长度不能超过50个字符' }
+            ],
               <Input
                 placeholder="请输入您的工作单位"
                 disabled={forbidden}
@@ -508,7 +516,6 @@ export default Form.create()(({ match, history, showNotification, form, current_
               />
             )
           }
-        <div className='hint'>提示：个人简介、职称证明、学术成果、荣誉称号都只能上传一个文件，建议上传zip或rar格式的压缩文件</div>
           <Form.Item className="upload-form" label="个人简介">
             <Upload
               load={uploadResume}
@@ -549,7 +556,7 @@ export default Form.create()(({ match, history, showNotification, form, current_
               count={1}
             />
           </Form.Item>
-        {/* </div> */}
+        <div className='hint'>提示：个人简介、职称证明、学术成果、荣誉称号都只能上传一个文件，建议上传zip或rar格式的压缩文件</div>
       </Form>
       <div className='buts'>
         {/* <button className="but41_fill mr20" disabled={forbidden} onClick={() => expertRegisterSubmit(true)}>提交资料</button>

src/military/expert/register/index.scss

@@ -8,19 +8,14 @@
     padding: 0.4vw;
   }
   .register_right {
-    flex: auto;
-    margin-left: 2em;
       p {
         border-bottom: 1px solid #eeeeee;
         padding: 0.5em 2em;
         color: #181818;
-        font-size: 0.8em;
+        font-size: 0.9rem;
         font-weight: bold;
-        margin-bottom: 1em !important;
+        margin-bottom: 1.25rem !important;
         background: white;
-        .advance{
-          margin-left: 2em;
-        }
     } 
 
     .fail {
@@ -40,23 +35,18 @@
       color: green;
     }
     .ant-form {
-      // display: flex;
-      // padding: 1em 2em 1.5em;
       background-color: white;
+      padding:1em  0;
     }
     .ant-form-item{
       display: inline-block;
       width: 44%;
-      margin:0 2.5% 1em 2.5%;
+      margin:1em 2.5% 0;
     }
     .hint{
-      margin:0 3% 1em 4%;
+      margin:1em 3% 0 4%;
+      color: #999;
     }
-    // .expert_Register_form {
-    //   width: 43.5%;
-    //   &.ml80 {
-    //     margin-left: 120px;
-    //   }
     .upload-form{
       display: inline-flex;
       align-items: flex-start;

src/military/expert/registerList/index.jsx

@@ -70,7 +70,7 @@ function RegisterList({ showNotification, form }) {
       width: 80,
     },
     {
-      title: '专业类别',
+      title: '专家类别',
       dataIndex: 'expertType',
       width: 80,
     },

src/military/expert/reviewTasks/index.jsx

@@ -41,7 +41,6 @@ function ReviewTasks({ form, showNotification, match, history }) {
       {
         title: '任务名称',
         dataIndex: 'expertName',
-        width: 75,
         key: 'expertName',
         // render: (text, record) => {
         //   return record.user ? record.user.nickname || record.user.login : ''
@@ -109,8 +108,8 @@ function ReviewTasks({ form, showNotification, match, history }) {
     ), []);
 
   return (
-    <div className='register_right'>
-      <p>
+    <div className='register_right task_right'>
+      <p className="task-head">
         我的评审任务
       </p>
       <div className="search-screen" >

src/military/expert/reviewTasks/index.scss

@@ -1,16 +1,21 @@
-.register_right {
-  flex: auto;
-  .search-screen > .ant-row {
-    min-width: 36%;
+.task_right {
+  .search-screen {
+    margin: 0;
+    padding-bottom: 0;
+    .ant-form-item {
+      min-width: 36%;
+      width: 36%;
+    }
   }
-  p{
+  .task-head {
     border-bottom: 1px solid #eeeeee;
     padding: 0.5em 2em;
     color: #181818;
+    background: #fff;
     font-size: 0.8em;
     font-weight: bold;
   }
-  .button-div{
+  .button-div {
     line-height: 1.5;
   }
 }