周五11-5 发布状态条件及其他小问题

src/views/administrative-management/supplies-management/sup-receive/supRecAdd.vue

@@ -75,7 +75,13 @@
               label="领用数量"
               prop="receiveNum"
               style="width:100%">
-              <a-input v-model="form.receiveNum" placeholder="请输入领用数量" />
+              <a-input-number
+                placeholder="领用数量"
+                :default-value="0"
+                style="width: 100%"
+                v-model="form.receiveNum"
+                :min="0"
+              />
             </a-form-model-item>
           </a-col>
 
@@ -86,7 +92,7 @@
               label="申请人"
               prop="proposer"
               style="width:100%">
-              <a-input-number v-model="form.proposer" placeholder="请输入申请人" style="width: 100%" />
+              <a-input v-model="form.proposer" placeholder="请输入申请人" style="width: 100%" />
             </a-form-model-item>
           </a-col>
 
@@ -98,6 +104,7 @@
               prop="department"
               style="width:100%">
               <a-select v-model="form.department" show-search placeholder="所属选择部门" style="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-option value="实施部">实施部</a-select-option>

src/views/dashboard/MyToDo.vue

@@ -34,11 +34,11 @@
           <!-- 日历 -->
           <a-col :xs="24" :sm="24" :md="24" :lg="10">
             <a-card title="日历" :bordered="false" class="fullCard">
-              <template #extra><a href="javascript:void(0);" @click="openCalTab">更多</a></template>
-              <!-- <div> -->
+              <template #extra>
+                <a href="javascript:void(0);" @click="openCalTab">更多</a>
+              </template>
               <div class="ccfullCalendar">
                 <FullCalendar :options="calendarOptions" style="height:300px;" class="eventDeal-wrap" />
-                <!-- </div> -->
               </div>
             </a-card>
           </a-col>
@@ -81,49 +81,14 @@
           <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">详情</a></template>
-              <ul class="clearfix">
-                <li>
+              <ul class="clearfix"  >
+                <!-- style="overflow:hidden;" -->
+                <li v-for="item in annList" :key="item.id">
                   <a href="https://m.thepaper.cn/baijiahao_14855630" class="clearfix">
-                    <span class="department fl">[人事]</span>
-                    <span class="info fl">王健林称万达高管全部换乘红旗汽车</span>
-                    <span class="time fr">2021-10-11</span>
-                    <span class="person fr">王健林</span>
-                  </a>
-                </li>
-
-                <li>
-                  <a href="https://baijiahao.baidu.com/s?id=1713375072968520817&wfr=spider&for=pc" class="clearfix">
-                    <span class="department fl">[运动]</span>
-                    <span class="info fl">德国成为首支晋级卡塔尔世界杯球队</span>
-                    <span class="time fr">2021-10-12</span>
-                    <span class="person fr">卡塔尔</span>
-                  </a>
-                </li>
-
-                <li>
-                  <a href="https://news.sina.cn/kx/2021-10-12/detail-iktzscyx9169344.d.html" class="clearfix">
-                    <span class="department fl">[财务]</span>
-                    <span class="info fl">浙江女子围观宰鸭后确诊鹦鹉热</span>
-                    <span class="time fr">2021-10-11</span>
-                    <span class="person fr">鹦鹉</span>
-                  </a>
-                </li>
-
-                <li>
-                  <a href="https://baijiahao.baidu.com/s?id=1713366904170468936&wfr=spider&for=pc" class="clearfix">
-                    <span class="department fl">[人事]</span>
-                    <span class="info fl">李铁:有没有自己的球迷是巨大区别</span>
-                    <span class="time fr">2021-10-11</span>
-                    <span class="person fr">李铁</span>
-                  </a>
-                </li>
-
-                <li>
-                  <a href="https://haokan.baidu.com/v?pd=wisenatural&vid=15789314381003157969" class="clearfix">
-                    <span class="department fl">[人事]</span>
-                    <span class="info fl">今年为什么会出现南旱北涝</span>
-                    <span class="time fr">2021-10-11</span>
-                    <span class="person fr">某某</span>
+                    <span class="department fl">[{{ item.type }}]</span>
+                    <span class="title fl">{{ item.title }}</span>
+                    <span class="createTime fr">{{ item.createTime }}</span>
+                    <span class="createBy fr">{{ item.createBy }}</span>
                   </a>
                 </li>
               </ul>
