[日程计划列表] 页面样式完成

src/assets/less/common.css

@@ -0,0 +1,55 @@
+/*列表上方操作按钮区域*/
+.ant-card-body .table-operator {
+  margin-bottom: 18px;
+}
+/** Button按钮间距 */
+.table-operator .ant-btn {
+  margin: 8px 8px 0 0;
+}
+/*列表td的padding设置 可以控制列表大小*/
+.ant-table-tbody .ant-table-row td {
+  padding-top: 15px;
+  padding-bottom: 15px;
+}
+/*列表页面弹出modal*/
+.ant-modal-cust-warp {
+  height: 100%;
+}
+/*弹出modal Y轴滚动条*/
+.ant-modal-cust-warp .ant-modal-body {
+  height: calc(100% - 110px) !important;
+  overflow-y: auto;
+}
+/*弹出modal 先有content后有body 故滚动条控制在body上*/
+.ant-modal-cust-warp .ant-modal-content {
+  height: 90% !important;
+  overflow-y: hidden;
+}
+/*列表中有图片的加这个样式 参考用户管理*/
+.anty-img-wrap {
+  height: 25px;
+  position: relative;
+}
+.anty-img-wrap > img {
+  max-height: 100%;
+}
+/*列表中范围查询样式*/
+.query-group-cust {
+  width: calc(50% - 10px);
+}
+.query-group-split-cust:before {
+  content: "~";
+  width: 20px;
+  display: inline-block;
+  text-align: center;
+}
+/*erp风格子表外框padding设置*/
+.ant-card-wider-padding.cust-erp-sub-tab > .ant-card-body {
+  padding: 5px 12px;
+}
+.delRed {
+  color: red;
+}
+.sendGr {
+  color: green;
+}

src/assets/less/common.less

@@ -45,3 +45,9 @@
 /*erp风格子表外框padding设置*/
 .ant-card-wider-padding.cust-erp-sub-tab>.ant-card-body{padding:5px 12px}
 
+.delRed {
+  color: red;
+}
+.sendGr {
+  color: green;
+}

src/views/dashboard/MyToDo.vue

@@ -34,10 +34,11 @@
           <!-- 日历 -->
           <a-col :xs="24" :sm="24" :md="24" :lg="10">
             <a-card title="日历" :bordered="false" class="fullCard">
-              <div>
-                <div class="ccfullCalendar">
-                  <FullCalendar :options="calendarOptions" style="height:300px;" class="eventDeal-wrap" />
-                </div>
+              <template #extra><a href="javascript:void(0);" @click="openCalTab">更多</a></template>
+              <!-- <div> -->
+              <div class="ccfullCalendar">
+                <FullCalendar :options="calendarOptions" style="height:300px;" class="eventDeal-wrap" />
+                <!-- </div> -->
               </div>
             </a-card>
           </a-col>
@@ -79,7 +80,7 @@
           <!-- 企业公告 -->
           <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="10" :style="{ marginBottom: '10px' }">
             <a-card title="企业公告" :bordered="false" class="notice newsColItem">
-              <template #extra><a href="javascript:void(0);" @click="openEnterAnn" class="openPage">详情</a></template>
+              <template #extra><a href="javascript:void(0);" @click="openEnterAnn">详情</a></template>
               <ul class="clearfix">
                 <li>
                   <a href="https://m.thepaper.cn/baijiahao_14855630" class="clearfix">
@@ -146,7 +147,7 @@
           </a-col>
           <a-col :xs="24" :sm="10" :md="12" :lg="12" :xl="7">
             <a-card title="友情链接" :bordered="false" class="link newsColItem">
-              <template #extra><a href="javascript:void(0);" @click="openMyLinks" class="openPage">详情</a></template>
+              <template #extra><a href="javascript:void(0);" @click="openMyLinks">详情</a></template>
 
               <div class="linkBtn">
                 <button><a href="https://www.yonyou.com/" target="_blank">用友</a></button>
@@ -467,14 +468,19 @@ export default {
       // }
       this.$router.push('/oa/my-plan/schedulePlan')
     },
-    //点击企业公告 详情
+    //企业公告
     openEnterAnn() {
       this.$router.push('/oa/enterpriseAnnouncement')
     },
-    //点击友情 详情
+    //友情链接
     openMyLinks() {
       this.$router.push('/oa/myLinks')
     },
