日程修改

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

@@ -26,7 +26,7 @@
             <sel-date-picker :start-end.sync="form.dayList" :detail-day-list="detailDayList" @getDetailDay="getDetailDay" />
           </div>
         </el-form-item>
-        <el-form-item label="问题描述">
+        <el-form-item label="描述">
           <el-input v-model="form.desc" autocomplete="off" placeholder="请输入问题描述内容..." :disabled="disabled" />
         </el-form-item>
         <el-form-item label="关联任务" prop="taskList">
@@ -35,7 +35,7 @@
             filterable
             remote
             reserve-keyword
-            placeholder="请输入关键词"
+            placeholder="请输入任务名称或ID"
             :remote-method="remoteMethod"
             :loading="loading"
             style="width: 100%"

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

@@ -26,7 +26,7 @@
             <sel-date-picker :start-end.sync="form.dayList" :detail-day-list="detailDayList" @getDetailDay="getDetailDay" />
           </div>
         </el-form-item>
-        <el-form-item label="问题描述">
+        <el-form-item label="描述">
           <el-input v-model="form.desc" autocomplete="off" placeholder="请输入问题描述内容..." :disabled="disabled" />
         </el-form-item>
         <el-form-item label="关联任务" prop="taskList">
@@ -35,7 +35,7 @@
             filterable
             remote
             reserve-keyword
-            placeholder="请输入关键词"
+            placeholder="请输入任务名称或ID"
             :remote-method="remoteMethod"
             :loading="loading"
             style="width: 100%"

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

@@ -26,7 +26,7 @@
             <sel-date-picker :start-end.sync="form.dayList" :detail-day-list="detailDayList" @getDetailDay="getDetailDay" />
           </div>
         </el-form-item>
-        <el-form-item label="问题描述">
+        <el-form-item label="描述">
           <el-input v-model="form.desc" autocomplete="off" placeholder="请输入问题描述内容..." :disabled="disabled" />
         </el-form-item>
         <el-form-item label="关联任务" prop="taskList">
@@ -35,7 +35,7 @@
             filterable
             remote
             reserve-keyword
-            placeholder="请输入关键词"
+            placeholder="请输入任务名称或ID"
             :remote-method="remoteMethod"
             :loading="loading"
             style="width: 100%"

src/views/workbench/person/components/calenderDetail.vue

@@ -6,7 +6,9 @@
         <div class="label">排期：</div>
         <div>{{ nowDetailData.seperateDaysNoHoliday }}（用时<span>{{ nowDetailData.needDays }}</span>天）</div>
       </div>
-      <div class="detail-people item"><div class="label">参与人：</div>{{ nowDetailData.peopleObject.name }}</div>
+      <div class="detail-people item"><div class="label">参与人：</div>
+        {{ nowDetailData.peopleObjectList.map(item=>item.name).join('，') }}
+      </div>
       <div class="detail-needs item"><div class="label">所属需求：</div>{{ nowDetailData.requireNames | arrToString }}</div>
       <div class="detail-tasks item"><div class="label">关联任务：</div>{{ nowDetailData.taskNames | arrToString }}</div>
       <div class="footer">
@@ -20,7 +22,9 @@
         <div class="label">排期：</div>
         <div>{{ nowDetailData.seperateDaysNoHoliday }}（用时<span>{{ nowDetailData.needDays }}</span>天）</div>
       </div>
-      <div class="detail-people item"><div class="label">参与人：</div>{{ nowDetailData.peopleObject.name }}</div>
+      <div class="detail-people item"><div class="label">参与人：</div>
+        {{ nowDetailData.peopleObjectList.map(item=>item.name).join('，') }}
+      </div>
       <div class="detail-needs item"><div class="label">同步到团队：</div>{{ nowDetailData.syncTeam === 0?'否':'是' }}</div>
       <div class="detail-tasks item"><div class="label">日程描述：</div>{{ nowDetailData.desc }}</div>
       <div class="footer">

src/views/workbench/person/components/myFullCalendar.vue

@@ -166,6 +166,9 @@ export default {
         }
       }
       this.$nextTick(() => {
+        setTimeout(() => {
+          this.setIcon()
+        }, 2000)
         this.$emit('change', calendarApi.view)
       })
       this.calendarTitle = calendarApi.view.title
@@ -175,6 +178,24 @@ export default {
         this.todayClassName = 'today'
       }
     },
+    setIcon() {
+      const eleList = document.getElementsByClassName('fc-title')
+      Array.prototype.forEach.call(eleList, item => {
+        // const grandParent = item.parentElement.parentElement
+        // const color = grandParent.style.color
+        const div = document.createElement('div')
+        div.style.display = 'inline-block'
+        div.style.paddingTop = '2px'
+        const icon = document.createElement('i')
+        if (item.innerText.match(/排期/)) {
+          icon.className = 'el-icon-document'
+        } else {
+          icon.className = 'el-icon-date'
+        }
+        div.appendChild(icon)
+        item.parentElement.insertBefore(div, item)
+      })
+    },
     select(selectionInfo) { // 滑动多选时候返回的数据
       this.$emit('select', selectionInfo)
     },
@@ -226,6 +247,10 @@ export default {
   display: flex;
   padding-top: 2px;
 }
+>>>.fc-title {
+  line-height: 20px;
+  padding-left: 4px;
+}
 >>>.fc-event-container .fc-content {
   text-overflow: inherit;
 }

src/views/workbench/person/index.vue

@@ -464,12 +464,12 @@ export default {
   }
 }
 >>>.schedule1 {
-  margin: 1px;
+  margin: 4px;
   padding: 2px 10px;
   border: none;
 }
 >>>.schedule2 {
-  margin: 1px;
+  margin: 4px;
   padding: 2px 10px;
   border: none;
 }

src/views/workbench/team/index.vue

@@ -432,12 +432,12 @@ export default {
   overflow: scroll;
 }
 >>>.schedule1 {
-  margin: 1px;
+  margin: 4px;
   padding: 2px 10px;
   border: none;
 }
 >>>.schedule2 {
-  margin: 1px;
+  margin: 4px;
   padding: 2px 10px;
   border: none;
 }