@@ -132,7 +97,6 @@
           <!-- 我的计划 -->
           <a-col :xs="24" :sm="14" :md="12" :lg="12" :xl="7" :style="{ marginBottom: '10px' }">
             <a-card title="我的计划" :bordered="false" class="plan newsColItem">
-              <!-- 数据统计 -->
               <div class="total clearfix">
                 <div class="left fl">
                   <span>上月我的计划：<strong>0</strong>份</span>
@@ -145,6 +109,8 @@
               </div>
             </a-card>
           </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">详情</a></template>
@@ -277,6 +243,7 @@ import timeGridPlugin from '@fullcalendar/timegrid'
 import SchedulePlan from '@views/oa/my-plan/schedulePlan' // 子组件
 // import '@fullcalendar/core/main.css'
 import { scheduleGetListByTime, scheduleQueryById } from '@api/oa/cd-schedule'
+import { enterpriseEList } from '@api/oa/cd-enterprise-announcement'
 import '@fullcalendar/daygrid/main.css'
 export default {
   name: 'Home',
@@ -351,12 +318,12 @@ export default {
           hour12: false // 设置时间为24小时制
         }
       },
-      ////日历组件参数结尾----------------------
       userInfo: this.$store.getters.userInfo,
       todoList: [],
       activeKeyAll: [],
       msg1Count: '0',
       msg2Count: '0',
+      annList: [],//企业公告列表
       url: {
         listCementByUser: '/sys/annountCement/listByUser'
       },
@@ -386,9 +353,10 @@ export default {
   },
 
   created() {
+    this.getScheduleData() //查询日程数据
     this.getDataList() //待办数据
     this.getActiveKeyAll() //OA按钮
-    this.getScheduleData() //查询日程数据
+    this.getAnnList() //渲染公告
   },
   computed: {
     // 系统消息计算
@@ -416,11 +384,6 @@ export default {
     this.loadData()
   },
   methods: {
-    prev() {
-      this.calendarApi.prev()
-      console.log(this.calendarApi.prev)
-    },
-
     //查询日程数据
     getScheduleData() {
       this.$nextTick(() => {
@@ -445,14 +408,53 @@ export default {
               }
               eventList.push(Object) // 把日程推到日程列表
             })
-            console.log('总共的日程', eventList)
+            // console.log('总共的日程', eventList)
             // 刷新 日程列表
             this.calendarOptions.events = eventList
           }
         })
       })
     },
+    // 代办数据
+    getDataList() {
+      this.loading = true
+      this.postFormAction('/actTask/todoList', {}).then(res => {
+        this.loading = false
+        if (res.success) {
+          this.todoList = res.result || []
+          console.log('首页 我的待办数字：', this.todoList.length)
+          this.total = this.data.leading
+          console.log('系统消息:', this.data)
+        }
+      })
+    },
+    // 获取 OA 按钮
+    getActiveKeyAll() {
+      this.postFormAction('/activiti_process/listData', { status: 1, roles: true }).then(res => {
+        this.activeKeyAll = []
+        if (res.success) {
+          var result = res.result || []
+          if (result.length > 0) {
+            this.activeKeyAll = result
+            // this.activeKeyAll.push.apply(this.activeKeyAll,result);
+            // console.log(this.activeKeyAll)
+            // console.log('OA 4个按钮被渲染')
+          }
+        }
+      })
+    },
 
