add:多人领取任务

src/components/Mine.vue

@@ -59,11 +59,12 @@
           </span>
           <el-row v-if="unFinishedTaskList != null && unFinishedTaskList.length != 0" type="flex" align="middle"
                   justify="center" style="font-size: 14px;">
-            <el-col :span="6">任务封面</el-col>
-            <el-col :span="5">任务名称</el-col>
-            <el-col :span="5">任务类型</el-col>
+            <el-col :span="5">任务封面</el-col>
+            <el-col :span="4">任务名称</el-col>
+            <el-col :span="4">任务类型</el-col>
             <el-col :span="4">任务预算</el-col>
-            <el-col :span="4">操作</el-col>
+            <el-col :span="4">领取人数</el-col>
+            <el-col :span="3">操作</el-col>
           </el-row>
           <span v-if="unFinishedTaskList == null || unFinishedTaskList.length == 0"> 暂无任务 </span>
           <task-item v-if="unFinishedTaskList != null || unFinishedTaskList.length > 0"
@@ -76,11 +77,12 @@
           <el-row v-if="finishedTaskList != null && finishedTaskList.length != 0" type="flex" align="middle"
                   justify="center" style="font-size: 14px;">
 
-            <el-col :span="6">任务封面</el-col>
-            <el-col :span="5">任务名称</el-col>
-            <el-col :span="5">任务类型</el-col>
+            <el-col :span="5">任务封面</el-col>
+            <el-col :span="4">任务名称</el-col>
+            <el-col :span="4">任务类型</el-col>
             <el-col :span="4">任务预算</el-col>
-            <el-col :span="4">操作</el-col>
+            <el-col :span="4">领取人数</el-col>
+            <el-col :span="3">操作</el-col>
           </el-row>
           <span v-if="finishedTaskList == null || finishedTaskList.length == 0"> 暂无任务 </span>
           <task-item v-if="finishedTaskList != null || finishedTaskList.length > 0"
@@ -99,11 +101,12 @@
           <span v-if="myProjects == null || myProjects.length == 0"> 暂无项目 </span>
           <el-row v-if="myProjects != null && myProjects.length != 0" type="flex" align="middle" justify="center"
                   style="font-size: 14px;">
-            <el-col :span="6" type="flex" align="middle" justify="center">项目图片</el-col>
-            <el-col :span="6" type="flex" align="middle" justify="center">项目名称</el-col>
-            <el-col :span="6" type="flex" align="middle" justify="center">项目平台</el-col>
-            <el-col :span="2" type="flex" align="middle" justify="center">项目预算</el-col>
-            <el-col :span="4" type="flex" align="middle" justify="center">操作</el-col>
+            <el-col :span="5" type="flex" align="middle" justify="center">项目图片</el-col>
+            <el-col :span="4" type="flex" align="middle" justify="center">项目名称</el-col>
+            <el-col :span="4" type="flex" align="middle" justify="center">项目平台</el-col>
+            <el-col :span="4" type="flex" align="middle" justify="center">项目预算</el-col>
+            <el-col :span="4" type="flex" align="middle" justify="center">领取人数</el-col>
+            <el-col :span="3" type="flex" align="middle" justify="center">操作</el-col>
           </el-row>
           <project-item v-if="myProjects != null || myProjects.length > 0"
                         v-for="(item,index3) in myProjects" :key="index3" :projectItem="item"/>
@@ -117,11 +120,12 @@
           </span>
           <el-row v-if="handlingProjects != null && handlingProjects.length != 0" type="flex" align="middle"
                   justify="center" style="font-size: 14px;">
-            <el-col :span="6">项目图片</el-col>
-            <el-col :span="6">项目名称</el-col>
-            <el-col :span="6">项目平台</el-col>
-            <el-col :span="2">项目预算</el-col>
-            <el-col :span="4">操作</el-col>
+            <el-col :span="5">项目图片</el-col>
+            <el-col :span="4">项目名称</el-col>
+            <el-col :span="4">项目平台</el-col>
+            <el-col :span="4">项目预算</el-col>
+            <el-col :span="4">领取人数</el-col>
+            <el-col :span="3">操作</el-col>
           </el-row>
           <span v-if="handlingProjects == null || handlingProjects.length == 0"> 暂无项目 </span>
           <project-item v-if="handlingProjects != null || handlingProjects.length > 0"
