样式改动

src/views/projectManage/taskList/childrenTask/childDetail.vue

@@ -345,7 +345,7 @@ export default {
   }
   .demo-form-all {
 		.el-form-item {
-			width: 25%;
+			width: 20%;
       margin-right: 0;
       /deep/.el-form-item__content {
         width: calc(100% - 100px)
@@ -359,7 +359,7 @@ export default {
       }
 		}
 	}
-	.input-progress {
+	.input-process {
     width: 90px;
     margin-left: 10px;
   }

src/views/projectManage/taskList/childrenTask/childDrawer.vue

@@ -12,7 +12,7 @@
           <i class="el-icon-arrow-left" @click="backParent(formData.parentId)" />
         </div>
         <div class="bug-id-status">
-          <span>BUG-{{ formData.id }}</span>
+          <span>SUBTASK-{{ formData.id }}</span>
           <el-dropdown placement="bottom" @command="updateStatus">
             <el-button size="small" plainclass="el-dropdown-link drop_down">
               {{ getStatus.msg }}
@@ -31,6 +31,7 @@
             <span v-if="formData.level <= 2" @click="createChildren = true"><i class="el-icon-s-operation" />添加子任务</span>
             <span @click="toDetail()"><i class="el-icon-tickets" />查看详情</span>
             <span @click="deleteDialog = true"><i class="el-icon-delete" />删除</span>
+            <span><i class="el-icon-close" @click="close()" /></span>
           </div>
         </div>
         <div class="bug-name-control">
@@ -80,7 +81,7 @@
               </div>
             </el-form-item>
             <el-form-item>
-              <el-input v-model.number="formData.process" class="input-progress" @change="changeProgres">
+              <el-input v-model.number="formData.process" class="input-process" @change="changeProgres">
                 <template slot="append">%</template>
               </el-input>
             </el-form-item>
@@ -118,7 +119,7 @@
           <div class="title-left-icon" />
           <div class="title-left-name">子任务<i class="el-icon-circle-plus child-add" @click="addChild()" /></div>
         </div>
-        <div>
+        <div class="children-list">
           <add-children-list
             ref="add-children-list"
             :list.sync="formData.childSubTaskInfos"
@@ -346,6 +347,9 @@ export default {
 				cursor: pointer;
 				margin-right: 30px;
 			}
+      :last-child{
+        margin-right: 0;
+      }
 			i {
 				margin-right: 5px;
 			}
@@ -421,7 +425,7 @@ export default {
   }
   .demo-form-all {
 		.el-form-item {
-			width: 35%;
+			width: 30%;
       margin-right: 0;
       /deep/.el-form-item__content {
         width: calc(100% - 100px)
@@ -435,7 +439,7 @@ export default {
       }
 		}
 	}
-	.input-progress {
+	.input-process {
     width: 90px;
     margin-left: 10px;
   }
@@ -443,6 +447,9 @@ export default {
     color:#409EFF;
     margin-left: 10px;
   }
+  .children-list {
+    min-height: 15vh;
+  }
 }
 .danger-img {
   width: 100%;

src/views/projectManage/taskList/childrenTask/createChildren.vue

@@ -9,12 +9,12 @@
     @cancel="cancel()"
   >
     <article id="create-children" ref="create-children">
-      <el-form ref="form" :model="formData" :rules="form_rules" label-width="100px" :label-position="'left'">
+      <el-form ref="form" :model="formData" :rules="form_rules" label-width="100px" label-position="right">
         <div class="form-main-flex">
-          <el-form-item label="任务名称" prop="name" class="form-all-line">
+          <el-form-item label="任务名称：" prop="name" class="form-all-line">
             <el-input v-model="formData.name" placeholder="请输入任务名称" size="medium" clearable="" />
           </el-form-item>
-          <el-form-item label="父任务" prop="parentId" class="form-item">
+          <el-form-item label="父任务：" prop="parentId" class="form-item">
             <el-select v-model="formData.parentId" disabled placeholder="请选择" size="medium" style="width: 100%">
               <el-option
                 v-for="item in parentList"
@@ -24,7 +24,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="业务线" prop="bizId" class="form-item">
+          <el-form-item label="业务线：" prop="bizId" class="form-item">
             <el-select v-model="formData.bizId" disabled placeholder="请选择" size="medium" style="width: 100%">
               <el-option
                 v-for="item in bizList"
@@ -34,19 +34,19 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="开始时间" prop="startTime" class="form-item">
+          <el-form-item label="开始时间：" prop="startTime" class="form-item">
             <el-date-picker v-model="formData.startTime" type="date" placeholder="选择日期" value-format="yyyy.MM.dd" size="medium" style="width: 100%" />
           </el-form-item>
-          <el-form-item label="结束时间" prop="endTime" class="form-item">
+          <el-form-item label="结束时间：" prop="endTime" class="form-item">
             <el-date-picker v-model="formData.endTime" type="date" placeholder="选择日期" value-format="yyyy.MM.dd" size="medium" style="width: 100%" />
           </el-form-item>
-          <el-form-item label="负责人" prop="owner" class="form-item">
+          <el-form-item label="负责人：" prop="owner" class="form-item">
             <search-people :value.sync="formData.owner" style="width: 100%" size="medium" />
           </el-form-item>
-          <el-form-item label="其他参与人" prop="participants" class="form-item">
+          <el-form-item label="其他参与人：" prop="participants" class="form-item">
             <search-people :value.sync="formData.participants" style="width: 100%" size="medium" :multiple="true" />
           </el-form-item>
-          <el-form-item label="任务状态" prop="status" class="form-item">
+          <el-form-item label="任务状态：" prop="status" class="form-item">
             <el-select v-model="formData.status" placeholder="请选择" size="medium" style="width: 100%">
               <el-option
                 v-for="item in allStatus"
@@ -56,7 +56,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="进度" prop="process" class="form-item">
+          <el-form-item label="进度：" prop="process" class="form-item">
             <el-input v-model.number="formData.process" size="medium" style="width: 40%" @input="inputProcess">
               <template slot="append">%</template>
             </el-input>
@@ -67,7 +67,7 @@
         </div>
       </el-form>
       <add-children-list
-        v-if="formData.level <= 1"
+        v-if="formData.level <= 1 || newAdd"
         id="create"
         :list.sync="childrenList"
         :data="formData"
@@ -107,6 +107,11 @@ export default {
         return null
       },
       required: true
+    },
+    newAdd: {
+      type: Boolean,
+      default: false,
+      required: false
     }
   },
   data() {

src/views/projectManage/taskList/taskViewDetail.vue

@@ -233,7 +233,7 @@
       <!-- 统计 -->
       <!-- 新建（bug） -->
       <createdBug v-if="bug_open" ref="createdBug" @reloadList="reloadList" />
-      <create-children v-if="createChildren" :visible.sync="createChildren" :data="form_query" @change="reloadList" />
+      <create-children v-if="createChildren" :visible.sync="createChildren" :data="form_query" :new-add="true" @change="reloadList" />
       <Test-report v-if="dialogTest" ref="TestReport" />
       <Daily-report v-if="dialogDaily" ref="DailyReport" />
       <Client-report v-if="dialogClient" ref="ClientReport" />