创客列表改为展开信息

src/military/components/adminRouter/index.jsx

@@ -34,7 +34,7 @@ export default props => {
         <Menu.Item><Link to="/task/payProof">支付报酬凭证上传</Link></Menu.Item>
       </SubMenu>
 
-      <Menu.Item><Link to="/task/taskAdmin">任务列表</Link></Menu.Item>
+      <Menu.Item><Link to="/task/taskAdmin">创客任务列表</Link></Menu.Item>
       <Menu.Item><Link to="/task/paperManage">创意征集评论</Link></Menu.Item>
     </Menu>
   });

src/military/components/paginationTable/index.jsx

@@ -3,7 +3,7 @@ import { Table, Pagination } from 'antd';
 import './index.scss';
 
 export default (props) => {
-  const { loading, dataSource, columns, handleRow, total, setCurPage, current, rowSelection, expandedRowRender, expandIconColumnIndex } =props;
+  const { loading, dataSource, columns, handleRow, total, setCurPage, current, rowSelection, expandedRowRender, expandIconColumnIndex, expandIconAsCell } =props;
 
   return (
     <Fragment>
@@ -17,6 +17,7 @@ export default (props) => {
         rowSelection={rowSelection}
         expandedRowRender={expandedRowRender}
         expandIconColumnIndex={expandIconColumnIndex}
+        expandIconAsCell={expandIconAsCell}
         {...props}
       />
       {total > 10 &&

src/military/expert/reviewRules/image/beCarful.svg

@@ -1,11 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
-  <g id="组_58" data-name="组 58" transform="translate(-465 -602)">
-    <g id="注意_2_" data-name="注意 (2)" transform="translate(465 602)">
-      <path id="形状" d="M0,8a8,8,0,1,1,8,8A8,8,0,0,1,0,8Z" fill="#3078ff"/>
-    </g>
-    <g id="感叹号2" transform="translate(-3.7 417.189)">
-      <path id="路径_12" data-name="路径 12" d="M486.4,189.83v4.85a.3.3,0,0,0,.591,0v-4.85A.3.3,0,0,0,486.4,189.83Z" transform="translate(-9.727)" fill="#fff"/>
-      <path id="路径_13" data-name="路径 13" d="M476.969,759.04m-.409,0a.409.409,0,1,0,.409-.409A.409.409,0,0,0,476.559,759.04Z" transform="translate(0 -562.513)" fill="#fff"/>
-    </g>
-  </g>
-</svg>

src/military/expert/selectExpert/index.jsx

@@ -284,9 +284,10 @@ function SelectExpert(props) {
             setCurPage={setCurPage}
             current={curPage}
             // rowSelection={selectExperts ? rowSelection : null}
-            rowSelection={ rowSelection}
+            rowSelection={rowSelection}
             expandedRowRender={record => <p style={{ margin: 0 }}>{record.graduatedFrom}</p>}
             expandIconColumnIndex={10}
+            expandIconAsCell={false}
           />
         </TabPane>
       </Tabs>

src/military/task/taskAdmin/index.jsx

@@ -92,22 +92,10 @@ export default Form.create()(({ form, showNotification, match, history }) => {
 
   const columns = useMemo(() => {
     return [
-      {
-        title: '序号',
-        dataIndex: 'index',
-        render: (text, record, index) => {
-          return <div style={{ textAlign: 'center' }}>{index + 1}</div>
-        }
-      },
-      {
-        title: '任务编号',
-        dataIndex: 'number',
-        width: "6%",
-      },
       {
         title: '任务名称',
         dataIndex: 'name',
-        width: "10%",
+        width: "13%",
         render: (text, record) => (
           <Link className="line_1 primary-link" target="_blank" to={`/task/taskDetail/${record.id}`} >{text}</Link>
         ),
@@ -175,24 +163,15 @@ export default Form.create()(({ form, showNotification, match, history }) => {
           return record.exceptClosedBoolean ? '已关闭' : statusArr[text]
         }
       },
-      {
-        title: '稿件数',
-        dataIndex: 'papersCount',
-      },
       {
         title: '发布主体',
         dataIndex: 'enterpriseName',
+        width: '9%',
       },
       {
         title: '发布时间',
         dataIndex: 'publishedAt',
-        render: (text, record) => {
-          return text || '--'
-        }
-      },
-      {
-        title: '截稿时间',
-        dataIndex: 'collectingEndTime',
+        width: '7%',
         render: (text, record) => {
           return text || '--'
         }
@@ -206,7 +185,7 @@ export default Form.create()(({ form, showNotification, match, history }) => {
           defaultValue={'0,1,2'}
           onChange={setShowUserMode}
         >
-          <Option key={'0,1,2'}>应征者名单公示</Option>
+          <Option key={'0,1,2'}>应征者公示</Option>
           {
             showUserModeArr.map(item => {
               return <Option key={item.dicItemCode}>{item.dicItemName}</Option>
@@ -249,7 +228,7 @@ export default Form.create()(({ form, showNotification, match, history }) => {
         title: '评审任务',
         dataIndex: 'expertReview1',
         render: (text, record) => {
-          return <Button>发布</Button>
+          return <Button size='small'>发布</Button>
         }
       },
       {
@@ -262,6 +241,7 @@ export default Form.create()(({ form, showNotification, match, history }) => {
       {
         title: '操作',
         key: 'action',
+        width: '6%',
         render: (text, record) => (
           <React.Fragment>
 
@@ -465,10 +445,6 @@ export default Form.create()(({ form, showNotification, match, history }) => {
         </Form.Item>
       </div>
 
-
-
-
-
       <div className="center-content">
 
         <Table
@@ -478,7 +454,7 @@ export default Form.create()(({ form, showNotification, match, history }) => {
           columns={columns}
           pagination={false}
           className="mt10"
-          scroll={{ x: 1800 }}
+          expandedRowRender={record => <p style={{textAlign: 'left'}}>{`任务编号: ${record.number}  稿件数：${record.papersCount}  截稿时间：${record.collectingEndTime || '--'}`}</p>}
         />
         {total > 10 &&
           <Pagination

src/military/task/taskAdmin/index.scss

@@ -41,7 +41,7 @@
   }
   .ant-table-thead > tr > th,
   .ant-table-tbody > tr > td {
-    padding: 1rem 0.2rem;
+    padding: 1rem 0.1rem;
     text-align: center;
   }