实验环境

src/components/task/Task.vue

@@ -93,7 +93,7 @@
             <el-form-item label="领取人数" prop="quotePrice" v-if="!isModifyMode">
               {{ task.acceptedCount }}/{{ task.participantCount }}
             </el-form-item>
-            <el-form-item label="需求文档" prop="doc">
+            <el-form-item label="安装包" prop="doc">
               <el-upload
                 style="width: 400px"
                 v-if="isModifyMode"
@@ -116,11 +116,11 @@
               </el-upload>
               <span>
               <span v-if="task.requireDocUrl == null || task.requireDocUrl == ''">
-                <i class="el-icon-document"></i>暂无文件
+                <i class="el-icon-document"></i>暂无
               </span>
               <span v-if="task.requireDocUrl != null && task.requireDocUrl != ''">
                 <a :href="task.requireDocUrl"><el-link :underline="false" type="primary"><i
-                  class="el-icon-document"></i>下载文档</el-link></a>
+                  class="el-icon-document"></i>下载</el-link></a>
               </span>
             </span>
             </el-form-item>
@@ -195,6 +195,17 @@
                 </el-button>
               </el-popover>
 
+<!--              <el-popover-->
+<!--                placement="top-start"-->
+<!--                title="确认接收？"-->
+<!--                width="200"-->
+<!--                trigger="hover"-->
+<!--                content="接收任务后请认真完成！">-->
+<!--                <el-button v-if="taskOperationControl.receive" type="primary" size="mini" slot="reference"-->
+<!--                           @click="showTaskCodeModal = !showTaskCodeModal">接收任务-->
+<!--                </el-button>-->
+<!--              </el-popover>-->
+
               <el-popover
                 placement="top-start"
                 title="确认接收？"
@@ -202,7 +213,7 @@
                 trigger="hover"
                 content="接收任务后请认真完成！">
                 <el-button v-if="taskOperationControl.receive" type="primary" size="mini" slot="reference"
-                           @click="showTaskCodeModal = !showTaskCodeModal">接收任务
+                           @click="handleTaskCodeValid">接收任务
                 </el-button>
               </el-popover>
 
