优化任务

src/views/projectManage/projectList/components/scheduleList.vue

@@ -67,7 +67,8 @@
 
     </el-table>
     <div class="bottom-detail">
-      <el-row>排期总汇：{{ scheduleDetail.startTime | handlerDate }} ~ {{ scheduleDetail.endTime | handlerDate }}</el-row>
+      <el-row>交付日期：{{ scheduleDetail.options.endTime }}</el-row>
+      <el-row>排期：{{ scheduleDetail.startTime | handlerDate }} ~ {{ scheduleDetail.endTime | handlerDate }}</el-row>
       <el-row v-if="scheduleDetail.preOnlineVersion && scheduleDetail.preOnlineVersion.length>0">
         <el-col :span="2">预计上线版本：</el-col>
         <el-col :span="6">
@@ -223,8 +224,8 @@ export default {
   width: calc(100% - 40px);
   margin: 0 20px;
   padding: 20px 0;
-  :first-child {
-    margin-bottom: 10px;
+  :nth-child(2) {
+    margin: 10px 0;
   }
 }
 .sortable-tip {

src/views/projectManage/projectList/components/taskList.vue

@@ -61,9 +61,6 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="所属模块" width="150" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">{{ scope.row.moduleInfoName }}</template>
-      </el-table-column>
       <el-table-column label="状态" width="150" align="left">
         <template slot-scope="scope">
           <el-select
@@ -84,18 +81,24 @@
           </el-select>
         </template>
       </el-table-column>
-      <el-table-column label="所属需求" width="200" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">{{ scope.row.requireName }}</template>
-      </el-table-column>
-      <el-table-column label="跟版客户端" width="120" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">{{ scope.row.involveAppString || '无' }}</template>
-      </el-table-column>
       <el-table-column label="开发负责人" width="100" align="center" show-overflow-tooltip>
         <template slot-scope="scope">{{ scope.row.rdObject ? scope.row.rdObject.name : '' }}</template>
       </el-table-column>
       <el-table-column label="测试负责人" width="100" align="center" show-overflow-tooltip>
         <template slot-scope="scope">{{ scope.row.qaObject ? scope.row.qaObject.name : '' }}</template>
       </el-table-column>
+      <el-table-column label="所属模块" width="150" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">{{ scope.row.moduleInfoName }}</template>
+      </el-table-column>
+      <el-table-column label="跟版客户端" width="120" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">{{ scope.row.involveAppString || '无' }}</template>
+      </el-table-column>
+      <el-table-column label="交付日期" width="250" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">{{ scope.row.options ? scope.row.options.endTime : '' }}</template>
+      </el-table-column>
+      <el-table-column label="缺陷数量" width="250" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">{{ scope.row.bugCount }}</template>
+      </el-table-column>
       <el-table-column label="任务进度" width="200" align="center">
         <template slot-scope="scope">
           <el-progress :percentage="Number(scope.row.rate && scope.row.rate.substring(0,4))" color="#409eff" />

src/views/projectManage/requirement/components/scheduleList.vue

@@ -41,7 +41,8 @@
 
     </el-table>
     <div class="bottom-detail">
-      <el-row>排期总汇：{{ scheduleDetail.startTime | handlerDate }} ~ {{ scheduleDetail.endTime | handlerDate }}</el-row>
+      <el-row>交付日期：{{ scheduleDetail.options.endTime }}</el-row>
+      <el-row>排期：{{ scheduleDetail.startTime | handlerDate }} ~ {{ scheduleDetail.endTime | handlerDate }}</el-row>
       <el-row v-if="scheduleDetail.preOnlineVersion && scheduleDetail.preOnlineVersion.length>0">
         <el-col :span="2" style="width: 100px">预计上线版本：</el-col>
         <el-col :span="6">
@@ -238,8 +239,8 @@ export default {
   // width: calc(100% - 40px);
   margin: 0 20px;
   padding: 20px 0;
-  :first-child {
-    margin-bottom: 10px;
+ :nth-child(2) {
+    margin: 10px 0;
   }
 }
 .sortable-tip {

src/views/projectManage/requirement/components/taskList.vue

@@ -62,9 +62,6 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="所属模块" width="150" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">{{ scope.row.moduleInfoName }}</template>
-      </el-table-column>
       <el-table-column label="状态" width="150" align="left">
         <template slot-scope="scope">
           <el-select
@@ -85,15 +82,24 @@
           </el-select>
         </template>
       </el-table-column>
-      <el-table-column label="跟版客户端" width="120" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">{{ scope.row.involveAppString || '无' }}</template>
-      </el-table-column>
       <el-table-column label="开发负责人" width="100" align="center" show-overflow-tooltip>
         <template slot-scope="scope">{{ scope.row.rdObject ? scope.row.rdObject.name : '' }}</template>
       </el-table-column>
       <el-table-column label="测试负责人" width="100" align="center" show-overflow-tooltip>
         <template slot-scope="scope">{{ scope.row.qaObject ? scope.row.qaObject.name : '' }}</template>
       </el-table-column>
+      <el-table-column label="所属模块" width="150" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">{{ scope.row.moduleInfoName }}</template>
+      </el-table-column>
+      <el-table-column label="跟版客户端" width="120" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">{{ scope.row.involveAppString || '无' }}</template>
+      </el-table-column>
+      <el-table-column label="交付日期" width="250" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">{{ scope.row.options ? scope.row.options.endTime : '' }}</template>
+      </el-table-column>
+      <el-table-column label="缺陷数量" width="250" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">{{ scope.row.bugCount }}</template>
+      </el-table-column>
       <el-table-column label="任务进度" width="200" align="center">
         <template slot-scope="scope">
           <el-progress :percentage="Number(scope.row.rate && scope.row.rate.substring(0,4))" color="#409eff" />

src/views/projectManage/taskList/components/scheduleList.vue

@@ -72,7 +72,8 @@
 
     </el-table>
     <div class="bottom-detail">
-      <el-row>排期总汇：{{ scheduleDetail.startTime | handlerDate }} ~ {{ scheduleDetail.endTime | handlerDate }}</el-row>
+      <el-row>交付日期：{{ scheduleDetail.options ? scheduleDetail.options.endTime : '' }}</el-row>
+      <el-row>排期：{{ scheduleDetail.startTime | handlerDate }} ~ {{ scheduleDetail.endTime | handlerDate }}</el-row>
       <el-row v-if="scheduleDetail.preOnlineVersion && scheduleDetail.preOnlineVersion.length>0">
         <el-col :span="2">预计上线版本：</el-col>
         <el-col :span="6">
@@ -253,8 +254,8 @@ export default {
   width: calc(100% - 40px);
   margin: 0 20px;
   padding: 20px 0;
-  :first-child {
-    margin-bottom: 10px;
+  :nth-child(2) {
+    margin: 10px 0;
   }
 }
 .sortable-tip {

src/views/projectManage/taskList/taskIndex.vue

@@ -151,17 +151,11 @@
             <span class="stylus-hover" @click="link_task(scope.row.id)">{{ scope.row.name }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="所属项目" min-width="250" align="center" show-overflow-tooltip>
-          <template slot-scope="scope">{{ scope.row.projectName }}</template>
-        </el-table-column>
-        <el-table-column label="所属需求" min-width="250" align="center" show-overflow-tooltip>
-          <template slot-scope="scope">{{ scope.row.requireName }}</template>
-        </el-table-column>
         <el-table-column label="状态" min-width="150" align="center" show-overflow-tooltip>
           <template slot-scope="scope">{{ scope.row.statusString }}</template>
         </el-table-column>
-        <el-table-column label="是否免测" min-width="80" align="center">
-          <template slot-scope="scope">{{ scope.row.noTestString }}</template>
+        <el-table-column label="健康状态" width="150" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">{{ scope.row.stageString }}</template>
         </el-table-column>
         <el-table-column label="开发负责人" min-width="100" align="center">
           <template
@@ -173,6 +167,24 @@
             slot-scope="scope"
           >{{ scope.row.qaObject !== null?scope.row.qaObject.name: '' }}</template>
         </el-table-column>
+        <el-table-column label="所属模块" width="150" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">{{ scope.row.moduleInfoName }}</template>
+        </el-table-column>
+        <el-table-column label="是否免测" min-width="80" align="center">
+          <template slot-scope="scope">{{ scope.row.noTestString }}</template>
+        </el-table-column>
+        <el-table-column label="缺陷数量" width="250" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">{{ scope.row.bugCount }}</template>
+        </el-table-column>
+        <el-table-column label="所属需求" min-width="250" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">{{ scope.row.requireName }}</template>
+        </el-table-column>
+        <el-table-column label="所属项目" min-width="250" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">{{ scope.row.projectName }}</template>
+        </el-table-column>
+        <el-table-column label="创建人" min-width="120" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">{{ scope.row.createObject.name }}</template>
+        </el-table-column>
         <el-table-column label="创建日期" min-width="120" align="center" show-overflow-tooltip>
           <template slot-scope="scope">{{ scope.row.createTime }}</template>
         </el-table-column>

src/views/projectManage/version/components/scheduleList.vue

@@ -70,7 +70,8 @@
 
     </el-table>
     <div class="bottom-detail">
-      <el-row>排期总汇：{{ scheduleDetail.startTime | handlerDate }} ~ {{ scheduleDetail.endTime | handlerDate }}</el-row>
+      <el-row>交付日期：{{ scheduleDetail.options.endTime }}</el-row>
+      <el-row>排期：{{ scheduleDetail.startTime | handlerDate }} ~ {{ scheduleDetail.endTime | handlerDate }}</el-row>
       <el-row v-if="scheduleDetail.preOnlineVersion && scheduleDetail.preOnlineVersion.length>0">
         <el-col :span="2">预计上线版本：</el-col>
         <el-col :span="6">
@@ -226,8 +227,8 @@ export default {
   width: calc(100% - 40px);
   margin: 0 20px;
   padding: 20px 0;
-  :first-child {
-    margin-bottom: 10px;
+  :nth-child(2) {
+    margin: 10px 0;
   }
 }
 .sortable-tip {

src/views/projectManage/version/components/taskList.vue

@@ -51,9 +51,6 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="所属模块" min-width="200" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">{{ scope.row.moduleInfoName }}</template>
-      </el-table-column>
       <el-table-column label="状态" width="150" align="left">
         <template slot-scope="scope">
           <el-select
@@ -74,20 +71,23 @@
           </el-select>
         </template>
       </el-table-column>
-      <el-table-column label="健康状态" width="150" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">{{ scope.row.stageString }}</template>
+      <el-table-column label="开发负责人" width="100" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">{{ scope.row.rdObject ? scope.row.rdObject.name : '' }}</template>
+      </el-table-column>
+      <el-table-column label="测试负责人" width="100" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">{{ scope.row.qaObject ? scope.row.qaObject.name : '' }}</template>
       </el-table-column>
-      <el-table-column label="所属需求" min-width="200" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">{{ scope.row.requireName }}</template>
+      <el-table-column label="所属模块" min-width="200" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">{{ scope.row.moduleInfoName }}</template>
       </el-table-column>
       <el-table-column label="跟版客户端" width="120" align="center" show-overflow-tooltip>
         <template slot-scope="scope">{{ scope.row.involveAppString || '无' }}</template>
       </el-table-column>
-      <el-table-column label="开发负责人" width="100" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">{{ scope.row.rdObject ? scope.row.rdObject.name : '' }}</template>
+      <el-table-column label="交付日期" width="250" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">{{ scope.row.options ? scope.row.options.endTime : '' }}</template>
       </el-table-column>
-      <el-table-column label="测试负责人" width="100" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">{{ scope.row.qaObject ? scope.row.qaObject.name : '' }}</template>
+      <el-table-column label="缺陷数量" width="250" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">{{ scope.row.bugCount }}</template>
       </el-table-column>
       <el-table-column label="任务进度" width="200" align="center">
         <template slot-scope="scope">

src/views/workbench/team/components/taskList.vue

@@ -57,7 +57,6 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="业务线" width="150" align="center" show-overflow-tooltip prop="bizIdString" />
       <el-table-column label="状态" width="150" align="left">
         <template slot-scope="scope">
           <el-select
@@ -78,15 +77,24 @@
           </el-select>
         </template>
       </el-table-column>
-      <el-table-column label="所属需求" width="250" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">{{ scope.row.requireName }}</template>
-      </el-table-column>
       <el-table-column label="开发负责人" width="100" align="center" show-overflow-tooltip>
         <template slot-scope="scope">{{ scope.row.rdObject ? scope.row.rdObject.name : '' }}</template>
       </el-table-column>
       <el-table-column label="测试负责人" width="100" align="center" show-overflow-tooltip>
         <template slot-scope="scope">{{ scope.row.qaObject ? scope.row.qaObject.name : '' }}</template>
       </el-table-column>
+      <el-table-column label="所属模块" width="250" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">{{ scope.row.moduleInfoName }}</template>
+      </el-table-column>
+      <el-table-column label="跟版客户端" width="250" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">{{ scope.row.involveAppString || '无' }}</template>
+      </el-table-column>
+      <el-table-column label="交付日期" width="250" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">{{ scope.row.options ? scope.row.options.endTime : '' }}</template>
+      </el-table-column>
+      <el-table-column label="缺陷数量" width="250" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">{{ scope.row.bugCount }}</template>
+      </el-table-column>
       <el-table-column label="任务进度" width="200" align="center">
         <template slot-scope="scope">
           <el-progress :percentage="Number(scope.row.rate && scope.row.rate.substring(0,4))" color="#409eff" />