日程列表

src/views/projectManage/bugList/file/createdBug.vue

@@ -512,7 +512,7 @@ export default {
       })
     },
     beforeUpload(file) {
-      const reg = new RegExp(/.*(zip|xlsx|txt|csv|xls|mov|mp4|m4a|avi|amr|mp3|wav|3gpp|gif|jpeg|png|jpg)/i)
+      const reg = new RegExp(/.*(zip|xlsx|text|csv|xls|mov|mp4|m4a|avi|amr|mp3|wav|3gpp|gif|jpeg|png|jpg)/i)
       const isUpload = file.type.match(reg)
       if (!isUpload) {
         this.$message({

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

@@ -1,7 +1,7 @@
 <template>
   <article>
     <div class="table-top">
-      <el-radio-group v-model="busy" size="small">
+      <el-radio-group v-model="busy" size="small" @change="queryWorkList">
         <el-radio-button :label="Number(1)">忙碌</el-radio-button>
         <el-radio-button :label="Number(0)">空闲</el-radio-button>
       </el-radio-group>
@@ -67,9 +67,24 @@
         </template>
       </el-table-column>
     </el-table>
+    <el-col :span="24">
+      <div align="right">
+        <el-pagination
+          :page-sizes="[10, 20, 30, total]"
+          :current-page="pages.curIndex"
+          :page-size="pages.pageSize"
+          background
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+        />
+      </div>
+    </el-col>
   </article>
 </template>
 <script>
+import moment from 'moment'
 import { queryWorkList, queryIdleList } from '@/api/workSchedule.js'
 export default {
   filters: {
@@ -83,16 +98,25 @@ export default {
   },
   data() {
     return {
+      total: 0,
+      pages: {
+        curIndex: 1,
+        pageSize: 10
+      },
       form_busy_1: {
         searchScheduleInfo: {
           status: 0, // 进行中 0、未开始 1、过去的 2
           origin: [0, 1]// 任务排期 0、个人日程1
         },
         teamSearchInfo: { bizId: localStorage.getItem('bizId') || null },
-        pageInfoDO: {
-          curIndex: 1,
-          pageSize: 10
-        }
+        pageInfoDO: null
+      },
+      form_busy_0: {
+        timeInfo: {
+          startTime: moment().startOf('year').format('YYYY.MM.DD'),
+          endTime: moment().endOf('year').format('YYYY.MM.DD')
+        },
+        pageInfoDO: null
       },
       statusOptions: [{
         value: 0,
@@ -104,7 +128,7 @@ export default {
         value: 2,
         label: '过去的'
       }],
-      busy: 0,
+      busy: 1,
       tableData: []
     }
   },
@@ -112,21 +136,36 @@ export default {
     this.queryWorkList()
   },
   methods: {
+    handleSizeChange(e) {
+      this.pageSize = e
+      this.queryWorkList()
+    },
+    handleCurrentChange(e) {
+      this.curIndex = e
+      this.queryWorkList()
+    },
     async queryWorkList() {
       if (this.busy === 1) {
+        this.form_busy_1.pageInfoDO = this.pages
         const res = await queryWorkList(this.form_busy_1)
         if (res.code === 200) {
           this.tableData = res.data.list
+          this.total = res.data.total
         }
       } else {
-
+        this.form_busy_0.pageInfoDO = this.pages
+        const res = await queryIdleList(this.form_busy_0)
+        if (res.code === 200) {
+          this.tableData = res.data.list
+          this.total = res.data.total
+        }
       }
     },
-    handleEdit() {
-
+    handleEdit(data) {
+      this.$emit('edit', data)
     },
-    handleDelete() {
-
+    handleDelete(data) {
+      this.$emit('delete', data)
     }
   }
 }

src/views/workbench/person/index.vue

@@ -103,6 +103,8 @@
             @select="select"
             @eventClick="showSchedule"
             @add="dateClick"
+            @edit="handleEdit"
+            @delete="handleDelete"
           />
         </section>
         <article v-show="showDetail" ref="show-schedule-detail" class="show-schedule-detail">
@@ -379,6 +381,14 @@ export default {
         item => item.memberName
       )
       return [...newArr1, ...newArr2].join('、')
+    },
+    handleEdit(data) { // 日程列表中的编辑
+      this.nowDetailData = data
+      this.editSchedule()
+    },
+    handleDelete(data) { // 日程列表中的删除
+      this.nowDetailData = data
+      this.deleteSchedule
     }
   }
 }

src/views/workbench/person/myFullCalendar.vue

@@ -23,7 +23,7 @@
         <div class="calender-top-title">{{ calendarTitle }}</div>
         <div><el-button type="primary" size="small" @click="add()">添加日程</el-button></div>
       </article>
-      <calender-list v-show="activeName === '2'" />
+      <calender-list v-show="activeName === '2'" @edit="handleEdit" @delete="handleDelete" />
     </div>
     <FullCalendar
       v-show="activeName === '1'"
@@ -208,6 +208,12 @@ export default {
     },
     add() {
       this.$emit('add')
+    },
+    handleEdit(data) {
+      this.$emit('edit', data)
+    },
+    handleDelete(data) {
+      this.$emit('delete', data)
     }
   }
 }