+
+    //日程计划列表
+    openCalTab() {
+      this.$router.push('/oa/my-plan/calTable')
+    },
     // 系统消息
     loadData() {
       try {
@@ -607,21 +613,7 @@ a {
   *zoom: 1;
 }
 
-// 年月选择消失
-/deep/ .ant-fullcalendar-header {
-  display: none;
-}
-// 线消息
-/deep/ .ant-fullcalendar {
-  border-top: none;
-}
-
-/deep/ .ant-fullcalendar-calendar-body {
-  padding: 0;
-}
-
 /deep/ .ant-card-head-title {
-  text-shadow: 1px 1px 2px rgb(170, 169, 169);
   color: #1890ff;
 }
 
@@ -635,6 +627,19 @@ a {
 // 日历
 .ccfullCalendar {
   height: 274px !important;
+  // 年月选择消失
+  /deep/ .ant-fullcalendar-header {
+    display: none;
+  }
+  // 线消息
+  /deep/ .ant-fullcalendar {
+    border-top: none;
+  }
+
+  /deep/ .ant-fullcalendar-calendar-body {
+    padding: 0;
+  }
+
   /deep/ .fc .fc-toolbar.fc-header-toolbar {
     margin-bottom: 6px;
   }
@@ -743,16 +748,6 @@ a {
   }
   // 公告
   .news {
-    .openPage {
-      border: 1px solid rgba(99, 158, 246, 0.8);
-      padding: 6px 16px;
-      border-radius: 4px;
-      color: rgb(99, 158, 246);
-    }
-    .openPage:hover {
-      background-color: rgba(99, 158, 246, 0.8);
-      color:white;
-    }
     .newsColItem {
       height: 300px;
     }

src/views/oa/enter-ann/add/addAnnModal.vue

@@ -62,19 +62,17 @@
           </a-col>
         </a-row>
 
-        <!-- 内容 -->
+        <!-- 公告富文本 -->
         <a-row :gutter="24">
           <a-col :span="12">
             <a-form-item label="公告内容:"></a-form-item>
           </a-col>
           <a-col :span="21">
             <RichText ref="RichText" :richTextVal="smallText" style="marginLeft:120px;"></RichText>
-
-            <!-- 富文本 组件 ----------------------------------------------
-                  父组件讲属性  modelValue 传递给子组件
-                  父组件 通过 $refs.RichText。。。。 拿到组件里的属性及方法
-                  父组件 通过 richTextVal给 子组件传值
-            -------------------------------------------------------------->
+            <!-- 富文本  --------------------------------------------------------------
+                父组件通过 ref.后的值 可拿到自组件的 方法及变量（this.$ref.RichText）
+                子组件 通过props 接收父组件 富文本的值（赋值时使用）
+            -------------------------------------------------------------------------->
           </a-col>
         </a-row>
       </a-form>
@@ -83,30 +81,60 @@
 </template>
 
 <script>
-import { Moment } from 'moment'
-import { defineComponent } from 'vue'
+import moment from 'moment'
+import 'moment/locale/zh-cn'
 import RichText from '@views/jeecg/RichText.vue'
 export default {
     name: 'AddAnnModal',
     components: {
-        RichText
+        RichText // 富文本组件
     },
     data () {
         return {
             addAnnForm: this.$form.createForm(this),
             confirmLoading: false,
             addModalVisible: false,
-            smallText: '' // 弹框内 富文本的内容
+            smallText: '', // 弹框内 富文本的内容
+            annInfo: {} // 表单数据(回显)
         }
     },
+    props: {
+    // 接收父组件查询公告的方法
+    // fatherGetAnnList: {
+    //     type: Function,
+    //     default: null
+    // }
+    },
+    // 上海2套公寓、外加1套小办公室
+    // 合肥2套公寓、外加1套别墅
+    // 海南1套大公寓
+    // 墨尔本1套公寓
+
+    //  就这儿子结婚后 跟老婆住在30平小办公室
+
     created () {},
+
     methods: {
-    // 弹框保存
+    // 回显表单
+        getAnnFormInfo () {
+            console.log('点击项ID', this.annInfo.id)
+            // 回显赋值
+            this.addForm.setFieldsValue({
+                title: this.annInfo.title,
+                type: this.annInfo.type,
+                createBy: this.annInfo.createBy,
+                createTime: moment(this.annInfo.createTime, 'YYYY/MM/DD HH:mm:ss'),
+                isRelease: this.annInfo.isRelease,
+                content: this.annInfo.content
+            })
+        },
+        // 弹框保存
         handleOk () {
-            // 触发表单验证、发送新增请求、提示新增成功、关闭弹框
+            // 赋值 触发表单验证、发送新增请求、提示新增成功、关闭弹框
             this.addAnnForm.validateFields((err, vals) => {
                 console.log('新增企业公告的信息：', vals)
                 if (!err && this.$refs.RichText.content !== '') {
+                    // -------------------------------------------------
                     var news = {}
                     news.title = vals.title
                     news.type = vals.type
@@ -115,13 +143,18 @@ export default {
                     console.log(this.$refs.RichText.content)
                     news.content = this.$refs.RichText.content // 拿到子组件的富文本 内容
                     console.log('这是添加的一条日程计划:', news)
-                    this.$message.success('新增企业公告成功')
+                    // -----------------------------------------------
                     this.addModalVisible = false
+                    this.$message.success('新增企业公告成功')
+                    this.addAnnForm.resetFields() // 清空
+                    // 调用父组件查询公告列表 方法
+                    // this.fatherGetAnnList()
                 } else {
                     this.$message.error('请填写完整的日程计划')
                 }
             })
         },
+
         close () {
             this.$emit('close')
             this.visible = false

src/views/oa/enterpriseAnnouncement.vue

@@ -61,23 +61,23 @@
 
           <!-- 操作 -->
           <span slot="operationSlot" slot-scope="text, record">
-            <a href="javascript:void(0);" @click="editAnn(record.id)" style="color:#014f86;"> 编辑 </a>
+            <a href="javascript:void(0);" @click="editAnn(record)"> 编辑 </a>
             <a-divider type="vertical" />
             <a-popconfirm title="确定发布吗？" ok-text="是" cancel-text="否">
-              <button @click="sendAnn(record.id)" class="sendAnn">发布</button>
+              <a href="javascript:void(0);" @click="sendAnn(record.id)" class="sendGr"> 发布 </a>
             </a-popconfirm>
 
             <a-divider type="vertical" />
 
             <a-popconfirm title="确定删除吗？" ok-text="是" cancel-text="否">
-              <a href="javascript:void(0);" @click="delAnn(record.id)" style="color:#ff6b6b;"> 删除 </a>
+              <a href="javascript:void(0);" @click="delAnn(record.id)" class="delRed"> 删除 </a>
             </a-popconfirm>
           </span>
         </a-table>
       </a-row>
     </div>
 
-    <!-- 新增弹框 组件 -->
+    <!-- 新增弹框 组件 :fatherGetAnnList="getAnnList" -->
     <addAnn-modal ref="AddAnnModal" @ok="modalFormOk"></addAnn-modal>
   </a-card>
 </template>
@@ -141,7 +141,8 @@ export default {
                     type: '正常',
                     createBy: 'admin',
                     createTime: '2020/09/09',
-                    isRelease: '0'
+                    isRelease: '0',
+                    content: '哈哈哈哈哈哈'
                 },
                 {
                     id: '2',
@@ -149,43 +150,62 @@ export default {
                     type: '财务',
                     createBy: 'admin',
                     createTime: '2021/12/19',
-                    isRelease: '1'
+                    isRelease: '1',
+                    content: '牛牛牛牛牛'
                 }
-            ]
+            ],
+            showInfo: {} // 编辑时回显的公告数据
         }
     },
     created () {
-        // this.getAnnList() //渲染公告
+    // this.getAnnList() //渲染公告
     },
     methods: {
     // 查询日程计划列表
-        // getAnnList () {
-        //     jiekou(null).then(res => {
-        //         if (res.success) {
-        //             let list = res.result // 查询结果
-        //             var annList = [] // 企业公告集合
-        //             list.forEach(e => {
-        //                 let annObj = {
-        //                     title: e.title,
-        //                     type: e.type,
-        //                     content: e.content,
-        //                     createBy: e.createBy,
-        //                     createTime: e.createTime,
-        //                     isRelease: e.isRelease
-        //                 }
-        //                 // 一条公告数据放到公告列表中
-        //                 annList.push(annObj)
-        //             })
-        //         }
-        //     })
-        // },
-        // 新增
+    // getAnnList () {
+    //     jiekou(null).then(res => {
+    //         if (res.success) {
+    //             let list = res.result // 查询结果
+    //             var annList = [] // 企业公告集合
+    //             list.forEach(e => {
+    //                 let annObj = {
+    //                     title: e.title,
+    //                     type: e.type,
+    //                     content: e.content,
+    //                     createBy: e.createBy,
+    //                     createTime: e.createTime,
+    //                     isRelease: e.isRelease
+    //                 }
+    //                 // 一条公告数据放到公告列表中
+    //                 annList.push(annObj)
+    //             })
+    //         }
+    //     })
+    // },
+    // 新增
         addOpen () {
             console.log('点击了大页面的新增')
             // 拿到子组件的弹框 属性
             this.$refs.AddAnnModal.addModalVisible = true
         },
-
+        // 编辑
+        editAnn (e) {
+            console.log('编辑,该公告:', e)
+            this.$refs.AddAnnModal.addModalVisible = true
+            if (e.id) {
+                console.log('该项id', e.id)
+                // 发送根据 id 查询公告请求
+                // gg().then(res => {
+                //     if (res.success) {
+                //         console.log(res)
+                //         let annInfo = res.result
+                //         this.showInfo = annInfo // 互通
+                //         console.log('回显的公告', this.showInfo)
+                //         this.$refs.AddAnnModal.annInfo = this.showInfo
+                //     }
+                // })
+            }
+        },
         // 查询按钮
         searchQuery () {
             // this.loading = true
@@ -208,10 +228,7 @@ export default {
             // this.ipagination = pagination
             // this.loadData();
         },
-        // 编辑
-        editAnn (id) {
-            console.log('点击了编辑，该项公共的ID是：', id)
-        },
+
         // 发布
         sendAnn (id) {
             console.log('点击了发布')
@@ -247,14 +264,4 @@ export default {
 </script>
 <style lang="less" scoped>
 @import '~@assets/less/common.less';
-.sendAnn {
-  border: 1px solid rgb(0, 100, 148);
-  color: rgb(0, 100, 148);
-  border-radius: 4px;
-  background-color: white;
-}
-.sendAnn:hover {
-  background-color: rgba(0, 100, 148, 0.8);
-  color: white;
-}
 </style>

src/views/oa/my-plan/add/savePlan.vue

@@ -66,7 +66,6 @@
           </a-form-item>
         </a-col>
       </a-row>
-      <!-- 日程时间 -->
       <a-row :gutter="24">
         <!-- <a-col :span="12">
               <a-form-item label="提醒类型">
@@ -143,7 +142,7 @@
         </a-col>
         <!-- 引入富文本组件 -->
         <a-col :span="24">
-          <RichText ref="RichText" :modelValue="smallText" style="margin:0 170px 0 130px;"></RichText>
+          <RichText ref="RichText" :richTextVal="smallText" style="margin:0 170px 0 130px;"></RichText>
         </a-col>
       </a-row>
     </a-form>
@@ -172,9 +171,8 @@ export default {
             formLayout: 'horizontal',
             addForm: this.$form.createForm(this, { name: 'coordinated' }),
             checked: true,
-            memo: '',
             formData: {}, // 表单数据(回显)
-            showTime: [], // 开始结束时间集合
+            timeList: [], // 开始/结束时间集合
             isDate: false, // 默认无时分秒
             smallText: '' // 富文本内容
         }
@@ -214,7 +212,7 @@ export default {
                 this.formData.endTime = this.fatherData
                 /// 2、判断该时间 有无时分秒 赋值给 isDate
                 this.isDate = this.isDatetime(this.fatherData)
-                var showTime = [
+                var timeList = [
                     moment(this.formData.startTime, 'YYYY/MM/DD HH:mm'),
                     moment(this.formData.endTime, 'YYYY/MM/DD HH:mm')
                 ]
@@ -230,14 +228,16 @@ export default {
                     // console.log('半小时后的时间', reaET)
                     var reaET = new Date(z)
                     // console.log('22', z)
-                    showTime = [moment(this.formData.startTime, 'YYYY/MM/DD HH:mm'), moment(reaET, 'YYYY/MM/DD HH:mm')]
+                    timeList = [moment(this.formData.startTime, 'YYYY/MM/DD HH:mm'), moment(reaET, 'YYYY/MM/DD HH:mm')]
                 } else {
-                    showTime = [moment(this.formData.startTime, 'YYYY/MM/DD'), moment(this.formData.endTime, 'YYYY/MM/DD')]
+                    timeList = [moment(this.formData.startTime, 'YYYY/MM/DD'), moment(this.formData.endTime, 'YYYY/MM/DD')]
                 }
                 // ==============================================================
                 // 赋值
-                this.addForm.setFieldsValue({
-                    continue: showTime
+                this.$nextTick(() => {
+                    this.addForm.setFieldsValue({
+                        continue: timeList
+                    })
                 })
             })
         },
@@ -245,16 +245,19 @@ export default {
         // 回显表单的赋值
         getFormInfo () {
             console.log('点击日程的ID：', this.formData.id)
-            this.addForm.setFieldsValue({
-                title: this.formData.title,
-                type: this.formData.type, // 日程类型
-                degreeOfUrgency: this.formData.degreeOfUrgency, // 紧急程度
-                memo: this.formData.memo, // 备注
-                backgroundColor: this.formData.backgroundColor,
-                continue: [
-                    moment(this.formData.startTime, 'YYYY/MM/DD HH:mm'),
-                    moment(this.formData.endTime, 'YYYY/MM/DD HH:mm')
-                ]
+            this.$nextTick(() => {
+                this.addForm.setFieldsValue({
+                    title: this.formData.title,
+                    type: this.formData.type, // 日程类型
+                    degreeOfUrgency: this.formData.degreeOfUrgency, // 紧急程度
+                    backgroundColor: this.formData.backgroundColor,
+                    continue: [
+                        moment(this.formData.startTime, 'YYYY/MM/DD HH:mm'),
+                        moment(this.formData.endTime, 'YYYY/MM/DD HH:mm')
+                    ],
+                    content: this.$refs.RichText.content
+                })
+                console.log(this.$refs.RichText.content)
             })
         },
 
@@ -263,15 +266,15 @@ export default {
             this.addForm.validateFields((err, values) => {
                 console.log('跑出来', values)
                 if (!err) {
-                    // ------------------------------------------------------
-                    var scheduleObject = {} // 赋值
+                    // ---赋值-------------------------------------------
+                    var scheduleObject = {}
                     scheduleObject.title = values.title
                     scheduleObject.type = values.type
                     scheduleObject.degreeOfUrgency = values.degreeOfUrgency
                     scheduleObject.startTime = values.continue[0].format('YYYY-MM-DD HH:mm:ss')
                     scheduleObject.endTime = values.continue[1].format('YYYY-MM-DD HH:mm:ss')
-                    scheduleObject.memo = values.memo
                     scheduleObject.backgroundColor = values.backgroundColor
+                    scheduleObject.content = this.$refs.RichText.content
                     // 修改------------------------------------------------
                     if (this.formData.id) {
                         scheduleObject.id = this.formData.id
@@ -285,13 +288,6 @@ export default {
                                 // 调用父组件方法（查询数据）
                                 this.fatherMethod()
                             }
-                            // if (this.scheduleObject === this.formData) {
-                            //     console.log('00', this.scheduleObject)
-                            //     console.log('11', this.formData)
-                            //     console.log('没做修改的状态')
-                            //     this.$message.success('您未做任何修改')
-                            //     // 未做任何修改，状态不变
-                            // }
                         })
                     } else {
                         // 新增------------------------------------------
@@ -299,7 +295,7 @@ export default {
                             if (res.success) {
                                 this.savePlanModalVisible = false
                                 this.$message.success('新增日程成功')
-                                this.addForm.resetFields() // 清空
+                                this.addForm.resetFields() // 清空表单
                                 // 调用父组件的方法(查询数据)
                                 this.fatherMethod()
                             }
@@ -308,7 +304,7 @@ export default {
                     // ----------------------------------------------
                 } else {
                     this.$message.error('请填写信息')
-                    console.log('没有填写相关信息')
+                    console.log('未填写相关信息')
                 }
             })
         },

src/views/oa/my-plan/calTable.vue

@@ -0,0 +1,237 @@
+<template>
+  <!-- :bordered="false" -->
+  <a-card>
+    <!-- 查询 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="6" :sm="8">
+            <a-form-item label="标题">
+              <a-input placeholder="请输入标题查询" v-model="queryParam.title" />
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="类型">
+              <!-- <a-input placeholder="请选择状态查询" v-model="queryParam.status" /> -->
+              <a-select
+                v-decorator="['type', { rules: [{ required: false, message: '请选择状态查询' }] }]"
+                placeholder="请选择状态查询"
+                width="100%"
+              >
+                <a-select-option value="日常记录">日常记录</a-select-option>
+                <a-select-option value="本周工作">本周工作</a-select-option>
+                <a-select-option value="下周计划">下周计划</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+
+          <!-- <template> </template> -->
+          <a-col :md="6" :sm="8">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="addPlan" type="primary">新增</a-button>
+      <a-button type="primary" @click="myPlanExportXls('我的日程计划')">导出</a-button>
+      <!---------------------------------------------------------------------
+        :action="importExcelUrl" 上传的地址
+        showUploadList 是否展示uploadList ，
+                  可设为一个对象，用于单独设定showPreviewIcon和showRemoveIconf
+        headers   设置上传的请求头部
+        multiple  是否支持多选文件
+        name      发达后台的文件参数名
+      ----------------------------------------------------------------------->
+      <a-upload
+        name="planFile"
+        :showUploadList="false"
+        :multiple="false"
+        :headers="tokenHeader"
+        @change="myPlanImportExcel"
+      >
+        <a-button type="primary">导入</a-button>
+      </a-upload>
+      <!-- v-if="selectedRowKeys.length > 0" -->
+      <a-dropdown>
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel">
+            <a-icon type="delete" />
+            删除
+          </a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px">
+          批量操作
+          <a-icon type="down" />
+        </a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <a-alert type="info" showIcon style="margin-bottom: 16px;">
+        <template slot="message">
+          <span>已选择</span>
+          <!-- {{ selectedRowKeys.length }} -->
+          <a style="font-weight: 600;padding: 0 4px;">3</a>
+          <span>项</span>
+          <!--  v-if="selectedRowKeys.length > 0" -->
+          <template>
+            <a-divider type="vertical" />
+            <a @click="onClearSelected">清空</a>
+          </template>
+        </template>
+      </a-alert>
+      <!-- table   :loading="loading" -->
+      <a-row>
+        <a-table
+          bordered
+          :columns="columns"
+          :dataSource="planDataList"
+
+          :pagination="pagination"
+          :row-key="record => record.id"
+          :rowSelection="rowSelection"
+          @change="handleTableChange"
+        >
+          <!-- 操作 -->
+          <span slot="operationSlot" slot-scope="text, record">
+            <a href="javascript:void(0);" @click="editPlan(record)"> 编辑 </a>
+
+            <a-divider type="vertical" />
+
+            <a-popconfirm title="确定删除吗？" ok-text="是" cancel-text="否">
+              <a href="javascript:void(0);" @click="delPlan(record.id)" class="delRed"> 删除 </a>
+            </a-popconfirm>
+          </span>
+        </a-table>
+      </a-row>
+    </div>
+  </a-card>
+</template>
+
+<script>
+import JEllipsis from '@/components/jeecg/JEllipsis'
+// import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+// import SysCheckRuleModal from './modules/SysCheckRuleModal'
+// import SysCheckRuleTestModal from './modules/SysCheckRuleTestModal'
+export default {
+    name: 'CalTable',
+    // mixins: [JeecgListMixin],
+    components: { JEllipsis },
+    data () {
+        return {
+            tokenHeader: {},
+            queryParam: {}, // 查询条件对象
+            pagination: {}, // 分页
+            // 表头
+            columns: [
+                {
+                    title: '标题',
+                    dataIndex: 'title',
+                    align: 'center'
+                },
+                {
+                    title: '类型',
+                    dataIndex: 'type',
+                    align: 'center'
+                },
+                {
+                    title: '紧急程度',
+                    dataIndex: 'degreeOfUrgency',
+                    align: 'center'
+                },
+                {
+                    title: '开始时间',
+                    dataIndex: 'startTime',
+                    align: 'center'
+                },
+                {
+                    title: '操作',
+                    dataIndex: 'operation',
+                    scopedSlots: { customRender: 'operationSlot' },
+                    align: 'center',
+                    width: '20%'
+                }
+            ],
+            planDataList: [
+                {
+                    id: '1',
+                    title: '11月19日的KPI考核（2）',
+                    type: '下周计划',
+                    degreeOfUrgency: '紧急',
+                    startTime: '2021/11/19',
+                    memo: '哈哈哈哈哈哈'
+                },
+                {
+                    id: '2',
+                    title: '12月17日的KPI考核（3）',
+                    type: '日程记录',
+                    degreeOfUrgency: '一般',
+                    startTime: '2021/12/17',
+                    memo: '呵呵呵呵'
+                },
+                {
+                    id: '3',
+                    title: 'AAAAAAA',
+                    type: '本周计划',
+                    degreeOfUrgency: '重要',
+                    startTime: '2022/01/30',
+                    memo: '呵呵呵呵'
+                }
+            ]
+        }
+    },
+    computed: {
+    // 选中项
+        rowSelection () {
+            return {
+                onChange: (selectedRowKeys, selectedRows) => {
+                    console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows)
+                },
+                getCheckboxProps: record => ({
+                    props: {
+                        disabled: record.title === 'Disabled User',
+                        // Column configuration not to be checked
+                        title: record.title
+                    }
+                })
+            }
+        }
+    },
+    methods: {
+    // 查询按钮
+        searchQuery () {
+            // this.loading = true
+            console.log('点击了查询按钮')
+            // 根据
+        },
+        // 重置 输入的查询条件
+        searchReset () {},
+        // 新增日程计划   弹框
+        addPlan () {},
+        // 清空勾选
+        onClearSelected () {},
+        // 导出我的日程计划
+        myPlanExportXls () {},
+        // 导入
+        myPlanImportExcel () {},
+        // 批量删除
+        batchDel () {},
+        // 分页、排序、筛选变化时触发
+        handleTableChange (pagination, filters, sorter) {},
+        // 操作 编辑
+        editPlan () {},
+        // 操作 删除
+        delPlan () {}
+    }
+}
+</script>
+<style lang="less" scoped>
+@import '~@assets/less/common.less';
+</style>

src/views/oa/my-plan/schedulePlan.vue

@@ -157,7 +157,7 @@ export default {
         search () {
             scheduleGetListByTime(null).then(res => {
                 if (res.success) {
-                    // console.log('查询到的总日程结果', res)
+                    console.log('查询到的总日程结果', res)
                     let list = res.result // 查询结果
                     var eventList = [] // 日程事件集合
                     // 循环日程

src/views/oa/myLinks.vue

@@ -61,16 +61,16 @@
 
           <!-- 操作 -->
           <span slot="operationSlot" slot-scope="text, record">
-            <a href="javascript:void(0);" @click="editAnn(record.id)" style="color:#219ebc;"> 编辑 </a>
+            <a href="javascript:void(0);" @click="editAnn(record.id)"> 编辑 </a>
             <a-divider type="vertical" />
 
             <a-popconfirm title="确定发布吗？" ok-text="是" cancel-text="否">
-              <button @click="sendAnn(record.id)" class="sendAnn">发布</button>
+              <a href="javascript:void(0);" @click="sendAnn(record.id)" class="sendGr"> 发布 </a>
             </a-popconfirm>
             <a-divider type="vertical" />
 
             <a-popconfirm title="确定删除吗？" ok-text="是" cancel-text="否">
-              <a href="javascript:void(0);" @click="delAnn(record.id)" style="color:#ff6b6b;"> 删除 </a>
+              <a href="javascript:void(0);" @click="delAnn(record.id)" class="delRed"> 删除 </a>
             </a-popconfirm>
           </span>
         </a-table>
@@ -231,15 +231,4 @@ export default {
 </script>
 <style lang="less" scoped>
 @import '~@assets/less/common.less';
-.sendAnn {
-  border: 1px solid rgb(0, 100, 148);
-  color: rgb(0, 100, 148);
-  border-radius: 4px;
-  background-color: white;
-}
-.sendAnn:hover {
-  background-color: rgba(0, 100, 148,.8);
-  color: white;
-  // border-radius: 4px;
-}
 </style>