From 3f55c5bbcdc0aeba7a62536ce6bb4601b18f4359 Mon Sep 17 00:00:00 2001
From: kilo <wan.ren@foxmail.com>
Date: Fri, 4 Nov 2022 18:07:20 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5+=E6=93=8D=E4=BD=9C=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/HomePage.vue              | 135 +++++++++++-------
 .../operationlog/ProcessOperationLogList.vue  |   3 -
 .../ProcessSuppliesStrongerLists.vue          |   6 -
 src/views/waste/ProcessWasteList.vue          |   3 -
 4 files changed, 85 insertions(+), 62 deletions(-)

diff --git a/src/views/dashboard/HomePage.vue b/src/views/dashboard/HomePage.vue
index df0f842..25618f6 100644
--- a/src/views/dashboard/HomePage.vue
+++ b/src/views/dashboard/HomePage.vue
@@ -1,27 +1,37 @@
 <template>
   <div style="height: 740px;">
     <div style="width: 100% ;height: 100%;">
-
       <div style="display: flex;align-items: center;justify-content: stretch;width: 100%;height: 50%">
-
         <!--待办任务-->
         <div class="top-div" style="width: 33%;">
-          <a-card class="div-card" title="待办" style="overflow: hidden" >
-            <ul class="ul-li" style="width: 100%; list-style-type:none;padding-left: 0px;" v-show="showDate.showDate">
-              <!--这里可以用for循环-->
-              <!--用于存放从数据库中查出来的信息并对其进行循环-->
-              <li v-for="(task,index) in tasks " style="width: 100%;">
-                <!--类型-->
-                <a-button class="ant-col-md-4" type="primary" style="width: 80px;height: 25px;">{{task.type}}</a-button>
-                <span class="ant-col-md-10" :title='task.message' style="padding-left: 10%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;line-height: 25px;">
-                    {{task.message}}
-                  </span>
-                <span class="ant-col-md-10" :title='task.time' style="padding-left: 10%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;text-align: right; line-height: 25px;">
-                    {{task.time}}
-                  </span>
-              </li>
-
-            </ul>
+          <a-card class="div-card" title="待办" style="overflow: hidden" extra="刷新" @click="todoList">
+            <a-table
+              class="j-table-force-nowrap"
+              rowKey="id"
+              :loading="loading"
+              :show-header="false"
+              :columns="columns"
+              :dataSource="tasks"
+              :pagination="true"
+            ></a-table>
+<!--            <ul class="ul-li" style="width: 100%; list-style-type:none;padding-left: 0px;">-->
+<!--              &lt;!&ndash;这里可以用for循环&ndash;&gt;-->
+<!--              &lt;!&ndash;用于存放从数据库中查出来的信息并对其进行循环&ndash;&gt;-->
+<!--              <li v-for="(task,index) in tasks.slice(0,8)" :key="index" style="width: 100%;">-->
+<!--                &lt;!&ndash;类型&ndash;&gt;-->
+<!--                <a-button class="ant-col-md-4" :title="task.title" type="primary"-->
+<!--                          style="width: 80px;height: 25px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;line-height: 25px;"-->
+<!--                          @click="gotodoList">-->
+<!--                  {{task.title}}-->
+<!--                </a-button>-->
+<!--                <span class="ant-col-md-10" :title='task.processName' style="padding-left: 10%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;line-height: 25px;">-->
+<!--                    关于{{task.processName}}的审批流程-->
+<!--                </span>-->
+<!--                <span class="ant-col-md-10" :title='task.createTime' style="padding-left: 10%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;text-align: right; line-height: 25px;">-->
+<!--                    {{task.createTime}}-->
+<!--                  </span>-->
+<!--              </li>-->
+<!--            </ul>-->
           </a-card>
         </div>
 
@@ -86,20 +96,38 @@
 
 <script>
 
