From 250f06f0619781b8ab6000eb7a8101492901ac05 Mon Sep 17 00:00:00 2001
From: unknown <xiesi@csxjy.com>
Date: Thu, 20 Jan 2022 15:22:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=93=E5=AE=B6=E5=BA=93=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=93=E5=AE=B6=E8=AF=84=E4=BC=B0=E5=88=86?=
 =?UTF-8?q?=E6=95=B0=E4=BB=A5=E5=8F=8A=E4=BF=AE=E7=BC=AE=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E5=B0=8Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/military/expert/expertList/index.jsx      | 20 ++++++++++++-------
 .../expert/expertUser/taskDetail/index.jsx    |  2 +-
 src/military/expert/selectExpert/index.jsx    |  2 +-
 src/military/task/taskAdmin/index.jsx         |  2 +-
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/military/expert/expertList/index.jsx b/src/military/expert/expertList/index.jsx
index 604afd3a3..21666b5f3 100644
--- a/src/military/expert/expertList/index.jsx
+++ b/src/military/expert/expertList/index.jsx
@@ -38,12 +38,14 @@ function RegisterList({ showNotification }) {
     return [{
       title: '姓名',
       dataIndex: 'expertName',
-      width: 75,
+      width: 85,
       key: 'expertName',
       fixed: 'left',
-      // render: (text, record) => {
-      //   return record.user ? record.user.nickname || record.user.login : ''
-      // }
+    },
+    {
+      title: '手机号码',
+      dataIndex: 'phone',
+      key: 'phone',
     },
     {
       title: '最高学历',
@@ -52,9 +54,13 @@ function RegisterList({ showNotification }) {
       width: 80,
     },
     {
-      title: '手机号码',
-      dataIndex: 'phone',
-      key: 'phone',
+      title: '专家评估',
+      dataIndex: 'expertScore',
+      key: 'expertScore',
+      width: 80,
+      render: (text, record) => {
+        return text || '--'
+      }
     },
     {
       title: '工作单位',
diff --git a/src/military/expert/expertUser/taskDetail/index.jsx b/src/military/expert/expertUser/taskDetail/index.jsx
index 994aa5d9e..cbfe59bb5 100644
--- a/src/military/expert/expertUser/taskDetail/index.jsx
+++ b/src/military/expert/expertUser/taskDetail/index.jsx
@@ -382,7 +382,7 @@ function ReviewTasks({ showNotification, match, history, current_user }) {
         <button className="back-button but41_border" onClick={() => { history.goBack() }}>返回上一页</button>
       </p>
 
-      <Tabs defaultActiveKey="1" animated={false}>
+      <Tabs defaultActiveKey="0" animated={false}>
 
         <TabPane tab="评审信息" key="0">
           <div className="task-rules">
diff --git a/src/military/expert/selectExpert/index.jsx b/src/military/expert/selectExpert/index.jsx
index 02854d8a7..68d8fb299 100644
--- a/src/military/expert/selectExpert/index.jsx
+++ b/src/military/expert/selectExpert/index.jsx
@@ -85,7 +85,7 @@ function SelectExpert(props) {
         align: 'center',
       },
       {
-        title: '专家评分',
+        title: '专家评估',
         dataIndex: 'expertScore',
         align: 'center',
         render:(text,record)=>{
diff --git a/src/military/task/taskAdmin/index.jsx b/src/military/task/taskAdmin/index.jsx
index f2ad6e641..80d8586a3 100644
--- a/src/military/task/taskAdmin/index.jsx
+++ b/src/military/task/taskAdmin/index.jsx
@@ -324,7 +324,7 @@ export default Form.create()(({ form, showNotification, match, history, state })
         width: 260,
       },
       {
-        title: '专家评分',
+        title: '专家评估',
         dataIndex: 'expertScore',
         align: 'center',
         render:(text,record)=>{