[待办事项] 列表 布局调整

src/views/activiti/todoManage.vue

@@ -41,27 +41,27 @@
             @change="handleTableChange"
             ref="table"
           >
-            <a-table-column title="#" :width="50" align="center">
+            <a-table-column title="#" width="5%" align="center">
               <template slot-scope="t, r, i">
                 <span> {{ i + 1 }} </span>
               </template>
             </a-table-column>
-            <a-table-column title="任务名称" dataIndex="name" :width="200" align="center">
+            <a-table-column title="任务名称" dataIndex="name" width="10%" align="center">
               <template slot-scope="t">
                 <span> {{ t }} </span>
               </template>
             </a-table-column>
-            <a-table-column title="所属流程" dataIndex="processName" :width="150" align="center">
+            <a-table-column title="所属流程" dataIndex="processName" width="8%" align="center">
               <template slot-scope="t">
                 <span> {{ t }} </span>
               </template>
             </a-table-column>
-            <a-table-column title="委托代办人" dataIndex="owner" align="center" :width="150">
+            <a-table-column title="委托代办人" dataIndex="owner" align="center" width="8%">
               <template slot-scope="t">
                 <span> {{ t }} </span>
               </template>
             </a-table-column>
-            <a-table-column title="流程发起人" dataIndex="applyer" :width="150" align="center">
+            <a-table-column title="流程发起人" dataIndex="applyer" width="8%" align="center">
               <template slot-scope="t">
                 <span> {{ t }} </span>
               </template>
@@ -71,7 +71,7 @@
             <a-table-column
               title="优先级"
               dataIndex="priority"
-              :width="150"
+              width="10%"
               align="center"
               key="so"
               :sorter="(a, b) => a.priority - b.priority"
@@ -88,7 +88,7 @@
             <a-table-column
               title="状态"
               dataIndex="isSuspended"
-              :width="150"
+              :width="100"
               align="center"
               key="z"
               :sorter="(a, b) => (Boolean(a.isSuspended) ? 0 : 1 - Boolean(b.isSuspended) ? 0 : 1)"
@@ -98,7 +98,7 @@
                 <a-tag color="orange" v-if="Boolean(t)">已挂起</a-tag>
               </template>
             </a-table-column>
-            <a-table-column title="创建时间" dataIndex="createTime" :width="220" align="center">
+            <a-table-column title="创建时间" dataIndex="createTime" width="20%" align="center">
               <template slot-scope="t">
                 <span>{{ t }}</span>
               </template>

src/views/dashboard/MyToDo.vue

@@ -178,7 +178,7 @@ import interactionPlugin from '@fullcalendar/interaction'
 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 { scheduleGetListByTime, scheduleQueryById, scheduleGetLastMonth } from '@api/oa/cd-schedule'
 import { enterpriseEQueryById } from '@api/oa/cd-enterprise-announcement'
 import { enterpriseEList } from '@api/oa/cd-enterprise-announcement'
 import '@fullcalendar/daygrid/main.css'
@@ -316,6 +316,7 @@ export default {
     this.getAnnList() //渲染公告(已发布)
     this.getFooterNav() // 获取快捷导航
     this.getMyLinks() //友情链接(已发布)
+    this.getMyLastM() //上月我计划
   },
   computed: {
     // 系统消息计算
@@ -344,9 +345,16 @@ export default {
     this.getAnnList()
   },
   methods: {
+    // 上月我计划
+    async getMyLastM() {
+      //    createBy:'' ,人员账号(不传则查询全部人员)
+      //    whereTimeType:'',时间类型（0无时间筛选1查询上月的2本月）
+      await scheduleGetLastMonth({ createBy: '', whereTimeType: '1' }).then(res => {
+        console.log('我的上月计划res', res)
+      })
+    },
     // 友情链接跳转
     openItemLink(e) {
-      console.log('e????', e)
       window.open(e.link, '_blank') //新窗口打开
       console.log('e.link', e.link)
     },
@@ -360,7 +368,7 @@ export default {
       })
     },
 
-    // 获取快捷菜单
+    // 获取底部快捷菜单
     async getFooterNav() {
       await getListByCreateBy().then(res => {
         if (res.success) {
@@ -459,9 +467,9 @@ export default {
     },
 
     // 代办数据
-    getDataList() {
+    async getDataList() {
       this.loading = true
-      this.postFormAction('/actTask/todoList', {}).then(res => {
+      await this.postFormAction('/actTask/todoList', {}).then(res => {
         this.loading = false
         if (res.success) {
           this.todoList = res.result || []
@@ -473,8 +481,8 @@ export default {
     },
 
     // 获取 OA 按钮
-    getActiveKeyAll() {
-      this.postFormAction('/activiti_process/listData', { status: 1, roles: true }).then(res => {
+  async  getActiveKeyAll() {
+     await this.postFormAction('/activiti_process/listData', { status: 1, roles: true }).then(res => {
         this.activeKeyAll = []
         if (res.success) {
           var result = res.result || []