Merge branch 'pre_dev_military' of http://106.75.45.236:3000/tongChong/forgeplus-react into feature_achieve

src/military/task/components/itemListPaper/index.jsx

@@ -46,8 +46,12 @@ export default Form.create()((props) => {
   }, [page]);
 
   function downFile(item) {
-    let url = httpUrl + '/busiAttachments/download/' + item.id;
-    window.open(url);
+    if(item.uniqueFileName){
+      let url = httpUrl + '/busiAttachments/download/' + item.id;
+      window.open(url);
+    }else{
+      showNotification("您没有下载权限！");
+    }
   }
 
   function report() {

src/military/task/components/itemListTask/index.scss

@@ -41,37 +41,10 @@
     top:-10px;
     margin-left: -40px;
   }
-  // .chuangke_icon{
-  //   position: relative;
-  //   top:-8px;
-  //   background-image: url("../../image/chuangke_icon.png");
-  //   width: 140px;
-  //   height: 46px;
-  //   background-size: 100% 100%;
-  //   font-size: 14px;
-  //   color: #fff;
-  //   display: flex;
-  //   transform: scale(0.75);
-  //   justify-content: center;
-  //   align-items: center;
-  //   padding-left: 10px;
-  //   margin-right: -15px;
-  //   margin-left: -27px;
-  // }
 }
 .list-title:hover {
   color: #4154f1;
 }
-.list-title span {
-  padding: 0px 10px;
-  margin-left: .625rem;
-  background: #f8c753;
-  font-size: .8rem;
-  line-height: 1.8;
-  color: #fff;
-  border-radius: 14px;
-}
-
 
 .list-other {
   font-size: 12px;

src/military/task/index.scss

@@ -68,7 +68,15 @@
     -webkit-box-orient: vertical;
   }
 }
-
+.list-title span {
+  padding: 0px 10px;
+  margin-left: .625rem;
+  background: #f8c753;
+  font-size: .8rem;
+  line-height: 1.8;
+  color: #fff;
+  border-radius: 14px;
+}
 span.list-yellow {
   background: #fa6400;
 }

src/military/task/static.js

@@ -3,8 +3,13 @@ import { formatDuring } from 'educoder';
 // task静态数据，工具函数
 // 任务状态分组
 export const taskStatusArr = [
-  { dicItemCode: "3,4,5,6,7", name: "正在进行中", dicItemName: "正在进行中" },
-  { dicItemCode: "8", name: "已完成", dicItemName: "已完成" },
+  // { dicItemCode: "3,4,5,6,7", name: "正在进行中", dicItemName: "正在进行中" },
+  { dicItemCode: 3, name: "成果征集中", dicItemName: "成果征集中" },
+  { dicItemCode: 4, name: "成果评选中", dicItemName: "成果评选中" },
+  { dicItemCode: 5, name: "公示中", dicItemName: "公示中" },
+  { dicItemCode: 6, name: "协议签订中", dicItemName: "协议签订中" },
+  { dicItemCode: 7, name: "支付中", dicItemName: "支付中" },
+  { dicItemCode: 8, name: "已完成", dicItemName: "已完成" },
 ];
 
 // 所有任务状态

src/military/task/taskDetail/index.jsx

@@ -535,10 +535,10 @@ export default Form.create()(
 
         <div className="applyList edu-back-white padding30 mt20">
           <div className="font-16 font-bd">交稿
-            {/* （{dataList.length}） */}
-            {!detailData.showUserStatus && <Tooltip placement="top" title={"不公示应征者姓名"}>
+            {/* 此功能暂时去掉 */}
+            {/* {!detailData.showUserStatus && <Tooltip placement="top" title={"不公示应征者姓名"}>
               <i data-tip-down="不公示应征者姓名" className="iconfont icon-yincang1 color-grey9 font-20 ml5"></i>
-            </Tooltip>}
+            </Tooltip>} */}
             {detailData.status === 4 && dataList.length && (!detailData.isProofBoolean) && (!detailData.expertReview) && detailData.user && (current_user.admin || current_user.login === detailData.user.login) ?
               <a className="line_1 color-blue fr ml20" onClick={() => { setVisibleProofs(true) }}>上传佐证材料</a> : ''}
             {dataList.length > 0 && taskLimit && <a className="line_1 color-blue fr ml20" onClick={() => { window.open(`${httpUrl}/api/paper/papers/download/${id}`) }}>一键导出成果物 &gt;&gt;</a>}

src/military/task/taskEdit/index.jsx

@@ -240,7 +240,7 @@ export default Form.create()(forwardRef(({ current_user, form, showNotification,
     }
   }, []);
 
-  // 保存
+  // 发布/保存
   function saveItem(status) {
     validateFields((error, values) => {
       if (!error) {

src/military/task/taskList/index.jsx

@@ -151,24 +151,28 @@ export default ({ history, current_user, showLoginDialog, location, mygetHelmeta
     history.push(`/task/taskDetail/${id}`);
   }
 
-  // 新增校验
+  // 发布任务校验
   function goAdd() {
     if (!current_user.user_id) {
       showLoginDialog();
       return;
     }
+    if(current_user.admin){
+      history.push("/task/taskAdd");
+      return
+    }
     getCompanyInfo().then(res => {
       if (res) {
         if (res.message === 'success') {
           history.push("/task/taskAdd");
         } else {
-          //if (res.message === '未进行实体认证')
           setVisible(true)
         }
       }
     });
   }
 
+  // 身份认证
   function certificationCheck() {
     if (current_user.authentication || current_user.enterpriseCertification) {
       history.push('/needs/new')