From bd41039fa8959bacf7c9f03d4f6a23656fe7305a Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 19 Jun 2025 03:11:42 +0800
Subject: [PATCH] md

---
 src/permission.js                             |  2 +-
 src/router/index.js                           |  8 ++
 src/views/oms/dashboard.vue                   | 12 +--
 .../oms/emisWaybill/SendOrderbillList.vue     | 76 +++++++++++++------
 4 files changed, 67 insertions(+), 31 deletions(-)

diff --git a/src/permission.js b/src/permission.js
index 19b69e2..4787ad4 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -10,7 +10,7 @@ import getPageTitle from '@/utils/get-page-title'
 
 NProgress.configure({ showSpinner: false })
 
-const whiteList = ['/login', '/auth-redirect', '/bind', '/register','/tools','/loginBySSO','/queryTraceInfo','/onlineChat']
+const whiteList = ['/login', '/auth-redirect', '/bind', '/register','/tools','/loginBySSO','/queryTraceInfo','/onlineChat','onlinePay']
 
 router.beforeEach(async(to, from, next) => {
   NProgress.start()
diff --git a/src/router/index.js b/src/router/index.js
index ec8227a..59e65c5 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -57,6 +57,14 @@ export const constantRoutes = [
       title:'轨迹查询'
     }
   },
+  {
+    path: '/onlinePay',
+    component: () => import('@/views/openpage/onlinePay'),
+    hidden: true,
+    meta:{
+      title:'在线支付'
+    }
+  },
   {
     path: '/onlineChat',
     component: () => import('@/views/openpage/onlineChat'),
diff --git a/src/views/oms/dashboard.vue b/src/views/oms/dashboard.vue
index 91a3b63..f0236d9 100644
--- a/src/views/oms/dashboard.vue
+++ b/src/views/oms/dashboard.vue
@@ -78,13 +78,13 @@
                           <el-row>
                             <el-col :span="4" style="    border-right: 1px solid #ebebeb;">
                                   <div class="count">
-                                      <span @click="goRouter('/OrderMgnt/SendOrderbillList',{statQueryType:1})">{{ omsOrderState.issueCount }}</span>
+                                      <span @click="goRouter('/OrderMgnt/SendOrderbillList',{action:'queryOrderList',statQueryType:1})">{{ omsOrderState.issueCount }}</span>
                                   </div>
                                   <div class="title" style="color:red">异常件</div>
                               </el-col>
                               <el-col :span="4">
                                   <div class="count">
-                                      <span @click="goRouter('/OrderMgnt/SendOrderbillList',{})">{{ omsOrderState.totalCount }}</span>
+                                      <span @click="goRouter('/OrderMgnt/SendOrderbillList',{action:'queryOrderList'})">{{ omsOrderState.totalCount }}</span>
                                   </div>
                                   <div class="title">总订单量</div>
                               </el-col>
@@ -96,25 +96,25 @@
                               </el-col> -->
                               <el-col :span="3">
                                   <div class="count">
-                                      <span @click="goRouter('/OrderMgnt/SendOrderbillList',{statQueryType:3})">{{ omsOrderState.waitGotCount }}</span>
+                                      <span @click="goRouter('/OrderMgnt/SendOrderbillList',{action:'queryOrderList',statQueryType:3})">{{ omsOrderState.waitGotCount }}</span>
                                   </div>
                                   <div class="title">待接单</div>
                               </el-col>
                               <el-col :span="3">
                                   <div class="count">
-                                      <span @click="goRouter('/OrderMgnt/SendOrderbillList',{statQueryType:4})">{{ omsOrderState.transCount }}</span>
+                                      <span @click="goRouter('/OrderMgnt/SendOrderbillList',{action:'queryOrderList',statQueryType:4})">{{ omsOrderState.transCount }}</span>
                                   </div>
                                   <div class="title">运输中</div>
                               </el-col>
                               <el-col :span="3">
                                   <div class="count">
-                                      <span @click="goRouter('/OrderMgnt/SendOrderbillList',{statQueryType:5})">{{ omsOrderState.dispatchCount }}</span>
+                                      <span @click="goRouter('/OrderMgnt/SendOrderbillList',{action:'queryOrderList',statQueryType:5})">{{ omsOrderState.dispatchCount }}</span>
                                   </div>
                                   <div class="title">派送中</div>
                               </el-col>
                               <el-col :span="4">
                                   <div class="count">
-                                      <span @click="goRouter('/OrderMgnt/SendOrderbillList',{statQueryType:6})">{{ omsOrderState.signCount }}</span>
+                                      <span @click="goRouter('/OrderMgnt/SendOrderbillList',{action:'queryOrderList',statQueryType:6})">{{ omsOrderState.signCount }}</span>
                                   </div>
                                   <div class="title">已签收</div>
                               </el-col>
diff --git a/src/views/oms/emisWaybill/SendOrderbillList.vue b/src/views/oms/emisWaybill/SendOrderbillList.vue
index 1dcf5b2..5fdc995 100644
--- a/src/views/oms/emisWaybill/SendOrderbillList.vue
+++ b/src/views/oms/emisWaybill/SendOrderbillList.vue
@@ -615,8 +615,7 @@ import clip from '@/utils/clipboard'
 import ElImageViewer from 'element-ui/packages/image/src/image-viewer'
 
 export default {
-  name: "SendWaybillList",
-  // name: "DispatchWaybillList",
+  name: "SendOrderbillList",
 
   components: {
     ElImageViewer,
@@ -852,30 +851,59 @@ export default {
       },
     };
   },
+  watch: {
+      $route () {
+	      if(this.$route.query.action=='queryOrderList'){
+          let statQueryType=this.$route.query.statQueryType;
+          if(statQueryType==1){
+            this.queryParams.blIsQuestion=1;
+          }
+          else if(statQueryType==3){
+            this.queryParams.orderStatus='0';
+          }
+          else if(statQueryType==4){
+            this.queryParams.orderStatus='1';
+            this.queryParams.blSign=0;
+          }
+          else if(statQueryType==5){
+            this.queryParams.waybillStatus='40';
+            this.queryParams.blSign=0;
+          }
+          else if(statQueryType==6){
+            this.queryParams.blSign=1;
+          }
+          this.getList();
+	      }
+	    }
+  },
   created() {
-    const end = new Date()
-    const start = new Date()
-    start.setHours(0,0,0,0)
-    end.setHours(23,59,59,0)
-    this.dateRange=[timeFormat(start), timeFormat(end)]
 
-    let statQueryType=this.$route.query.statQueryType;
-    if(statQueryType==1){
-      this.queryParams.blIsQuestion=1;
-    }
-    else if(statQueryType==3){
-      this.queryParams.orderStatus='0';
-    }
-    else if(statQueryType==4){
-      this.queryParams.orderStatus='1';
-      this.queryParams.blSign=0;
-    }
-    else if(statQueryType==5){
-      this.queryParams.waybillStatus='40';
-      this.queryParams.blSign=0;
-    }
-    else if(statQueryType==6){
-      this.queryParams.blSign=1;
+
+    if(this.$route.query.action=='queryOrderList'){
+      let statQueryType=this.$route.query.statQueryType;
+      if(statQueryType==1){
+        this.queryParams.blIsQuestion=1;
+      }
+      else if(statQueryType==3){
+        this.queryParams.orderStatus='0';
+      }
+      else if(statQueryType==4){
+        this.queryParams.orderStatus='1';
+        this.queryParams.blSign=0;
+      }
+      else if(statQueryType==5){
+        this.queryParams.waybillStatus='40';
+        this.queryParams.blSign=0;
+      }
+      else if(statQueryType==6){
+        this.queryParams.blSign=1;
+      }
+    }else{
+      const end = new Date()
+      const start = new Date()
+      start.setHours(0,0,0,0)
+      end.setHours(23,59,59,0)
+      this.dateRange=[timeFormat(start), timeFormat(end)]
     }
 
     this.queryOrderType="1";