..

src/components/project/Project.vue

@@ -174,6 +174,8 @@
           <div class="btn btn-medium" @click="cancelMode('project')">取消</div>
         </el-form-item>
         <el-form-item v-if="!isModifyMode">
+          <div class="btn btn-medium btn-info" @click="submitProjectRequest()">提交项目</div>
+          <div class="btn btn-medium btn-info" @click="applyProject()">接受项目</div>
           <div class="btn btn-medium btn-info" @click="modifyForm()">修改</div>
           <div class="btn btn-medium btn-info" @click="analyseDemand()">分析需求</div>
           <div class="btn btn-medium btn-info" @click="createTask()">新建任务</div>
@@ -483,6 +485,24 @@ export default {
       //获得update 信息
       //this.loadData()
     },
+    submitProjectRequest(){
+      const data = {
+        userId: 3,
+        projectId:this.projectId
+      }
+      Http.post(Apis.USER.SUBMIT_PROJECT_REQUEST,data).then((res)=>{
+        console.log(res)
+      })
+    },
+    applyProject(){
+      const data = {
+        userId: 3,
+        projectId:this.projectId
+      }
+      Http.post(Apis.USER.ACCEPT_PROJECT,data).then((res)=>{
+        console.log(res)
+      })
+    },
     cancelMode (formName) {
       this.isModifyMode = false
       this.loadData()

src/components/report/Report.vue

@@ -156,9 +156,15 @@ export default {
         conclusion: this.report.conclusion
       }
       console.log(newReport)
-      Http.put(Apis.REPORT.UPDATE_REPORT.replace('{projectId}', this.projectId).replace('{taskId}', this.taskId).replace('{reportId}', this.reportId), newReport).then((res) => {
-        console.log(res)
-      })
+      if (this.taskId == null){
+        Http.put(Apis.REPORT.UPDATE_PROJECT_REPORT.replace('{projectId}', this.projectId).replace('{reportId}', this.reportId), newReport).then((res) => {
+          console.log(res)
+        })
+      }else {
+        Http.put(Apis.REPORT.UPDATE_TASK_REPORT.replace('{projectId}', this.projectId).replace('{taskId}', this.taskId).replace('{reportId}', this.reportId), newReport).then((res) => {
+          console.log(res)
+        })
+      }
       // this.$refs[formName].validate(valid => {
       //   if (valid) {
       //     this.isModifyMode = false
@@ -215,10 +221,17 @@ export default {
       console.log(this.taskId)
       console.log(this.reportId)
       console.log('***')
-      Http.get(Apis.REPORT.GET_REPORT.replace('{projectId}', this.projectId).replace('{taskId}', this.taskId).replace('{reportId}', this.reportId)).then((res) => {
-        console.log(res)
-        this.report = res.crowdReportVO
-      })
+      if (this.taskId == null){
+        Http.get(Apis.REPORT.GET_PROJECT_REPORT.replace('{projectId}', this.projectId).replace('{reportId}', this.reportId)).then((res) => {
+          console.log(res)
+          this.report = res.crowdReportVO
+        })
+      }else {
+        Http.get(Apis.REPORT.GET_TASK_REPORT.replace('{projectId}', this.projectId).replace('{taskId}', this.taskId).replace('{reportId}', this.reportId)).then((res) => {
+          console.log(res)
+          this.report = res.crowdReportVO
+        })
+      }
     }
   }
 }

src/components/report/ReportCreate.vue

