From cf67862dba2ab40e1fe5dad9b0605fb164f210ab Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 17 Dec 2024 10:34:05 +0800
Subject: [PATCH] md

---
 src/views/emis/dashboard.vue                  | 61 +++++++++++++++++++
 .../panel/BigBatchListPanel.vue               | 30 ++++++---
 2 files changed, 84 insertions(+), 7 deletions(-)

diff --git a/src/views/emis/dashboard.vue b/src/views/emis/dashboard.vue
index e586a3c4..e6400add 100644
--- a/src/views/emis/dashboard.vue
+++ b/src/views/emis/dashboard.vue
@@ -131,6 +131,8 @@
 
                 </CardWithHeader>
 
+
+
               <CardWithHeader header="快捷方式"  height="136px" >
                   <template v-slot:body>
                       <div style="display: flex;justify-content: flex-start;flex-flow:row wrap ">
@@ -142,6 +144,52 @@
                   </template>
               </CardWithHeader>
 
+              <!-- <CardWithHeader header="运单统计"  height="146px" >
+                  <template v-slot:body>
+                      <div class="h-overview">
+                          <el-row>
+                            <el-col :span="4" style="    border-right: 1px solid #ebebeb;">
+                                  <div class="count">
+                                      <span @click="goRouter('/websites')">{{ emisOrderState.issueCount }}</span>
+                                  </div>
+                                  <div class="title" style="color:red">异常件</div>
+                              </el-col>
+                              <el-col :span="4">
+                                  <div class="count">
+                                      <span @click="goRouter('/websites')">{{ emisOrderState.totalCount }}</span>
+                                  </div>
+                                  <div class="title">总订单量</div>
+                              </el-col>
+                              <el-col :span="3">
+                                  <div class="count">
+                                      <span @click="goRouter('/websites')">{{ emisOrderState.waitGotCount }}</span>
+                                  </div>
+                                  <div class="title">待接单</div>
+                              </el-col>
+                              <el-col :span="3">
+                                  <div class="count">
+                                      <span @click="goRouter('/websites')">{{ emisOrderState.transCount }}</span>
+                                  </div>
+                                  <div class="title">运输中</div>
+                              </el-col>
+                              <el-col :span="3">
+                                  <div class="count">
+                                      <span @click="goRouter('/websites')">{{ emisOrderState.dispatchCount }}</span>
+                                  </div>
+                                  <div class="title">派送中</div>
+                              </el-col>
+                              <el-col :span="4">
+                                  <div class="count">
+                                      <span @click="goRouter('/websites')">{{ emisOrderState.signCount }}</span>
+                                  </div>
+                                  <div class="title">已签收</div>
+                              </el-col>
+                          </el-row>
+                      </div>
+                  </template>
+
+                </CardWithHeader> -->
+
               <!-- <CardWithHeader header="待办提醒"  height="146px">
                   <template v-slot:body>
                       <QuickLink ></QuickLink>
@@ -345,6 +393,19 @@ export default {
           xAxisData:[],
           orderStateData:[]
         },
+        emisOrderState:{
+          dispatchCount: 0,
+          issueCount:0,
+          signCount:0,
+          totalCount:0,
+          transCount:0,
+          waitGotCount:0
+        },
+        emisBillFeeState:{
+          totalRecMoney:0,
+          totalRecedMoney:0,
+          waitPayMoney:0
+        },
         lineChartData: lineChartData.newVisitis,
         quickActionList:[],
         queryStatInfoMap:null,
diff --git a/src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue b/src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue
index 3f15ef29..903c47d2 100644
--- a/src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue
+++ b/src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue
@@ -370,15 +370,31 @@ export default {
     /** 查询TMS组批次列表 */
     getList() {
       this.loading = true;
-      if(this.queryOrderType=='1'){
-        this.queryParams.params.billCode=this.queryParams.queryKey;
-        this.queryParams.batchNo=null;
+
+      let rqParams = {...this.queryParams};
+
+      if(this.queryParams.queryKey){
+       rqParams={
+          pageNum: this.queryParams.pageNum,
+          pageSize: this.queryParams.pageSize,
+          queryKey:null,
+          params:{
+            billCode:null,
+            batchNo:null
+          }
+        };
+
+        if(this.queryOrderType=='1'){
+          rqParams.params.billCode=this.queryParams.queryKey;
+          rqParams.batchNo=null;
+        }else{
+          rqParams.batchNo=this.queryParams.queryKey;
+          rqParams.params.billCode=null;
+        }
       }else{
-        this.queryParams.batchNo=this.queryParams.queryKey;
-        this.queryParams.params.billCode=null;
+        rqParams=this.addDateRange(rqParams, this.dateTimeRange,"createTime");
       }
-      this.queryParams=this.addDateRange(this.queryParams, this.dateTimeRange,"createTime");
-      listEmisTmsSiteBatch(this.queryParams).then(response => {
+      listEmisTmsSiteBatch(rqParams).then(response => {
         this.emisTmsBatchList = response.rows;
         this.total = response.total;
         this.loading = false;