日历日期调整

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

@@ -4,7 +4,7 @@
     <el-table
       :id="'schedule-'+id"
       :data="scheduleList"
-      :header-cell-style="{ backgroundColor: 'rgba(232,232,232,0.4)',color: 'rgb(74, 74, 74)', fontSize: '14px', fontWeight: '500', textAlign: 'center'}"
+      :header-cell-style="{ backgroundColor: 'rgba(232,232,232,0.4)',color: 'rgb(74, 74, 74)', fontSize: '14px', fontWeight: '500'}"
       :row-style="{'background-color': 'transparent'}"
       style="width: 100%"
       show-overflow-tooltip="true"
@@ -26,7 +26,7 @@
         prop="type"
         label="类型"
         width="100"
-        align="left"
+        align="center"
       >
         <template slot-scope="scope">
           {{ getType(scope.row.type) }}

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

@@ -4,13 +4,14 @@
     <el-table
       :id="'schedule-'+id"
       :data="scheduleList"
-      :header-cell-style="{ backgroundColor: 'rgba(232,232,232,0.4)', color: 'rgb(74, 74, 74)', fontSize: '14px', fontWeight: '500', textAlign: 'center' }"
+      :header-cell-style="{ backgroundColor: 'rgba(232,232,232,0.4)', color: 'rgb(74, 74, 74)', fontSize: '14px', fontWeight: '500'}"
       :row-style="{'background-color': 'transparent'}"
       style="width: 100%"
       show-overflow-tooltip="true"
       row-key="id"
     >
       <el-table-column
+        v-if="noMove"
         width="80"
         align="center"
       >
@@ -26,7 +27,7 @@
         prop="type"
         label="类型"
         width="100"
-        align="left"
+        align="center"
       >
         <template slot-scope="scope">
           {{ getType(scope.row.type) }}
@@ -125,6 +126,11 @@ export default {
       type: String,
       default: '',
       required: false
+    },
+    noMove: {
+      type: Boolean,
+      default: true,
+      required: false
     }
   },
   data() {
@@ -152,6 +158,9 @@ export default {
       immediate: true
     }
   },
+  created() {
+    console.log(this.noMove)
+  },
   mounted() {
     this.rowDrop()
   },

src/views/projectManage/requirement/requirementDetail.vue

@@ -122,6 +122,7 @@
               :type-list="taskScheduleEvent"
               class-name="white"
               :all="true"
+              :no-move="false"
             />
           </div>
         </section>

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

@@ -4,7 +4,7 @@
     <el-table
       :id="'schedule-'+id"
       :data="scheduleList"
-      :header-cell-style="{ backgroundColor: 'rgba(232,232,232,0.4)', color: 'rgb(74, 74, 74)', fontSize: '14px', fontWeight: '500', textAlign: 'center' }"
+      :header-cell-style="{ backgroundColor: 'rgba(232,232,232,0.4)', color: 'rgb(74, 74, 74)', fontSize: '14px', fontWeight: '500'}"
       :row-style="{'background-color': 'transparent'}"
       style="width: 100%"
       show-overflow-tooltip="true"
@@ -26,7 +26,7 @@
         prop="type"
         label="类型"
         width="100"
-        align="left"
+        align="center"
       >
         <template slot-scope="scope">
           {{ getType(scope.row.type) }}

src/views/projectManage/taskList/taskIndex.vue

@@ -162,16 +162,6 @@
             slot-scope="scope"
           >{{ scope.row.qaObject !== null?scope.row.qaObject.name: '' }}</template>
         </el-table-column>
-        <el-table-column label="开发" min-width="80" align="center" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <div v-for="(item, value) of scope.row.rdList" :key="value">{{ item.name }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column label="测试" min-width="100" align="center" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <div v-for="(item, value) of scope.row.qaList" :key="value">{{ item.name }}</div>
-          </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/workbench/person/components/calenderList.vue

@@ -132,8 +132,8 @@ export default {
       },
       form_busy_0: {
         timeInfo: {
-          startTime: moment().startOf('year').format('YYYY.MM.DD'),
-          endTime: moment().endOf('year').format('YYYY.MM.DD')
+          startTime: moment().format('YYYY.MM.DD'),
+          endTime: moment().add(1, 'month').format('YYYY.MM.DD')
         },
         pageInfoDO: null
       },

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

@@ -63,6 +63,7 @@
 </template>
 
 <script>
+import moment from 'moment'
 import FullCalendar from '@fullcalendar/vue'
 import dayGridPlugin from '@fullcalendar/daygrid'
 import timeGridPlugin from '@fullcalendar/timegrid'
@@ -139,10 +140,6 @@ export default {
         listPlugin
       ],
       calendarWeekends: true,
-      calendarEvents: [
-        // initial event data
-        { title: 'Event Now', start: new Date(), end: new Date().setDate(16) }
-      ],
       deleteDialogVisible: false,
       calendarDialogProperty: {
         title: '新建日程',
@@ -161,7 +158,6 @@ export default {
     },
     callCalendarApi(methods, viewName) {
       const calendarApi = this.$refs.fullCalendar.getApi()
-      this.$emit('change', calendarApi.view)
       if (methods) {
         if (viewName) {
           calendarApi[methods](viewName)
@@ -169,6 +165,9 @@ export default {
           calendarApi[methods]()
         }
       }
+      this.$nextTick(() => {
+        this.$emit('change', calendarApi.view)
+      })
       this.calendarTitle = calendarApi.view.title
       if (calendarApi.view.activeStart.getTime() < this.today.getTime() && this.today.getTime() < calendarApi.view.activeEnd.getTime()) {
         this.todayClassName = 'today selected'

src/views/workbench/person/index.vue

@@ -198,8 +198,11 @@ export default {
       myTeamTableData: [],
       teamInfoDialogVisible: false,
       calendarEvents: [
-        // initial event data
-        { title: 'Event Now', start: new Date(), end: new Date().setDate(16) }
+        {
+          title: 'Event Now',
+          start: moment().startOf('month').valueOf(),
+          end: moment().endOf('month').valueOf()
+        }
       ],
       activeSchedule: '1', // 日程表和列表切换
       deleteDialogVisible: false,