wangJJ 5 rokov pred
rodič
commit
523e539548

+ 1 - 1
src/components/report/ReportList.vue

@@ -9,7 +9,7 @@
       </el-col>
     </el-row>-->
 
-    <el-table :showHeader="false" :data="reportList" style="width: 100%">
+    <el-table :showHeader="true" :data="reportList" style="width: 100%">
 <!--      <el-table-column-->
 <!--        prop="userName"-->
 <!--        label="提交用户"-->

+ 8 - 4
src/components/task/Task.vue

@@ -35,8 +35,8 @@
         <el-form-item label="任务可见性" prop="resource">
           <div v-if="!isModifyMode">
             <!--<div v-if="task.resource=='1'">{{updateLocation(task.location)}}</div>-->
-            <div v-if="task.resource=='0'">{{task.institution}}</div>
-            <div v-if="task.resource=='2'">{{resourceType[task.resource]}}</div>
+            <div v-if="task.resource==0">定向</div>
+            <div v-if="task.resource==2">{{resourceType[task.resource]}}</div>
           </div>
           <el-tabs
             :tab-position="tabPosition"
@@ -66,7 +66,7 @@
             <el-tab-pane :label="resourceType[2]" name="2"></el-tab-pane>
           </el-tabs>
         </el-form-item>
-        <el-form-item label="领取人数" prop="quotePrice" v-if="isModifyMode">
+        <el-form-item label="领取人数" prop="quotePrice" v-if="isModifyMode && task.resource!=='0'">
           <el-input-number v-model="task.participantCount" :min="1" :max="100" label="领取人数"></el-input-number>
         </el-form-item>
         <el-form-item label="领取人数" prop="quotePrice" v-if="!isModifyMode">
@@ -206,6 +206,7 @@
           <report-list v-bind:reports="item.crowdReportVOS" v-bind:taskId="taskId" v-bind:projectId="projectId"/>
         </el-collapse-item>
       </el-collapse>
+<!--      <report-list v-if="isAgency" v-bind:reports="reportList" v-bind:taskId="taskId" v-bind:projectId="projectId"/>-->
 <!--      <report-list v-bind:reports="reportList" v-bind:taskId="taskId" v-bind:projectId="projectId"/>-->
     </div>
   </div>
@@ -449,7 +450,7 @@
       getTaskDetailSuccess(res) {
         console.log(res);
         this.hideLoading()
-        //console.log(res.crowdTaskVO)
+        console.log(res.crowdTaskVO)
         this.taskId = res.crowdTaskVO.id
         this.projectId = res.crowdTaskVO.projectId
         this.task.title = res.crowdTaskVO.title
@@ -757,4 +758,7 @@
     overflow: auto;
   }
 
+  .el-collapse-item__content{
+    padding-bottom: 0 !important;
+  }
 </style>

+ 1 - 1
src/components/task/TaskCreate.vue

@@ -26,7 +26,7 @@
             </span>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="领取人数" prop="contactPhone">
+        <el-form-item label="领取人数" prop="contactPhone" v-if="task.resource !== '0'">
           <el-input-number v-model="task.participantCount" :min="1" :max="10" label="领取人数"></el-input-number>
         </el-form-item>
         <el-form-item label="任务可见性" prop="resource">