Merge branch 'expert_review' of https://code.gitlink.org.cn/durian/forgeplus-react into dev_military_osredm

src/military/expert/expertUser/taskDetail/index.jsx

@@ -151,7 +151,7 @@ function ReviewTasks({ showNotification, match, history, current_user }) {
     getRules({ containerId, containerType }).then(res => {
       if (res && res.message === "success") {
         setRules(res.data);
-        if (res.data.status === 1) {
+        if (res.data.status === 1 || res.data.status === 2) {
           setDisabled(true);
         }
       }
@@ -418,7 +418,7 @@ function ReviewTasks({ showNotification, match, history, current_user }) {
 
             <div className="rules-box">
               <p className="rules-head">评审时间</p>
-              <div className="rules-content-last">{rules.reviewStartOn}~{rules.reviewEndOn}</div>
+              <div className="rules-content-last">{rules.reviewData}</div>
             </div>
           </div>
 

src/military/expert/static.js

@@ -60,5 +60,5 @@ export const taskType = [
 
 export const expertTaskStatus = [
   { value: -1, label: "未评审" },
-  { value: 1, label: "已评审" },
+  { value: '1,2', label: "已评审" },
 ];