From eff0bcf4723f1168620bf8a9db1972d8496dbb85 Mon Sep 17 00:00:00 2001
From: unknown <xiesi@csxjy.com>
Date: Fri, 14 Jan 2022 14:19:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86issue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../expert/expertUser/reviewTasks/index.jsx   |  2 +-
 .../expert/reviewResult/gradesModal/index.jsx | 25 +++++++++++------
 .../reviewResult/gradesModal/index.scss       |  5 ++--
 src/military/expert/reviewResult/index.jsx    |  2 +-
 src/military/task/taskAdmin/index.jsx         |  7 ++++-
 src/military/task/taskAdmin/index.scss        | 27 +++++++++++++++----
 6 files changed, 50 insertions(+), 18 deletions(-)

diff --git a/src/military/expert/expertUser/reviewTasks/index.jsx b/src/military/expert/expertUser/reviewTasks/index.jsx
index 372f2c82..a470c0de 100644
--- a/src/military/expert/expertUser/reviewTasks/index.jsx
+++ b/src/military/expert/expertUser/reviewTasks/index.jsx
@@ -151,7 +151,7 @@ function ReviewTasks({ form, showNotification, match, history }) {
         )}
 
         {helper(
-          "任务状态",
+          "评审状态",
           "statusString",
           [],
           <Select
diff --git a/src/military/expert/reviewResult/gradesModal/index.jsx b/src/military/expert/reviewResult/gradesModal/index.jsx
index a1f8ff31..0ad2757c 100644
--- a/src/military/expert/reviewResult/gradesModal/index.jsx
+++ b/src/military/expert/reviewResult/gradesModal/index.jsx
@@ -18,19 +18,27 @@ function GradesModal({ setVisible, visible, opsId, opsType, taskId }) {
       title: '评审专家',
       dataIndex: 'expertName',
       key: 'expertName',
+      width: 100,
+    },
+    {
+      title: '电话',
+      dataIndex: 'expertPhone',
+      key: 'expertPhone',
+      width: 130,
     },
     {
       title: '评审打分',
       dataIndex: 'gradesAverage',
       key: 'gradesAverage',
       render: (text, record, index) => {
-        return text|| '--'
+        return text == 0 ? 0 : text || '--'
       }
     },
     {
       title: '评审意见',
       dataIndex: 'comments',
       key: 'comments',
+      width: 250,
       render: (text, record, index) => {
         return text|| '--'
       }
@@ -51,7 +59,7 @@ function GradesModal({ setVisible, visible, opsId, opsType, taskId }) {
     dataIndex: 'gradesOne',
     key: 'gradesOne',
     render: (text, record, index) => {
-      return text|| '--'
+      return text == 0 ? 0 : text || '--'
     }
   },
   {
@@ -59,7 +67,7 @@ function GradesModal({ setVisible, visible, opsId, opsType, taskId }) {
     dataIndex: 'gradesTwo',
     key: 'gradesTwo',
     render: (text, record, index) => {
-      return text|| '--'
+      return text == 0 ? 0 : text || '--'
     }
   },
   {
@@ -67,7 +75,7 @@ function GradesModal({ setVisible, visible, opsId, opsType, taskId }) {
     dataIndex: 'gradesThree',
     key: 'gradesThree',
     render: (text, record, index) => {
-      return text|| '--'
+      return text == 0 ? 0 : text || '--'
     }
   },
   {
@@ -75,7 +83,7 @@ function GradesModal({ setVisible, visible, opsId, opsType, taskId }) {
     dataIndex: 'gradesFour',
     key: 'gradesFour',
     render: (text, record, index) => {
-      return text|| '--'
+      return text == 0 ? 0 : text || '--'
     }
   },
   {
@@ -83,7 +91,7 @@ function GradesModal({ setVisible, visible, opsId, opsType, taskId }) {
     dataIndex: 'gradesFive',
     key: 'gradesFive',
     render: (text, record, index) => {
-      return text|| '--'
+      return text == 0 ? 0 : text || '--'
     }
   }];
 
@@ -91,7 +99,7 @@ function GradesModal({ setVisible, visible, opsId, opsType, taskId }) {
 
   if (gradesNum) {
     let thisGradesColumns = gradesColumns.slice(0, gradesNum);
-    columns.splice(3, 0, ...thisGradesColumns);
+    columns.splice(4, 0, ...thisGradesColumns);
   }
 
   // 获取评分列表
@@ -129,7 +137,8 @@ function GradesModal({ setVisible, visible, opsId, opsType, taskId }) {
       onCancel={() => { setVisible(false) }}
       footer={null}
       draggable={true}
-      width="90%"
+      width={1050}
+      wrapClassName="task_review_detail"
     >
       <Paginationtable
         loading={loading}
diff --git a/src/military/expert/reviewResult/gradesModal/index.scss b/src/military/expert/reviewResult/gradesModal/index.scss
index 53d43210..fcaa0c7f 100644
--- a/src/military/expert/reviewResult/gradesModal/index.scss
+++ b/src/military/expert/reviewResult/gradesModal/index.scss
@@ -46,8 +46,6 @@
     }
   }
 
-
-
   .button-div {
     line-height: 1.5;
   }
@@ -84,3 +82,6 @@
     margin: .75rem 1.75rem;
   }
 }
+.task_review_detail .pagination-table .ant-table-thead tr th div {
+    font-weight: bold;
+}
\ No newline at end of file
diff --git a/src/military/expert/reviewResult/index.jsx b/src/military/expert/reviewResult/index.jsx
index 958e55ac..a66cdfdd 100644
--- a/src/military/expert/reviewResult/index.jsx
+++ b/src/military/expert/reviewResult/index.jsx
@@ -40,7 +40,7 @@ function ReviewResult({ history, match }) {
       key: 'phone',
     },
     {
-      title: '评审细节',
+      title: '评审明细',
       ket: 'detali',
       render: (text, record) => {
         return <a className="lookDetail" onClick={()=>{detail(record)}}>查看明细</a>
diff --git a/src/military/task/taskAdmin/index.jsx b/src/military/task/taskAdmin/index.jsx
index 9f912aaf..e0edc7df 100644
--- a/src/military/task/taskAdmin/index.jsx
+++ b/src/military/task/taskAdmin/index.jsx
@@ -385,10 +385,15 @@ export default Form.create()(({ form, showNotification, match, history, state })
       setTimeout(() => {
         Modal.confirm({
           className: 'publishReview',
-          title: "评审规则",
+          title: "发布评审任务",
           centered: true,
           content:
             <React.Fragment>
+              <div className='tip'>
+                <i className='iconfont icon-erciqueren_icon'></i>
+                <span className='publicTitle'>确定发布此评审任务？确定发布后评审规则与评审专家信息将无法重新编辑</span>
+              </div>
+              <p>评审规则</p>
               <div>{rules && rules.rule}</div>
               <p>评分标准</p>
               <div>
diff --git a/src/military/task/taskAdmin/index.scss b/src/military/task/taskAdmin/index.scss
index 96cda37c..e6c859dc 100644
--- a/src/military/task/taskAdmin/index.scss
+++ b/src/military/task/taskAdmin/index.scss
@@ -94,10 +94,17 @@
 // 发布评审任务弹框样式
 .publishReview{
   width: 1050px !important;
+  .ant-modal-body{
+    padding: 0;
+  }
+  .ant-modal-confirm-btns {
+    margin: 15px 35px 10px;
+  }
   .ant-modal-confirm-title{
     border-bottom: 1px solid #eeeeee;
-    padding-bottom: 10px;
-    font-weight: bold;
+    padding: 20px 25px;
+    background: #f2f2ff;
+    font-size: 18px;
   }
   .ant-modal-confirm-body > .anticon{
     display: none;
@@ -108,13 +115,23 @@
   .ant-modal-confirm-content{
     &>p{
       font-size: 16px;
-      color: rgba(51, 51, 51, 1);
+      color: #333333;
       border-bottom: 1px solid #eeeeee;
-      padding: 10px 0;
+      padding: 10px 35px;
       font-weight: bold;
     }
     &>div{
-      padding: 10px;
+      padding: 10px 45px;
+    }
+    .tip{
+      padding: 10px 35px;
+      i{
+        color: #ca0002;
+      }
+      .publicTitle {
+        font-size: 15px;
+        margin-left: 3px;
+      }
     }
   }
   .pagination-table .ant-table-tbody > tr > td{