Browse Source

排期删除弹框样式

wangziqian 5 years ago
parent
commit
7716bb57e5

+ 3 - 5
src/views/projectManage/projectList/components/modifySchedule.vue

@@ -5,7 +5,7 @@
     :is-default-close="false"
     :submit-button="isDeleteStatus?'我知道了,删除':'确定'"
     :buttom-type="isDeleteStatus?'danger':'primary'"
-    width="55%"
+    :width="isDeleteStatus?'45%':'55%'"
     @confirm="confirmForm()"
     @cancel="cancel()"
   >
@@ -79,8 +79,6 @@
           <div v-if="item.taskIdSting" class="item-id">{{ item.taskIdSting }}</div>
           <div v-if="item.taskId" class="item-id">{{ item.taskId }}</div>
           <div class="item-name"><span>{{ item.name }}</span></div>
-          <div class="item-qa">测试负责人:<span>{{ item.qaObject !== null?item.qaObject.name: '' }}</span></div>
-          <div class="item-rd">开发负责人:<span>{{ item.rdObject !== null?item.rdObject.name: '' }}</span></div>
         </div>
       </div>
     </article>
@@ -392,14 +390,14 @@ article {
 }
 .delete-title {
   width: 100%;
-  padding: 0 60px 100px 60px;
+  padding: 0 60px 60px 60px;
   color: #333B4A;
   font-size: 18px;
   text-align: center;
 }
 .people-list-show {
   width: 100%;
-  padding: 0 60px 50px 60px;
+  padding: 0 60px 40px 60px;
   p {
     color: #666666;
     font-size: 14px;

+ 3 - 5
src/views/projectManage/requirement/components/modifySchedule.vue

@@ -5,7 +5,7 @@
     :is-default-close="false"
     :submit-button="isDeleteStatus?'我知道了,删除':'确定'"
     :buttom-type="isDeleteStatus?'danger':'primary'"
-    width="55%"
+    :width="isDeleteStatus?'45%':'55%'"
     @confirm="confirmForm()"
     @cancel="cancel()"
   >
@@ -79,8 +79,6 @@
           <div v-if="item.taskIdSting" class="item-id">{{ item.taskIdSting }}</div>
           <div v-if="item.taskId" class="item-id">{{ item.taskId }}</div>
           <div class="item-name"><span>{{ item.name }}</span></div>
-          <div class="item-qa">测试负责人:<span>{{ item.qaObject !== null?item.qaObject.name: '' }}</span></div>
-          <div class="item-rd">开发负责人:<span>{{ item.rdObject !== null?item.rdObject.name: '' }}</span></div>
         </div>
       </div>
     </article>
@@ -401,14 +399,14 @@ article {
 }
 .delete-title {
   width: 100%;
-  padding: 0 60px 100px 60px;
+  padding: 0 60px 60px 60px;
   color: #333B4A;
   font-size: 18px;
   text-align: center;
 }
 .people-list-show {
   width: 100%;
-  padding: 0 60px 50px 60px;
+  padding: 0 60px 40px 60px;
   p {
     color: #666666;
     font-size: 14px;

+ 20 - 2
src/views/projectManage/taskList/childrenTask/createChildren.vue

@@ -25,7 +25,20 @@
             </el-select>
           </el-form-item>
           <el-form-item label="业务线" prop="bizId" class="form-item">
-            <el-input v-model="formData.name" placeholder="请输入任务名称" size="medium" />
+            <el-select v-model="formData.bizId" disabled placeholder="请选择" size="medium" style="width: 100%">
+              <el-option
+                v-for="item in bizList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </el-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-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" />
@@ -64,6 +77,8 @@ export default {
     return {
       form_rules: {
         name: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+        parentId: [{ required: true, message: '父任务不能为空', trigger: 'blur' }],
+        bizId: [{ required: true, message: '业务线不能为空', trigger: 'blur' }],
         owner: [{ required: true, message: '负责人不能为空', trigger: 'blur' }]
       },
       show: this.visible,
@@ -80,7 +95,8 @@ export default {
         desc: null,
         children: []
       },
-      parentList: []
+      parentList: [], // 父任务列表
+      bizList: [] // 业务线列表
     }
   },
   watch: {
@@ -103,9 +119,11 @@ export default {
   methods: {
     handlerData(data) { // 处理传入数据
       this.parentList = [{ id: data.id, name: data.name }]
+      this.bizList = [{ id: data.bizId, name: data.bizIdString }]
       this.$nextTick(() => {
         this.formData.owner = localStorage.getItem('username')
         this.formData.parentId = data.id
+        this.formData.bizId = data.bizId
       })
     },
     confirmForm() { // 确认提交表单

+ 3 - 5
src/views/projectManage/taskList/components/modifySchedule.vue

@@ -5,7 +5,7 @@
     :is-default-close="false"
     :submit-button="isDeleteStatus?'我知道了,删除':'确定'"
     :buttom-type="isDeleteStatus?'danger':'primary'"
-    width="55%"
+    :width="isDeleteStatus?'45%':'55%'"
     @confirm="confirmForm()"
     @cancel="cancel()"
   >
@@ -79,8 +79,6 @@
           <div v-if="item.taskIdSting" class="item-id">{{ item.taskIdSting }}</div>
           <div v-if="item.taskId" class="item-id">{{ item.taskId }}</div>
           <div class="item-name"><span>{{ item.name }}</span></div>
-          <div class="item-qa">测试负责人:<span>{{ item.qaObject !== null?item.qaObject.name: '' }}</span></div>
-          <div class="item-rd">开发负责人:<span>{{ item.rdObject !== null?item.rdObject.name: '' }}</span></div>
         </div>
       </div>
     </article>
@@ -378,14 +376,14 @@ article {
 }
 .delete-title {
   width: 100%;
-  padding: 0 60px 100px 60px;
+  padding: 0 60px 60px 60px;
   color: #333B4A;
   font-size: 18px;
   text-align: center;
 }
 .people-list-show {
   width: 100%;
-  padding: 0 60px 50px 60px;
+  padding: 0 60px 40px 60px;
   p {
     color: #666666;
     font-size: 14px;

+ 1 - 1
src/views/projectManage/taskList/taskViewDetail.vue

@@ -188,12 +188,12 @@
       <!-- 统计 -->
       <!-- 新建(bug) -->
       <createdBug v-if="bug_open" ref="createdBug" @reloadList="reloadList" />
+      <create-children v-if="createChildren" :visible.sync="createChildren" :data="form_query" />
       <Test-report v-if="dialogTest" ref="TestReport" />
       <Daily-report v-if="dialogDaily" ref="DailyReport" />
       <Client-report v-if="dialogClient" ref="ClientReport" />
       <!-- 新建 -->
       <!-- 编辑 -->
-      <create-children v-if="createChildren" :visible.sync="createChildren" :data="form_query" />
       <open-dialog v-if="updateVisible" ref="task_createdUpdata" />
       <!-- 编辑 -->
       <!-- 删除 -->