@@ -136,11 +140,12 @@
           </span>
           <el-row v-if="acceptableProjects != null && acceptableProjects.length != 0" type="flex" align="middle"
                   justify="center" style="font-size: 14px;">
-            <el-col :span="6">项目图片</el-col>
-            <el-col :span="6">项目名称</el-col>
-            <el-col :span="6">项目平台</el-col>
-            <el-col :span="2">项目预算</el-col>
-            <el-col :span="4">操作</el-col>
+            <el-col :span="5">项目图片</el-col>
+            <el-col :span="4">项目名称</el-col>
+            <el-col :span="4">项目平台</el-col>
+            <el-col :span="4">项目预算</el-col>
+            <el-col :span="4">领取人数</el-col>
+            <el-col :span="3">操作</el-col>
           </el-row>
           <span v-if="acceptableProjects == null || acceptableProjects.length == 0"> 暂无项目 </span>
           <project-item v-if="acceptableProjects != null || acceptableProjects.length > 0"

src/components/Square.vue

@@ -4,11 +4,12 @@
 
     <div class="square-list-container" v-loading="loading" type="flex" align="middle">
       <el-row v-if="list != null && list.length != 0" type="flex" align="middle" justify="center"  style="font-size: 14px;">
-        <el-col :span="6">任务封面</el-col>
-        <el-col :span="5">任务名称</el-col>
-        <el-col :span="5">任务类型</el-col>
+        <el-col :span="5">任务封面</el-col>
+        <el-col :span="4">任务名称</el-col>
+        <el-col :span="4">任务类型</el-col>
         <el-col :span="4">任务预算</el-col>
-        <el-col :span="4">操作</el-col>
+        <el-col :span="4">领取次数</el-col>
+        <el-col :span="3">操作</el-col>
       </el-row>
       <task-item v-if="list!=null&&list.length>0" v-for="(item,index) in list" :key="index" :task="item"/>
       <!--<div v-if="loading" class="loading">-->

src/components/commons/ProjectItem.vue

@@ -17,23 +17,26 @@
     <!--<span class="btn btn-small btn-info" @click="goToProjectDetail(project.id)">查看详情</span>-->
     <!--</span>-->
     <el-row type="flex" align="middle" justify="center" style="font-size: 14px;">
-      <el-col :span="6" type="flex" align="middle" justify="center">
+      <el-col :span="5" type="flex" align="middle" justify="center">
         <el-badge :value="project.statusVO.text" class="item" :type="project.statusVO.style">
           <img class="project-cover" src="@/assets/img/home_ban1.jpg">
         </el-badge>
       </el-col>
-      <el-col :span="6" type="flex" align="middle" justify="center">{{project.name}}</el-col>
+      <el-col :span="4" type="flex" align="middle" justify="center">{{project.name}}</el-col>
       <!--<el-col :span="4">{{project.id}}</el-col>-->
-      <el-col :span="6" type="flex" align="middle" justify="center">
+      <el-col :span="4" type="flex" align="middle" justify="center">
         <span style="font-size: 10px;"
               v-bind:class="['badge',{ 'ios-platform': item=='IOS','android-platform': item=='ANDROID','web-platform': item=='WEB'}]"
               v-for="item in project.platform"
         >{{item}}</span>
       </el-col>
-      <el-col :span="2" type="flex" align="middle" justify="center">
+      <el-col :span="4" type="flex" align="middle" justify="center">
         <div class="badge">¥{{project.budget}}</div>
       </el-col>
       <el-col :span="4" type="flex" align="middle" justify="center">
+        {{project.acceptedCount}} / {{  project.participantCount}}
+      </el-col>
+      <el-col :span="3" type="flex" align="middle" justify="center">
         <el-badge v-if="project.needHandle" is-dot class="item">
           <span class="btn btn-small btn-info" @click="goToProjectDetail(project.id)">查看详情</span>
         </el-badge>

