添加子任务修改

src/styles/detail-pages.scss

@@ -46,7 +46,7 @@
     color: rgb(51, 59, 74);
     display: flex;
     flex-direction: column;
-    max-width: 340px;
+    max-width: 250px;
     margin-right: 20px;
     .title-id{
       color:rgba(51,59,74,0.5);

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

@@ -20,7 +20,7 @@
         </el-select>
         <div class="input-name">
           <span v-if="!item.edit" @click="toDetail(item.id)">{{ item.name }}</span>
-          <el-input v-if="item.edit" v-model="item.name" placeholder="请输入任务名称（必填）" size="medium" clearable />
+          <el-input v-if="item.edit" v-model="item.name" placeholder="请输入任务名称（必填）" size="medium" />
           <div v-if="item.edit" class="footer">
             <el-button size="mini" @click="cancelChild(index,item)">取消</el-button>
             <el-button type="primary" size="mini" @click="confirmChild(index,item)">确定</el-button>
@@ -49,7 +49,7 @@
           >
             <div class="edit-cancel">
               <p @click="editChild(index,item)"><i class="el-icon-edit-outline" />编辑</p>
-              <p @click="cancelChild(index,item)"><i class="el-icon-delete" />删除</p>
+              <p @click="deleteChild(index,item)"><i class="el-icon-delete" />删除</p>
             </div>
             <div slot="reference"><i class="el-icon-more" /></div>
           </el-popover>
@@ -178,6 +178,16 @@ export default {
       })
     },
     cancelChild(index, item) { // 取消添加子任务
+      if (item.newNode) {
+        this.childrenList.splice(index, 1)
+        this.$emit('list:update', this.childrenList)
+      } else {
+        if (this.add) return
+        this.nowSubTask = item
+        this.$set(this.childrenList[index], 'edit', false)
+      }
+    },
+    deleteChild(index, item) { // 删除子任务
       if (item.newNode) {
         this.childrenList.splice(index, 1)
         this.$emit('list:update', this.childrenList)
@@ -251,9 +261,13 @@ export default {
       }
       this.childrenList[index].edit = false
       this.update()
-      if (this.add) return
+      if (this.add) return// 是新增的弹框，就返回
       this.nowSubTask = item
-      this.createChildren(item)
+      if (item.newNode) { // 是否是新插入的节点
+        this.createChildren(item)
+      } else {
+        this.changeArea('name')
+      }
     },
     async createChildren(item) { // 新加
       const param = {

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

@@ -39,7 +39,7 @@
               <el-form-item label="所属父任务："><span class="module">{{ formData.parentName }}</span></el-form-item>
               <el-form-item label="业务线："><span class="module">{{ formData.bizIdString }}</span></el-form-item>
               <el-form-item label="负责人：">
-                <search-people :value.sync="formData.owner" @change="changeArea('owner')" />
+                <search-people :value.sync="formData.owner" :clearable="false" @change="changeArea('owner')" />
               </el-form-item>
             </el-form>
             <el-form :inline="true" :model="formData" class="demo-form-inline" label-position="right" label-width="100px">
@@ -344,6 +344,12 @@ export default {
 			width: 33%;
       margin-right: 0;
     }
+    /deep/.el-form-item__content {
+      width: calc(100% - 100px);
+      text-overflow: ellipsis;
+      overflow: hidden;
+      white-space: nowrap;
+    }
     .module {
       margin-left: 10px;
     }

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

@@ -106,8 +106,8 @@
         </div>
         <div class="detail-info">
           <el-form :model="formData" class="demo-form-inline" label-position="right" label-width="100px">
-            <el-form-item label="提报人：">
-              <search-people :value.sync="formData.owner" @change="changeArea('owner')" />
+            <el-form-item label="负责人：">
+              <search-people :value.sync="formData.owner" :clearable="false" @change="changeArea('owner')" />
             </el-form-item>
             <el-form-item label="其他参与人：">
               <search-people :value.sync="formData.participants" :multiple="true" @change="changeArea('participants')" />
@@ -353,7 +353,7 @@ export default {
   margin-bottom: 5px !important;
 }
 .top-control {
-	padding: 30px;
+	padding: 10px 30px 30px 30px;
   position: relative;
   .back {
     position: absolute;
@@ -468,6 +468,12 @@ export default {
       /deep/.el-select{
         width: 100%;
       }
+      /deep/.el-form-item__content {
+        width: calc(100% - 100px);
+        text-overflow: ellipsis;
+        overflow: hidden;
+        white-space: nowrap;
+      }
     }
     .module {
       margin-left: 10px;
@@ -479,7 +485,7 @@ export default {
       margin-right: 0;
       margin-bottom: 15px;
       /deep/.el-form-item__content {
-        width: calc(100% - 100px)
+        width: calc(100% - 100px);
       }
       /deep/.el-input__inner{
         border: 1px solid rgba(220,223,230,1);

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

@@ -18,7 +18,7 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="状态" width="150" align="center">
+      <el-table-column label="状态" width="120" align="center">
         <template slot-scope="scope">
           <el-select
             v-model="scope.row.status"
@@ -31,12 +31,12 @@
           </el-select>
         </template>
       </el-table-column>
-      <el-table-column label="负责人" width="200" align="center" show-overflow-tooltip>
+      <el-table-column label="负责人" width="120" align="center" show-overflow-tooltip>
         <template slot-scope="scope">{{ scope.row.ownerObject ? scope.row.ownerObject.name : '' }}</template>
       </el-table-column>
-      <el-table-column label="开始时间" width="200" align="center" prop="startTime" show-overflow-tooltip />
-      <el-table-column label="结束时间" width="200" align="center" prop="endTime" show-overflow-tooltip />
-      <el-table-column label="任务进度" width="250" align="center">
+      <el-table-column label="开始时间" width="120" align="center" prop="startTime" show-overflow-tooltip />
+      <el-table-column label="结束时间" width="120" align="center" prop="endTime" show-overflow-tooltip />
+      <el-table-column label="任务进度" width="200" align="center">
         <template slot-scope="scope">
           <el-progress :percentage="scope.row.process" color="#409eff" />
         </template>

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

@@ -41,7 +41,7 @@
             <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">
-            <search-people :value.sync="formData.owner" style="width: 100%" size="medium" />
+            <search-people :value.sync="formData.owner" style="width: 100%" size="medium" :clearable="false" />
           </el-form-item>
           <el-form-item label="其他参与人：" prop="participants" class="form-item">
             <search-people :value.sync="formData.participants" style="width: 100%" size="medium" :multiple="true" />