From b19c084ac8aec8748fe77af5cc77b369c18eaaf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <792998983@qq.com>
Date: Sat, 10 Jul 2021 10:40:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task/components/itemListMyTask/index.jsx  |  2 +-
 .../task/components/itemListPaper/index.jsx   | 29 ++++++++++---------
 src/military/task/paperComplain/index.js      |  2 +-
 src/military/task/taskEdit/index.jsx          |  2 ++
 4 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/military/task/components/itemListMyTask/index.jsx b/src/military/task/components/itemListMyTask/index.jsx
index a36c42d4..194a41a6 100644
--- a/src/military/task/components/itemListMyTask/index.jsx
+++ b/src/military/task/components/itemListMyTask/index.jsx
@@ -133,7 +133,7 @@ export default Form.create()((props) => {
                       (!item.isProofBoolean) && (item.taskResultProof && item.taskResultProof.status === 0) &&
                       <a onClick={() => { proofAdvice(item.advice) }} className="line_1 color-blue">佐证被拒原因</a>}
 
-                    {(item.status === 9) && <a onClick={() => { repairAdvice(item.advice) }} className="line_1 color-blue">审核意见</a>}
+                    {(item.status === 9) && <a onClick={() => { repairAdvice(item.repairAdvice) }} className="line_1 color-blue">审核意见</a>}
 
                     {item.status === 6 && <a className="line_1 color-blue" onClick={() => { signMethodModal(item) }}>选择协议签订方式</a>}
                     {/* <a href="javascript:void(0)" className="line_1 color-blue" onClick="paying_register_popup()">支付登记</a> */}
diff --git a/src/military/task/components/itemListPaper/index.jsx b/src/military/task/components/itemListPaper/index.jsx
index 42c87d6d..c63c9bb1 100644
--- a/src/military/task/components/itemListPaper/index.jsx
+++ b/src/military/task/components/itemListPaper/index.jsx
@@ -7,7 +7,7 @@ import Loading from "src/Loading";
 import { editorConfig } from 'military/components/config';
 import Upload from 'military/components/Upload';
 import { reportPaper, thumbUpPaper, commentAdd, complainPaper, publicityComplain } from '../../api';
-import {paperCheckStatusArr} from '../../static';
+import { paperCheckStatusArr } from '../../static';
 import { httpUrl } from '../../../fetch';
 import winpng from '../../image/winner.png';
 import headpng from '../../image/head.png';
@@ -15,9 +15,9 @@ import './index.scss';
 
 const { TextArea } = Input;
 
-const paperCheckStatus=[];
-for (const item of paperCheckStatusArr){
-  paperCheckStatus[item.dicItemCode]=item.dicItemName;
+const paperCheckStatus = [];
+for (const item of paperCheckStatusArr) {
+  paperCheckStatus[item.dicItemCode] = item.dicItemName;
 }
 
 export default Form.create()((props) => {
@@ -215,7 +215,7 @@ export default Form.create()((props) => {
                             <span className="color-grey3 font-bd mr20">{commentsItem.user.nickname || commentsItem.user.login}</span>
                             <span className="color-grey9">{timeAgo(commentsItem.createdAt)}</span>
                           </div>
-                          <div className="editor-w-text comments-content" dangerouslySetInnerHTML={{ __html: commentsItem.details&&commentsItem.details.content }}>
+                          <div className="editor-w-text comments-content" dangerouslySetInnerHTML={{ __html: commentsItem.details && commentsItem.details.content }}>
                           </div>
                         </div>
                       })
@@ -318,14 +318,17 @@ export default Form.create()((props) => {
             )
           }
 
-          <Upload
-            className="commentStyle"
-            load={UploadFunc}
-            size={50}
-            showNotification={showNotification}
-            actionUrl={httpUrl}
-            fileList={fileList}
-          />
+          <Form.Item required={true}>
+            <Upload
+              className="commentStyle"
+              load={UploadFunc}
+              size={50}
+              showNotification={showNotification}
+              actionUrl={httpUrl}
+              fileList={fileList}
+            />
+          </Form.Item>
+
         </div>
       </Modal>
 
diff --git a/src/military/task/paperComplain/index.js b/src/military/task/paperComplain/index.js
index 2439065c..ac809977 100644
--- a/src/military/task/paperComplain/index.js
+++ b/src/military/task/paperComplain/index.js
@@ -248,7 +248,7 @@ export default Form.create()(({ current_user, form, showNotification, match, })
           "message",
           [{ required: true, message: '请给出不通过的原因' }],
           <TextArea
-            placeholder="(必填)我想给点什么意见呢,200字以内"
+            placeholder="(必填)我想给点什么意见呢，200字以内"
             autoSize={{ minRows: 6 }}
             className="applyText"
             maxLength={200}
diff --git a/src/military/task/taskEdit/index.jsx b/src/military/task/taskEdit/index.jsx
index d55ead0e..cb4ed2d2 100644
--- a/src/military/task/taskEdit/index.jsx
+++ b/src/military/task/taskEdit/index.jsx
@@ -20,6 +20,8 @@ function getSomeDayAfter(nDay) {
 
 export default Form.create()(forwardRef(({ current_user, form, showNotification, match, history }, ref) => {
 
+  console.log(current_user);
+  
   const [taskCategoryArr, setTaskCategoryArr] = useState([]);
   const [fileList, setFileList] = useState(null);