src/components/commons/TaskItem.vue

@@ -1,20 +1,23 @@
 <template>
   <div class="task-item-container">
     <el-row type="flex" align="middle" justify="center" style="font-size: 14px;">
-      <el-col :span="6" type="flex" align="middle" justify="center">
+      <el-col :span="5" type="flex" align="middle" justify="center">
         <el-badge :value="taskTable.statusVO.text" class="item" :type="taskTable.statusVO.style">
           <img class="task-cover" src="@/assets/img/home_ban1.jpg">
         </el-badge>
       </el-col>
-      <el-col :span="5" type="flex" align="middle" justify="center">{{taskTable.title}}</el-col>
+      <el-col :span="4" type="flex" align="middle" justify="center">{{taskTable.title}}</el-col>
       <!--<el-col :span="4">{{project.id}}</el-col>-->
-      <el-col :span="5" type="flex" align="middle" justify="center">{{taskTable.serviceType}}</el-col>
+      <el-col :span="4" type="flex" align="middle" justify="center">{{taskTable.serviceType}}</el-col>
       <el-col :span="4" type="flex" align="middle" justify="center">
         <div class="badge" type="flex" align="middle" justify="center">
           ¥{{taskTable.quotePrice==null?0:taskTable.quotePrice}}
         </div>
       </el-col>
-      <el-col :span="4" type="flex" align="middle" justify="center"><span class="btn btn-medium btn-info"
+      <el-col :span="4" type="flex" align="middle" justify="center">
+        {{taskTable.acceptedCount}} / {{  taskTable.participantCount}}
+      </el-col>
+      <el-col :span="3" type="flex" align="middle" justify="center"><span class="btn btn-medium btn-info"
                                                                           @click="goToTaskDetail(taskTable.projectId,taskTable.id)">查看详情</span>
       </el-col>
     </el-row>

src/components/project/Project.vue

@@ -306,6 +306,7 @@ export default {
       }
     }
     return {
+      acceptedUserList:[],
       projectId: 0,
       user: {},
       loading: false,
@@ -839,6 +840,7 @@ export default {
             }
         }
 
+
       }).catch((error) => {
         this.hideLoading()
         notify('error', error.data)

src/components/project/ProjectCreate.vue

@@ -21,7 +21,9 @@
           <el-input type="textarea" style="width: 400px" v-model="project.desc"
                     placeholder="请输入对项目的描述"></el-input>
         </el-form-item>
-
+        <el-form-item label="领取人数" prop="contactPhone">
+          <el-input-number v-model="project.participantCount" :min="1" :max="10" label="领取人数"></el-input-number>
+        </el-form-item>
         <!--<el-form-item label="价格" prop="price">-->
         <!--<el-input type="number" v-model="project.price">-->
         <!--<template slot="append">¥</template>-->
@@ -174,6 +176,7 @@ export default {
         contactPhone: '',
         type: [],
         platform: [],
+        participantCount:1,
         desc: '',
         doc: [],
         file: [],

src/components/report/ReportList.vue

@@ -10,6 +10,11 @@
     </el-row>-->
 
     <el-table :showHeader="true" :data="reportList" style="width: 100%">
+      <el-table-column
+        prop="userName"
+        label="提交用户"
+      >
+      </el-table-column>
       <el-table-column prop="type" label="报告类型" title="报告类型">
         <template slot-scope="scope">
           <span class="badge">{{scope.row.type}}</span>

src/main.js

@@ -58,6 +58,7 @@ import {
   TimeSelect,
   Tooltip,
   Upload,
+  Progress
 } from 'element-ui'
 function getCurrentUserSuccess(res){
 
@@ -180,6 +181,7 @@ Vue.use(DropdownMenu)
 Vue.use(Image)
 Vue.use(Badge)
 Vue.use(Popover)
+Vue.use(Progress)
 
 Vue.prototype.$msgbox = MessageBox
 Vue.prototype.$alert = MessageBox.alert