@@ -543,18 +554,32 @@ export default {
     })
   },
   methods: {
+    // handleTaskCodeValid(){
+    //   let str1 = this.projectId;
+    //   let str2 = this.task.code;
+    //   let str = str1.substring(str1.length-2) + str2.substring(str2.length-2);
+    //   if(str === this.taskValidCode){
+    //     //接收码正确，可以正确接收任务
+    //     this.receiveTask();
+    //     this.showTaskCodeModal = false;
+    //   }else{
+    //     // 提示接收码错误
+    //     notify('error', '接收码错误')
+    //   }
+    // },
     handleTaskCodeValid(){
-      let str1 = this.projectId;
-      let str2 = this.task.code;
-      let str = str1.substring(str1.length-2) + str2.substring(str2.length-2);
-      if(str === this.taskValidCode){
-        //接收码正确，可以正确接收任务
-        this.receiveTask();
-        this.showTaskCodeModal = false;
-      }else{
-        // 提示接收码错误
-        notify('error', '接收码错误')
-      }
+      this.receiveTask();
+      // let str1 = this.projectId;
+      // let str2 = this.task.code;
+      // let str = str1.substring(str1.length-2) + str2.substring(str2.length-2);
+      // if(str === this.taskValidCode){
+      //   //接收码正确，可以正确接收任务
+      //   this.receiveTask();
+      //   this.showTaskCodeModal = false;
+      // }else{
+      //   // 提示接收码错误
+      //   notify('error', '接收码错误')
+      // }
     },
     handleForkTask(){
       //跳转到taskFork

src/components/task/TaskCreate.vue

@@ -73,7 +73,7 @@
         <el-form-item label="领取人数" prop="contactPhone" v-if="task.resource !== '0' && currType.type===1">
           <el-input-number v-model="task.participantCount" :min="2" :max="1000" label="领取人数"></el-input-number>
         </el-form-item>
-        <el-form-item label="需求文档" prop="doc">
+        <el-form-item label="安装包" prop="doc">
           <el-upload
             drag
             style="width: 400px"
@@ -96,10 +96,31 @@
           </el-upload>
           <span v-if="task.requireDocUrl != null && task.requireDocUrl != ''">
                 <a :href="task.requireDocUrl"><el-link :underline="false" type="primary"><i
-                  class="el-icon-document"></i>下载文档</el-link></a>
+                  class="el-icon-document"></i>下载</el-link></a>
               </span>
         </el-form-item>
 
+<!--        <el-form-item label="安装包" prop="file">-->
+<!--          <el-upload-->
+<!--            drag-->
+<!--            style="width: 400px"-->
+<!--            class="upload-demo"-->
+<!--            action=""-->
+<!--            :on-remove="handleRemove"-->
+<!--            :limit="1"-->
+<!--            :on-exceed="handleExceed"-->
+<!--            :before-upload="beforeApkUpload"-->
+<!--            :http-request="uploadApkFile"-->
+<!--            :file-list="task.file"-->
+<!--          >-->
+<!--            <i class="el-icon-upload"></i>-->
+<!--            <div class="el-upload__text">-->
+<!--              将文件拖到此处，或-->
+<!--              <em>点击上传</em>-->
+<!--            </div>-->
+<!--          </el-upload>-->
+<!--        </el-form-item>-->
+
         <el-form-item label="测试大纲" prop="endPoint.threePageUrl" v-if="currType.type==1"
                       class="three-page-upload">
           <el-upload

src/components/testcase/TestCaseList.vue

@@ -17,10 +17,10 @@
             <div :title="`${index = 0}`"></div>
             <div v-for="(testActionPreItem) in item.testActionsPre"
                  :key="testActionPreItem.id">
-              <div v-if="!testActionPreItem.same" :title="`${index++} ${sameIndex = 0}`">
+              <div v-if="!testActionPreItem.same||index==0" :title="`${index++} ${sameIndex = 0}`">
                 步骤{{ index }}：{{ testActionPreItem.description }}
               </div>
-              <div v-else :value="`${sameIndex++}`">步骤{{ index }}.{{ sameIndex }}：{{
+              <div v-else :value="`${sameIndex++}`">&nbsp;&nbsp;&nbsp;&nbsp;步骤{{ index }}.{{ sameIndex }}：{{
                   testActionPreItem.description
                 }}
               </div>
@@ -44,12 +44,23 @@
                  :key="testActionNextItem.id">
               <div>步骤{{ testActionNextIndex + 1 }}：{{ testActionNextItem.description }}</div>
             </div>
+
             <div class="content" v-if="item.testActionsNext[0].screenShot != null">
               <div>
                 <h3>步骤1-{{ item.testActionsNext.length }}</h3>
                 <img :src="item.testActionsNext[0].screenShot" style="width: 200px"/>
               </div>
             </div>
+<!--            <div :title="`${index = 0}`"></div>-->
+<!--            <div v-for="(testActionNextItem, testActionNextIndex) in item.testActionsNext" :key="testActionNextItem.id">-->
+<!--              <div class="content">-->
+<!--                <div>-->
+<!--                  <h3>步骤{{ testActionNextIndex + 1 }}</h3>-->
+<!--                  <img :src="testActionNextItem.screenShot" style="width: 200px"/>-->
+<!--                </div>-->
+<!--              </div>-->
+<!--            </div>-->
+
           </div>
           <div style="clear:both"></div>
         </div>
@@ -86,7 +97,7 @@
                 <div v-if="!testActionPreItem.same" :title="`${index++} ${sameIndex = 0}`">
                   步骤{{ index }}：{{ testActionPreItem.description }}
                 </div>
-                <div v-else :value="`${sameIndex++}`">步骤{{ index }}.{{ sameIndex }}：{{
+                <div v-else :value="`${sameIndex++}`">&nbsp;&nbsp;&nbsp;&nbsp;步骤{{ index }}.{{ sameIndex }}：{{
                     testActionPreItem.description
                   }}
                 </div>