+import { getAction } from '@api/manage'
+import { JVXETypes } from '@/components/jeecg/JVxeTable/index'
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import { mixinDevice } from '@/utils/mixin'
+
+
 export default {
   name: 'HomePage',
-
+  components:{
+    JVXETypes,
+  },
   data() {
     return {
-      //获取信息的地址
-      showDate: {
-        noDate: true ,
-        showDate: false,
-      },
       url: {
-
+        todoManger: '/actTask/todoList'
       },
-      //此处存放数据,如果有数据就在待办任务处显示(现未写查询逻辑)
+
+      columns:[
+        {
+          align:"left",
+          dataIndex: 'title',
+        },
+        {
+          align:"left",
+          dataIndex: 'processName',
+        },
+        {
+          align:"center",
+          dataIndex: 'createTime',
+        }
+      ],
+      loading:true,
       tasks:[],
       loginlogs:[
         {
@@ -118,14 +146,22 @@ export default {
   },
 
   created() {
-    // this.searchDoneData();
-    // //当页面第一次生成时对进行tasks进行查询如果有数据则显示待办任务
-    // //如果没有则显示暂无待办任务
-    this.toBeDoneData();
+    this.todoList();
   },
 
 
   methods: {
+    todoList(){
+      getAction(this.url.todoManger).then((res) => {
+        if (res.success) {
+          this.loading = false
+          this.tasks = res.result
+          console.log(res.result)
+        }
+      })
+
+    },
+
     // 跳转地址
     processManage(){
       this.$router.push('/activiti/applyHome')
@@ -149,25 +185,7 @@ export default {
     searchDoneData(){
       // 待添加
     },
-    // 判断是否有待办任务数据
-    toBeDoneData(){
-      this.tasks = [
-        {
-        type: "流程审批",
-        message: "关于帐外物资的xxxx的审批流程",
-        time: "2002.20.20 10:10:20"
-        },
-        {
-          type: "流程审批",
-          message: "关于帐外物资的xxxx的审批流程",
-          time: "2002.20.20 10:10:20"
-        }
-      ]
-      if (this.tasks != null){
-        this.showDate.noDate = false;
-        this.showDate.showDate = true;
-      }
-    },
+
 
   }
 }
@@ -177,6 +195,23 @@ export default {
 @import url("http://at.alicdn.com/t/c/font_3733417_ws9m9bvag1h.css");
 
 
+/deep/.ant-table-tbody .ant-table-row td{
+  padding: 3% 0 0 0;
+}
+/deep/.ant-table-tbody > tr > td {
+
+   border-bottom: 0px;
+  font-weight: 400;
+}
+/deep/.ant-table-tbody > tr:hover>td {
+  cursor: pointer;
+  color: #1890FF;
+  background-color:white !important;
+}
+
+/deep/.ant-table-tbody > tr:hover{
+  background: white;
+}
 .top-div {
   height: 100%;
 }
@@ -189,7 +224,7 @@ export default {
 }
 
 .ul-li li{
-  margin-top: 10px;
+  margin-top: 12px;
   display: inline-flex;
   font-weight: bold;
 }
diff --git a/src/views/operationlog/ProcessOperationLogList.vue b/src/views/operationlog/ProcessOperationLogList.vue
index 00311d1..8a6b2b5 100644
--- a/src/views/operationlog/ProcessOperationLogList.vue
+++ b/src/views/operationlog/ProcessOperationLogList.vue
@@ -96,9 +96,6 @@
             title:'操作时间',
             align:"center",
             dataIndex: 'operationDate',
-            customRender:function (text) {
-              return !text?"":(text.length>10?text.substr(0,10):text)
-            }
           }
         ],
         url: {
diff --git a/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue b/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
index 771f6d2..2ed5e67 100644
--- a/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
+++ b/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
@@ -249,9 +249,6 @@
             title:'生产时间',
             align:"center",
             dataIndex: 'productionTime',
-            customRender:function (text) {
-              return !text?"":(text.length>10?text.substr(0,10):text)
-            }
           },
           {
             title:'保质期',
@@ -272,9 +269,6 @@
             title:'入库时间',
             align:"center",
             dataIndex: 'createTime',
-            customRender:function (text) {
-              return !text?"":(text.length>10?text.substr(0,10):text)
-            }
           },
           {
             title:'入库人',
diff --git a/src/views/waste/ProcessWasteList.vue b/src/views/waste/ProcessWasteList.vue
index 704ecf1..ab977c2 100644
--- a/src/views/waste/ProcessWasteList.vue
+++ b/src/views/waste/ProcessWasteList.vue
@@ -197,9 +197,6 @@
             title:'报废日期',
             align:"center",
             dataIndex: 'scrapDate',
-            customRender:function (text) {
-              return !text?"":(text.length>10?text.substr(0,10):text)
-            }
           }
         ],
         url: {