From 9c038ccc3e37f8c693512f68ef56f33b3a8417da Mon Sep 17 00:00:00 2001
From: wj <1285151836@qq.com>
Date: Thu, 16 Nov 2023 11:16:31 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue         | 24 +++++++++++++-------
 src/views/index.vue | 53 +++++++++++++++++++++++++++------------------
 2 files changed, 48 insertions(+), 29 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 2357de9..b96c037 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -19,19 +19,28 @@ export default  {
 }
 </script>
 <style>
-/* 自定义滚动条样式 */
+
+/* 滚动条样式 */
 ::-webkit-scrollbar {
-  width: 8px;
-  height: 8px;
+  width: 10px; /* 滚动条宽度 */
+  height: 10px; /* 滚动条高度 */
 }
 
+/* 滚动条轨道 */
+::-webkit-scrollbar-track {
+  background-color: #f5f5f5; /* 滚动条轨道颜色 */
+  border-radius: 25px; /* 滚动条轨道圆角 */
+}
+
+/* 滚动条滑块 */
 ::-webkit-scrollbar-thumb {
-  background-color: #909399;
-  border-radius: 4px;
+  background-color: #888; /* 滚动条滑块颜色 */
+  border-radius: 25px; /* 滚动条轨道圆角 */
 }
 
-::-webkit-scrollbar-track {
-  border-radius: 4px;
+/* 鼠标悬停时滚动条滑块颜色 */
+::-webkit-scrollbar-thumb:hover {
+  background-color: #555; /* 鼠标悬停时滚动条滑块颜色 */
 }
 
 .width-full{
@@ -60,7 +69,6 @@ export default  {
   padding: 0;
 }
 .el-table__body-wrapper{
-  height:inherit;
 }
 .d-block{
   display: block;
diff --git a/src/views/index.vue b/src/views/index.vue
index 5c95409..1a24732 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -74,7 +74,7 @@
       <el-card class="grid-item" body-style="padding:0px;height:100%">
         <div slot="header" class="header">
           <el-icon class="el-icon-s-management"/>
-          待办事项
+          待办事项{{ `(${todoCount}条)` }}
           <div class="fr">
             <el-button type="text" style="font-size: 15px;color: unset" @click="getSysMsgTodoList">
               <el-icon class="el-icon-refresh"/>
@@ -90,8 +90,9 @@
         <el-table
           v-loading="msgLoading"
           :data="msgList"
+          height="calc(100% - 45px)"
           stripe
-          style="width: 100%;height:calc(100% - 50px);margin-top: 10px">
+          style="">
           <el-table-column
             type="index"
             label="序号"
@@ -130,7 +131,7 @@
       <el-card class="grid-item" body-style="padding:0px;height:100%">
         <div slot="header" class="header">
           <el-icon class="el-icon-s-platform"/>
-          审核送货单
+          审核送货单{{ `(${orderTotal}条)` }}
           <div class="fr">
             <el-button type="text" style="font-size: 15px;color: unset" @click="getOrderList">
               <el-icon class="el-icon-refresh"/>
@@ -145,8 +146,8 @@
         <el-table
           v-loading="orderLoading"
           :data="orderList"
-          stripe
-          style="width: 100%;height:calc(100% - 50px);margin-top: 10px">
+          height="calc(100% - 45px)"
+          stripe>
           <el-table-column
             type="index"
             label="序号"
@@ -217,21 +218,13 @@ export default {
       certMsgCount: 0,
       // 待办==================================================
       msgLoading: false,
+      todoCount: 0,
       msgList: [],
-      msgQuery: {
-        page: 1,
-        limit: 5
-      },
       // =======================================================================
       // 单据==================================================
       orderLoading: false,
+      orderTotal: 0,
       orderList: [],
-      orderQuery: {
-        page: 1,
-        limit: 5,
-        status: 10,
-        vueType: "supDelivery",
-      }
       // =======================================================================
     };
   },
@@ -243,14 +236,14 @@ export default {
     this.getOrderList()
   },
   methods: {
-    getProductCount(){
+    getProductCount() {
       let param = {
         page: 1,
         limit: 1,
         addType: 1,
         filterType: 1
       }
-      getUdiInfos(param).then(res=>{
+      getUdiInfos(param).then(res => {
         this.productCount = res.data?.total || 0
       })
     },
@@ -265,7 +258,7 @@ export default {
         this.invMsgCount = res.data?.total || 0
       })
     },
-    getCertMsgCount(){
+    getCertMsgCount() {
       let param = {
         page: 1,
         limit: 1,
@@ -281,21 +274,34 @@ export default {
     },
     getSysMsgTodoList() {
       this.msgLoading = true
-      sysMsgTodoPage(this.msgQuery).then(res => {
+      let msgQuery = {
+        page: 1,
+        limit: 5
+      }
+      sysMsgTodoPage(msgQuery).then(res => {
         this.msgLoading = false
         if (res.code != 20000) {
           this.$message.error(res.message())
           return
         }
         this.msgList = res.data.list || []
+        this.todoCount = res.data.total || 0
       }).catch(e => {
+        this.$message.error(e.message)
         this.msgLoading = false
         this.msgList = []
+        this.todoCount = 0
       })
     },
     getOrderList() {
-      this.orderLoading = true;
-      getOrderList(this.orderQuery)
+      this.orderLoading = true
+      let orderQuery = {
+        page: 1,
+        limit: 5,
+        status: 10,
+        vueType: "supDelivery",
+      }
+      getOrderList(orderQuery)
         .then((res) => {
           this.orderLoading = false;
           if (res.code === 20000) {
@@ -345,6 +351,11 @@ export default {
     font-size: 20px;
     font-weight: bolder;
   }
+
+  .el-table {
+    margin-top: 10px;
+    width: 100%;
+  }
 }
 
 .grid-container {