From e7b3a01c47a88f6dddd590f1b7201249e8260d8b 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 11:23:30 +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  | 28 +++++++++++--------
 .../task/components/proofModal/index.jsx      |  2 +-
 src/military/task/paperManage/index.jsx       |  4 +--
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/military/task/components/itemListMyTask/index.jsx b/src/military/task/components/itemListMyTask/index.jsx
index 194a41a6..d0e751c5 100644
--- a/src/military/task/components/itemListMyTask/index.jsx
+++ b/src/military/task/components/itemListMyTask/index.jsx
@@ -33,14 +33,7 @@ export default Form.create()((props) => {
     setTaskId(item.id);
   }
 
-  function repairAdvice(repairAdvice) {
-    Modal.info({
-      title: '审核意见',
-      content: repairAdvice
-    })
-  }
-
-  function proofAdvice(advice) {
+  function adviceModal(advice) {
     Modal.info({
       title: '审核意见',
       content: advice
@@ -131,11 +124,13 @@ export default Form.create()((props) => {
                       <a onClick={() => { uploadProofs(item) }} className="line_1 color-blue">上传佐证材料</a>}
                     {
                       (!item.isProofBoolean) && (item.taskResultProof && item.taskResultProof.status === 0) &&
-                      <a onClick={() => { proofAdvice(item.advice) }} className="line_1 color-blue">佐证被拒原因</a>}
+                      <a onClick={() => { adviceModal(item.advice) }} className="line_1 color-blue">佐证被拒原因</a>}
 
-                    {(item.status === 9) && <a onClick={() => { repairAdvice(item.repairAdvice) }} className="line_1 color-blue">审核意见</a>}
+                    {(item.status === 2 || item.status === 9) && <a onClick={() => { adviceModal(item.repairAdvice) }} className="line_1 color-blue">审核意见</a>}
 
-                    {item.status === 6 && <a className="line_1 color-blue" onClick={() => { signMethodModal(item) }}>选择协议签订方式</a>}
+                    {item.status === 6 && item.agreementSigning === 0 && <a className="line_1 color-blue" onClick={() => { signMethodModal(item) }}>选择协议签订方式</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> */}
                     {/* <a href="javascript:void(0)" className="color-blue line_1">上传支付凭证</a> */}
                   </li>
@@ -190,6 +185,17 @@ export default Form.create()((props) => {
         }
       </Modal>
 
+
+      <Modal
+        title="上传委托协议"
+        visible={visibleMethod}
+        onOk={chooseMethod}
+        onCancel={() => { setVisibleMethod(false) }}
+        className="form-edit-modal"
+      >
+       
+      </Modal>
+
     </React.Fragment>
 
   )
diff --git a/src/military/task/components/proofModal/index.jsx b/src/military/task/components/proofModal/index.jsx
index be57de90..b1226911 100644
--- a/src/military/task/components/proofModal/index.jsx
+++ b/src/military/task/components/proofModal/index.jsx
@@ -202,7 +202,7 @@ export default Form.create()(props => {
             total={total}
           />}
 
-        <Form.Item >
+        <Form.Item required={true}>
           <Upload
             className="commentStyle"
             load={UploadFunc}
diff --git a/src/military/task/paperManage/index.jsx b/src/military/task/paperManage/index.jsx
index 4c441de1..e97e8d5d 100644
--- a/src/military/task/paperManage/index.jsx
+++ b/src/military/task/paperManage/index.jsx
@@ -261,7 +261,7 @@ export default Form.create()(({ current_user, form, showNotification, match, his
         {helper(
           "",
           "pass",
-          [{required:true,message:'请选择是否允许申诉'}],
+          [{required:visible,message:'请选择是否允许申诉'}],
           <Radio.Group
             className="mb10"
           >
@@ -274,7 +274,7 @@ export default Form.create()(({ current_user, form, showNotification, match, his
         {helper(
           "",
           "message",
-          [{required:true,message:'请输入拒绝的原因'}],
+          [{required:visible,message:'请输入拒绝的原因'}],
           <TextArea
             placeholder="(必填)我想说点什么呢,200字以内"
             autoSize={{ minRows: 6 }}