+    // 公告数据
+    getAnnList() {
+      enterpriseEList(null).then(res => {
+        // console.log('>>>>', res)
+        if (res.success) {
+          this.annList = res.result.records ||[]
+        // =type: this.annList.type
+          console.log('----->', this.annList)
+        }
+      })
+    },
     handleEvents(info) {
       // console.log('what', info)
       // 打印了事件（完成、位置）
@@ -505,35 +507,6 @@ export default {
     },
     ...mapGetters(['nickname', 'avatar']),
 
-    // 代办数据
-    getDataList() {
-      this.loading = true
-      this.postFormAction('/actTask/todoList', {}).then(res => {
-        this.loading = false
-        if (res.success) {
-          this.todoList = res.result || []
-          console.log('首页 我的待办数字：', this.todoList.length)
-          this.total = this.data.leading
-          console.log('系统消息:',this.data)
-        }
-      })
-    },
-    // 获取 OA 按钮
-    getActiveKeyAll() {
-      this.postFormAction('/activiti_process/listData', { status: 1, roles: true }).then(res => {
-        this.activeKeyAll = []
-        if (res.success) {
-          var result = res.result || []
-          if (result.length > 0) {
-            this.activeKeyAll = result
-            // this.activeKeyAll.push.apply(this.activeKeyAll,result);
-            // console.log(this.activeKeyAll)
-            console.log('OA 4个按钮被渲染')
-          }
-        }
-      })
-    },
-
     //OA图标点击事件
     aClick(v) {
       console.log(v)
@@ -580,6 +553,10 @@ export default {
     // 去处理按钮
     toDealWith() {
       this.$router.push({ path: '/activiti/todoManage' })
+    },
+    prev() {
+      this.calendarApi.prev()
+      console.log(this.calendarApi.prev)
     }
   }
 }
@@ -749,7 +726,7 @@ a {
   // 公告
   .news {
     .newsColItem {
-      height: 300px;
+      height: 400px;
     }
     .notice {
       ul {
@@ -763,12 +740,12 @@ a {
             .department {
               margin-right: 10px;
             }
-            .person {
+            .createBy {
               color: #333;
             }
-            .time {
+            .createTime {
               color: rgb(164, 164, 164);
-              margin: 0 4px 0 10px;
+              margin: 0 4px 0 20px;
             }
           }
           a:hover {
@@ -780,7 +757,6 @@ a {
     // 我的计划
     .plan {
       .total {
-        // border-bottom: 1px dashed #ccc;
         span {
           display: block;
           line-height: 40px;
@@ -791,21 +767,6 @@ a {
           }
         }
       }
-      // .tabsLinks {
-      //   margin-top: 20px;
-      //   a {
-      //     color: rgb(23, 119, 184);
-      //     margin: 0 6px;
-      //   }
-      //   a:hover {
-      //     color: #fa6b5c;
-      //   }
-      //   /deep/ .ant-divider,
-      //   .ant-divider-vertical {
-      //     width: 2px;
-      //     background-color: rgb(200, 200, 200);
-      //   }
-      // }
     }
     // 友情链接
     .link {

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

@@ -34,8 +34,8 @@
           </a-col>
         </a-row>
 
-        <!-- 创建人  时间  新增弹框-->
-        <div v-if="title=='新增企业公告'">
+        <!-- 创建人创建日期>>>>新增弹框-->
+        <div v-if="title == '新增企业公告'">
           <a-row :gutter="24">
             <a-col :span="12">
               <a-form-item label="创建人">
@@ -44,7 +44,6 @@
                   placeholder="系统回显"
                   disabled
                 />
-
               </a-form-item>
             </a-col>
 
@@ -60,14 +59,13 @@
                   @ok="createTimeOk"
                   v-decorator="['createTime', { rules: [{ required: false, message: '请选择紧创建日期' }] }]"
                 />
-
               </a-form-item>
             </a-col>
           </a-row>
         </div>
 
-        <!-- 编辑的弹框显示 -->
-        <div v-if="title=='编辑企业公告'">
+        <!-- 创建人创建日期>>>>编辑弹框 -->
+        <div v-if="title == '编辑企业公告'">
           <a-row :gutter="24">
             <a-col :span="12">
               <a-form-item label="创建人">
@@ -75,7 +73,6 @@
                   v-decorator="['createBy', { rules: [{ required: false, message: '请输入创建人' }] }]"
                   disabled
                 />
-
               </a-form-item>
             </a-col>
 
@@ -90,11 +87,27 @@
                   @ok="createTimeOk"
                   v-decorator="['createTime', { rules: [{ required: false, message: '请选择紧创建日期' }] }]"
                 />
-
               </a-form-item>
             </a-col>
           </a-row>
         </div>
+
+        <!-- 发布 -->
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="是否发布:">
+              <a-radio-group v-decorator="['isRelease', { rules: [{ required: true, message: '请选择是否发布' }] }]">
+                <a-radio value="0">
+                  仅存稿
+                </a-radio>
+                <a-radio value="1">
+                  发布
+                </a-radio>
+              </a-radio-group>
+            </a-form-item>
+          </a-col>
+        </a-row>
+
         <!-- 公告富文本 -->
         <a-row :gutter="24">
           <a-col :span="12">
@@ -129,8 +142,8 @@ export default {
             title: ''
         }
     },
-    props: {
     // 接收父组件查询公告的方法
+    props: {
         fatherGetList: {
             type: Function,
             default: null
@@ -141,26 +154,25 @@ export default {
     methods: {
     // 回显表单
         getAnnFormInfo (e) {
-            // console.log('弹框拿到编辑项ID', this.annInfo.id)
             this.$nextTick(() => {
+                // 判断是否回显(创建人、创建日期)
                 if (this.title == '新增企业公告') {
                     this.addAnnForm.setFieldsValue({
                         title: this.annInfo.title,
                         type: this.annInfo.type,
-                        isRelease: this.isRelease
+                        isRelease: this.annInfo.isRelease
                     })
                 } else {
                     this.addAnnForm.setFieldsValue({
                         title: this.annInfo.title,
                         type: this.annInfo.type,
-                        isRelease: this.isRelease,
+                        isRelease: this.annInfo.isRelease,
+                        // --编辑  回显时间
                         createBy: this.annInfo.createBy,
                         createTime: moment(this.annInfo.createTime, 'YYYY-MM-DD HH:mm:ss')
-
                     })
                 }
                 this.$refs.JEditor.myValue = this.annInfo.content
-                // console.log('回显完成，保存按钮判断是否编辑')
             })
         },
 
@@ -168,17 +180,17 @@ export default {
         handleOk () {
             this.addAnnForm.validateFields((err, vals) => {
                 if (!err && this.$refs.JEditor.myValue !== '') {
+                    console.log('>>>>>>', vals)
                     var news = {}
                     news.title = vals.title
                     news.type = vals.type
                     news.createBy = vals.createBy
-                    news.createTime = vals.createTime.format('YYYY-MM-DD HH:mm:ss')
+                    // news.createTime = vals.createTime.format('YYYY-MM-DD HH:mm:ss')
                     news.isRelease = vals.isRelease
                     news.content = this.$refs.JEditor.myValue
                     // 编辑--------------------------------------
                     if (this.annInfo.id) {
                         news.id = this.annInfo.id
-                        // console.log('>>>>>', this.annInfo.createTime)
                         console.log('这是修改')
                         enterpriseEUpdate(news).then(res => {
                             if (res.success) {

src/views/oa/enterpriseAnnouncement.vue

@@ -21,7 +21,7 @@
 
     <!-- 新增 批量删除 -->
     <div class="table-add">
-      <a-button @click="addOpen" type="primary">新增</a-button>
+      <a-button @click="addAnn" type="primary">新增</a-button>
       <!-- 批量操作-----------------------------------
         v-if="selectedRowKeys.length > 0"
       ------------------------------------------------>
@@ -62,10 +62,27 @@
           <!-- 操作 -->
           <span slot="operationSlot" slot-scope="text, record">
             <a href="javascript:void(0);" @click="editAnn(record)"> 编辑 </a>
-            <a-divider type="vertical" />
-            <a-popconfirm title="确定发布吗？" ok-text="是" cancel-text="否">
-              <a href="javascript:void(0);" @click="sendAnn(record.id)" class="sendGr"> 发布 </a>
+
+            <a-divider type="vertical" v-if="record.isRelease == '0'"/>
+            <a-popconfirm v-if="record.isRelease == '0'" title="确定发布吗？" @confirm="sendAnn(record.id)" ok-text="是" cancel-text="否">
+              <a href="javascript:void(0);" class="sendGr"> 发布 </a>
+            </a-popconfirm>
+
+            <a-divider type="vertical" v-if="record.isRelease == '1'"/>
+            <a-popconfirm v-if="record.isRelease == '1'" title="确定撤销发布吗？" ok-text="是" cancel-text="否">
+              <a href="javascript:void(0);" @click="save(record.id)" class="sendGr"> 取消发布 </a>
             </a-popconfirm>
+            <!-- 判断显示 发布 or 存稿 -->
+            <!-- <div v-if="record.isRelease == '0'">
+              <a-popconfirm title="确定发布吗？" ok-text="是" cancel-text="否">
+                <a href="javascript:void(0);" @click="sendAnn(record.id)" class="sendGr"> 发布 </a>
+              </a-popconfirm>
+              <div v-if="record.isRelease == '1'">
+                <a-popconfirm title="确定撤销发布吗？" ok-text="是" cancel-text="否">
+                  <a href="javascript:void(0);" @click="save(record.id)" class="sendGr"> 仅存稿 </a>
+                </a-popconfirm>
+              </div>
+            </div> -->
 
             <a-divider type="vertical" />
 
@@ -83,7 +100,7 @@
 
 <script>
 import AddAnnModal from '@views/oa/enter-ann/add/addAnnModal.vue'
-import { enterpriseEList, enterpriseEQueryById } from '@api/oa/cd-enterprise-announcement'
+import { enterpriseEList, enterpriseEQueryById, enterpriseEReleseUpdate } from '@api/oa/cd-enterprise-announcement'
 export default {
     name: 'EnterpriseAnnouncement', // 企业公告
 
@@ -94,7 +111,6 @@ export default {
         return {
             id: '', // 唯一标识 双休绑定后自动生成，删除
             loading: false, // 表格加载
-            queryParam: {}, // 查询条件对象
             // 表头
             columns: [
                 {
@@ -132,11 +148,15 @@ export default {
                 }
             ],
             annList: [], // 公告数据
-            pagination: {}, // 分页
+            pagination: {
+                total: 0,
+                current: 0,
+                pageSize: 0
+            }, // 分页
             showInfo: {}, // 编辑时回显的公告数据
-            // 查询接口的查询条件
-            whichOne: {
-                pageNo: 1,
+            // 查询条件
+            queryParam: {
+                pageNo: '1',
                 title: ''
             }
         }
@@ -145,48 +165,48 @@ export default {
         this.getAnnList() // 渲染公告
     },
     methods: {
-    // 查询日程计划列表
+    // 查询日程计划列表(根据参数不同，传递对应的数据)
         getAnnList () {
-            enterpriseEList(this.whichOne).then(res => {
+            enterpriseEList(this.queryParam).then(res => {
+                // console.log('>>>>', this.queryParam)
+                // 无查询条件情况下  全部数据
                 if (res.success) {
                     this.annList = res.result.records
-                    console.log('当前页数据', this.annList)
+                    // console.log('当前页数据', this.annList)
                     this.pagination = {
                         total: res.result.total,
                         current: res.result.current,
                         pageSize: res.result.size
                     }
-                    // console.log(this.pagination)
                 }
             })
         },
+        // 查询按钮
+        searchQuery () {
+            this.getAnnList() // 渲染公告
+        },
 
         // 新增 按钮
-        addOpen () {
+        addAnn () {
             console.log('点击新增，负责打开弹框，剩下功能在子组件的保存按钮')
+            console.log('0000')
             this.$refs.AddAnnModal.addModalVisible = true
             this.$refs.AddAnnModal.title = '新增企业公告'
         },
         // 点击编辑  回显
         editAnn (obj) {
-            console.log('负责打开编辑弹框，剩下功能在子组件的保存按钮')
+            console.log('打开编辑弹框，剩下功能在子组件的保存按钮')
             this.$refs.AddAnnModal.addModalVisible = true
             this.$refs.AddAnnModal.title = '编辑企业公告'
             // 根据id查询公告
             enterpriseEQueryById({ id: obj.id }).then(res => {
                 if (res.success) {
                     console.log(res)
+                    this.$refs.AddAnnModal.annInfo = res.result
+                    this.$refs.AddAnnModal.getAnnFormInfo()
                 }
             })
-            this.$refs.AddAnnModal.annInfo = obj
-            this.$refs.AddAnnModal.getAnnFormInfo()
         },
-        // 查询按钮
-        searchQuery () {
-            // this.loading = true
-        },
-        // 重置
-        reset () {},
 
         // 批量删除
         batchDel () {},
@@ -197,13 +217,17 @@ export default {
         // 分页、排序、筛选变化时触发
         handleTableChange (pagination, filters, sorter) {
             // console.log('当前页信息>>>>',pagination)
-            this.whichOne.pageNo = pagination.current
+            this.queryParam.pageNo = pagination.current
             this.getAnnList()
         },
 
         // 发布
         sendAnn (id) {
             console.log('点击了发布')
+            // 接口
+            enterpriseEReleseUpdate({ id: id, isRelease: '1' }).then(res => {
+                console.log(res)
+            })
         },
         // 撤销
         backAnn (id) {

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

@@ -172,12 +172,12 @@ export default {
             savePlanModalVisible: false,
             formLayout: 'horizontal',
             addForm: this.$form.createForm(this, { name: 'coordinated' }),
-            checked: true,
             formData: {}, // 表单数据(回显)
             timeList: [], // 开始/结束时间集合
             isDate: false, // 默认无时分秒
             smallText: '', // 富文本内容
             title: '' // 弹框头部
+            // checked: true,
         }
     },
     props: {
@@ -202,7 +202,7 @@ export default {
     computed: {},
     mounted () {},
     methods: {
-        // 回显表单的赋值
+    // 回显表单的赋值
         getFormInfo (e) {
             console.log('点击日程ID>>', this.formData.id)
             this.$nextTick(() => {

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

@@ -11,12 +11,8 @@
           </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 v-model="queryParam.type" placeholder="请选择类型">
+                <a-select-option value="">请选择</a-select-option>
                 <a-select-option value="日常记录">日常记录</a-select-option>
                 <a-select-option value="本周工作">本周工作</a-select-option>
                 <a-select-option value="下周计划">下周计划</a-select-option>
@@ -24,7 +20,6 @@
             </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>
@@ -72,41 +67,39 @@
       </a-dropdown>
     </div>
 
-    <!-- table 开始-->
-    <a-alert type="info" showIcon style="margin-bottom: 16px;">
-      <template slot="message">
-        <span>已选择</span>
-        <!-- {{ selectedRowKeys.length }} -->
-        <a style="font-weight: 600;padding: 0 4px;">0</a>
-        <span>项</span>
-        <!--  v-if="selectedRowKeys.length>0" -->
-        <template>
-          <a-divider type="vertical" />
-          <a @click="onClearSelected">清空</a>
-        </template>
-      </template>
-    </a-alert>
+    <div>
+      <!-- {{ selectedRowKeys.length }} -->
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择
+        <a style="font-weight: 600">0</a
+        >项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <!-- { selectedRowKeys: selectedRowKeys, onChange: onSelectChange }  :rowSelection="rowSelection"-->
 
-    <!-- :scroll="scroll"-->
-    <a-table
-      bordered
-      :columns="columns"
-      :dataSource="planList"
-      :pagination="pagination"
-      :rowKey="record => record.id"
-      :rowSelection="rowSelection"
-      @change="handleTableChange"
-      style="height:100%"
-    >
-      <!-- 操作 -->
-      <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-table
+        ref="table"
+        bordered
+        :columns="columns"
+        :dataSource="planList"
+        :pagination="pagination"
+        :rowKey="record => record.id"
+        :row-selection="rowSelection"
+        @change="handleTableChange"
+        style="height:100%"
+      >
+        <!-- 操作 -->
+        <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-table> -->
+    </div>
     <!-- table 结束-->
 
     <save-plan ref="savePlan" :calTableMethod="getplanList"></save-plan>
@@ -125,13 +118,17 @@ export default {
     data () {
         return {
             tokenHeader: {},
-            queryParam: {}, // 查询条件对象
             pagination: {
                 total: 0,
                 current: 0,
                 pageSize: 0
             }, // 分页
             planList: [], // 列表数据
+            queryParam: {
+                pageNo: 1, // 当前页
+                title: '', //
+                type: ''
+            }, // 查询条件对象
             // 表头
             columns: [
                 {
@@ -165,58 +162,39 @@ export default {
                     scopedSlots: { customRender: 'operationSlot' },
                     align: 'center'
                 }
-            ],
-            // 查询接口的查询条件
-            whichOne: {
-                pageNo: 1, // 当前页
-                title: ''// 假定搜索栏搜索条件
-            }
+            ]
+            // selectedRowKeys: ''
         }
     },
     computed: {
-    // 选择功能的配置
         rowSelection () {
             return {
-                // 选中项发生变化时的回调
                 onChange: (selectedRowKeys, selectedRows) => {
-                    console.log('勾选项的id:', selectedRowKeys)
-                    console.log('勾选项对象数组:', selectedRows)
+                    console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows)
                 },
-                // 选择框的默认属性配置
                 getCheckboxProps: record => ({
                     props: {
-                        disabled: record.title === 'Disabled User',
-                        // Column configuration not to be checked
-                        title: record.title
+                        disabled: record.name === 'Disabled User', // Column configuration not to be checked
+                        name: record.name
                     }
                 })
             }
         }
-    // scroll: function () {
-    //     var width = window.innerWidth
-    //     // ant-table
-    //     let $antTable = window.document.getElementsByClassName('ant-table')
-    //     if ($antTable[0]) {
-    //         width = $antTable[0].clientWidth
-    //     }
-    //     return {
-    //         x: 1160,
-    //         y: window.innerHeight / 2
-    //     }
-    // }
     },
     created () {
         this.getplanList()
     },
     methods: {
-    // 分页查询 日程列表
+
+        // 分页查询 日程列表
         getplanList () {
-            scheduleList(this.whichOne).then(res => {
+            scheduleList(this.queryParam).then(res => {
+                console.log('>>>>', this.queryParam)
                 if (res.success) {
-                    // console.log(res)
                     this.planList = res.result.records // 结果赋值给 planList
-                    console.log('当前页数据', this.planList)
-                    this.pagination = { // 分页信息赋值
+                    // console.log('当前页数据', this.planList)
+                    this.pagination = {
+                        // 分页信息赋值
                         total: res.result.total,
                         current: res.result.current,
                         pageSize: res.result.size
@@ -224,6 +202,35 @@ export default {
                 }
             })
         },
+        // 选择功能的配置
+        // rowSelection1 () {
+        //     return {
+        //         // 选中项发生变化时的回调
+        //         onChange: (selectedRowKeys, selectedRows) => {
+        //             console.log('勾选项的id:', selectedRowKeys)
+        //             console.log('勾选项对象数组:', selectedRows)
+        //         },
+        //         // 选择框的默认属性配置
+        //         getCheckboxProps: record => ({
+        //             props: {
+        //                 disabled: record.title === 'Disabled User',
+        //                 // Column configuration not to be checked
+        //                 title: record.title
+        //             }
+        //         })
+        //     }
+        // },
+        // 查询按钮
+        searchQuery () {
+            this.getplanList()
+        },
+        // 重置 输入的查询条件
+        searchReset () {
+            console.log('>>>>重置')
+            this.queryParam.title = ''
+            this.queryParam.type = ''
+            this.getplanList()
+        },
 
         // 新增日程计划   弹框
         addPlan () {
@@ -233,7 +240,7 @@ export default {
         },
         // 点击编辑  回显
         editPlan (obj) {
-            console.log('编辑，负责打开弹框 剩下功能在子组件的回显方法')
+            console.log('打开编辑弹框 剩下功能在子组件的回显方法')
             this.$refs.savePlan.savePlanModalVisible = true
             this.$refs.savePlan.title = '编辑日程计划列表'
             // 根据id查询日程
@@ -248,20 +255,15 @@ export default {
         // 分页、排序、筛选变化时触发
         handleTableChange (pagination, filters, sorter) {
             // console.log('当前页信息>>>>',pagination)
-            this.whichOne.pageNo = pagination.current
+            if (Object.keys(sorter).length > 0) {
+                this.isorter.column = sorter.field
+                this.isorter.order = sorter.order == 'ascend' ? 'asc' : 'desc'
+            }
+            this.queryParam.pageNo = pagination.current
             this.getplanList()
         },
         // 操作 删除
         delPlan () {},
-        // ------------------------------------------
-        // 查询按钮
-        searchQuery () {
-            // this.loading = true
-            console.log('点击了查询按钮')
-            // 根据
-        },
-        // 重置 输入的查询条件
-        searchReset () {},
 
         // 清空勾选
         onClearSelected () {},
@@ -271,7 +273,6 @@ export default {
         myPlanImportExcel () {},
         // 批量删除
         batchDel () {}
-
     }
 }
 </script>