@@ -145,11 +145,11 @@ export default {
       }
       console.log(newReport)
       if (this.taskId == null){
-        Http.post(Apis.REPORT.CREATE_REPORT.replace('{projectId}',this.projectId).replace('{taskId}',this.taskId), newReport).then((res) => {
+        Http.post(Apis.REPORT.CREATE_PROJECT_REPORT.replace('{projectId}',this.projectId), newReport).then((res) => {
           console.log(res)
         })
       }else{
-        Http.post(Apis.REPORT.CREATE_REPORT.replace('{projectId}',this.projectId).replace('{taskId}',this.taskId), newReport).then((res) => {
+        Http.post(Apis.REPORT.CREATE_TASK_REPORT.replace('{projectId}',this.projectId).replace('{taskId}',this.taskId), newReport).then((res) => {
           console.log(res)
         })
       }

src/components/task/Task.vue

@@ -84,6 +84,7 @@
           <div class="btn btn-medium" @click="cancelMode('task')">取消</div>
         </el-form-item>
         <el-form-item v-if="!isModifyMode">
+          <div class="btn btn-medium btn-info" @click="submitTaskRequest()">提交任务</div>
           <div class="btn btn-medium btn-info" @click="applyTask()">接收任务</div>
           <div class="btn btn-medium btn-info" @click="modifyForm()">修改</div>
           <div class="btn btn-medium btn-info" @click="createReport()">上传报告</div>
@@ -203,7 +204,7 @@ export default {
     init () {
       this.taskId = this.$route.params.taskId
       this.projectId = this.$route.params.projectId
-      this.loadData(this.projectId,this.taskId)
+      this.loadData(this.projectId, this.taskId)
     },
     updateLocation (location) {
       var provinceName = ''
@@ -232,8 +233,8 @@ export default {
             type: this.task.serviceType,
             resource: this.task.resource,
             location: this.task.location,
-            institution:this.task.institution,
-            datetime:this.task.datetime,
+            institution: this.task.institution,
+            datetime: this.task.datetime,
             quotePrice: this.task.quotePrice,
             fixedPrice: this.task.fixedPrice
           }
@@ -279,12 +280,29 @@ export default {
       })
     },
     applyTask () {
-      console.log('申请项目')
+      const data = {
+        userId: 3,
+        projectId:this.projectId,
+        taskId:this.taskId
+      }
+      Http.post(Apis.USER.ACCEPT_TASK,data).then((res) => {
+        console.log(res)
+      })
+    },
+    submitTaskRequest () {
+      const data = {
+        userId: 3,
+        projectId:this.projectId,
+        taskId:this.taskId
+      }
+      Http.post(Apis.USER.SUBMIT_TASK_REQUEST,data).then((res) => {
+        console.log(res)
+      })
     },
     createReport () {
       this.$router.push({
         name: 'ReportCreate',
-        params:{
+        params: {
           scope: 1,
           dependencyCode: this.taskId,
           projectId: this.projectId,
@@ -292,9 +310,9 @@ export default {
         }
       })
     },
-    loadData (projectId,taskId) {
+    loadData (projectId, taskId) {
       //replace('{taskId}', this.taskId)
-      Http.get(Apis.TASK.GET_TASK.replace('{projectId}',projectId).replace('{taskId}', taskId)).then((res) => {
+      Http.get(Apis.TASK.GET_TASK.replace('{projectId}', projectId).replace('{taskId}', taskId)).then((res) => {
         this.task = res.crowdTaskVO
         this.reportList = res.crowdReportVOList
       })

src/js/api.js

@@ -12,12 +12,23 @@ export default {
     DELETE_TASK: '/api/project/{projectId}/task/{taskId}/'
   },
   REPORT: {
-    GET_REPORT: '/api/project/{projectId}/task/{taskId}/report/{reportId}/',
-    CREATE_REPORT: '/api/project/{projectId}/task/{taskId}/report/',
-    UPDATE_REPORT: '/api/project/{projectId}/task/{taskId}/report/{reportId}/',
-    DELETE_REPORT: '/api/project/{projectId}/task/{taskId}/report/{reportId}/'
+    GET_TASK_REPORT: '/api/project/{projectId}/task/{taskId}/report/{reportId}/',
+    GET_PROJECT_REPORT:'/api/project/{projectId}/report/{reportId}/',
+    CREATE_TASK_REPORT: '/api/project/{projectId}/task/{taskId}/report/',
+    CREATE_PROJECT_REPORT:'/api/project/{projectId}/report/',
+    UPDATE_TASK_REPORT: '/api/project/{projectId}/task/{taskId}/report/{reportId}/',
+    UPDATE_PROJECT_REPORT:'/api/project/{projectId}/report/{reportId}/',
+    DELETE_TASK_REPORT: '/api/project/{projectId}/task/{taskId}/report/{reportId}/',
+    DELETE_PROJECT_REPORT:''
+  },
+  USER: {
+    ACCEPT_TASK: '',
+    ACCEPT_PROJECT: '',
+    SUBMIT_TASK_REQUEST: '',
+    SUBMIT_PROJECT_REQUEST: '',
+    END_TASK: '',
+    END_PROJECT: ''
   },
-  USER: {},
   PAGE: {
     HOME_PAGE: '/api/index/',
     SQUARE_PAGE: '/api/task/',