From 6ded2ee6a9d9097d45f8f79a7e6429cf55ed7cc3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 07 三月 2025 16:59:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 admin/src/views/platform/LogisticsRecord/waybill.vue |   36 +++++++++++++++++++++++++++---------
 1 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/admin/src/views/platform/LogisticsRecord/waybill.vue b/admin/src/views/platform/LogisticsRecord/waybill.vue
index f0b7a3e..d5f8fc3 100644
--- a/admin/src/views/platform/LogisticsRecord/waybill.vue
+++ b/admin/src/views/platform/LogisticsRecord/waybill.vue
@@ -14,7 +14,7 @@
       <el-button :loading="exLoading" @click="handleEx"
         v-permissions="['business:platformjob:exportExcel']">瀵煎嚭</el-button>
     </div>
-    <el-table class="mb20" v-loading="loading" :data="list" stripe>
+    <el-table :height="tableHeightNew" v-loading="loading" :data="list" stripe>
       <el-table-column prop="billCode" label="杩愬崟鍙�" min-width="100" show-overflow-tooltip />
       <el-table-column prop="carCodeFront" label="杞︾墝鍓嶇収鍙�" min-width="100" show-overflow-tooltip />
       <!-- <el-table-column prop="carCodeBack" label="杞︾墝鍚庣収鍙�" min-width="100" show-overflow-tooltip /> -->
@@ -22,8 +22,13 @@
       <el-table-column prop="carrierName" label="杩愯緭鍏徃" min-width="100" show-overflow-tooltip />
       <el-table-column prop="driverName" label="鍙告満" min-width="100" show-overflow-tooltip />
       <el-table-column prop="drivierPhone" label="鍙告満鐢佃瘽" min-width="100" show-overflow-tooltip />
+<!--      <el-table-column prop="wmsContractNum" label="WMS鍚堝悓鍙�" min-width="100" show-overflow-tooltip >
+      <template v-slot="scope">
+        <span v-if="scope.row.platformWmsJob">{{ scope.row.platformWmsJob.contractNum }}</span>
+      </template>
+      </el-table-column>-->
       <el-table-column prop="inTypeTemp" label="浣滀笟绫诲瀷" min-width="100" show-overflow-tooltip>
-        <template v-slot="scope"> 
+        <template v-slot="scope">
           <span v-if="scope.row.type == '0'">鑷湁杞﹀嵏璐�</span>
           <span v-if="scope.row.type == '1'">鑷湁杞﹁璐�</span>
           <span v-if="scope.row.type == '2'">澶栧崗杞﹀嵏璐�</span>
@@ -39,8 +44,8 @@
       </el-table-column>
       <el-table-column prop="name" label="鎿嶄綔" min-width="120" align="center" fixed="right" show-overflow-tooltip>
         <template v-slot="scope">
-          <el-button v-if="scope.row.status == '12'" type="text" class="red" v-permissions="['business:platformjob:delete']"
-            @click="handleDel(scope.row)">鍒犻櫎</el-button>
+          <el-button v-if="scope.row.status == '12'" type="text" class="red"
+            v-permissions="['business:platformjob:delete']" @click="handleDel(scope.row)">鍒犻櫎</el-button>
           <el-button v-if="scope.row != 12" type="text" v-permissions="['business:platformjob:query']"
             @click="handleDetail(scope.row)">杩愬崟璇︽儏</el-button>
         </template>
@@ -56,6 +61,7 @@
 <script>
 import Pagination from '@/components/common/Pagination'
 import QueryForm from '@/components/common/QueryForm'
+import BasePage from '@/components/base/BasePage'
 import { platformJobPage, platformJobExport, platformJobDel } from '@/api'
 import { statusMap } from '../config'
 import WaybillDetailRef from "../components/WaybillDetail.vue"
@@ -71,6 +77,7 @@
     GlobalWindow,
     UploadFaceImg
   },
+  extends: BasePage,
   data() {
     return {
       statusMap,
@@ -98,6 +105,11 @@
             filed: 'driverName',
             type: 'input',
             label: '椹鹃┒鍛�'
+          },
+          {
+            filed: 'wmsContractNum',
+            type: 'input',
+            label: '鍚堝悓鍙�'
           },
           {
             filed: 'carCodeFront',
@@ -142,7 +154,6 @@
   },
   created() {
     this.changeRadio('0')
-    this.getList()
   },
   methods: {
     changeRadio(day) {
@@ -181,7 +192,7 @@
       })
     },
     handleDel(row) {
-      this.$dialog.exportConfirm('纭鍒犻櫎鍚楋紵').then(() => {
+      this.$dialog.deleteConfirm('纭鍒犻櫎鍚楋紵').then(() => {
         platformJobDel(row.id).then(res => {
           Message.success('鍒犻櫎鎴愬姛')
           this.getList()
@@ -192,11 +203,17 @@
       this.$dialog.exportConfirm('纭瀵煎嚭鍚楋紵')
         .then(() => {
           this.exLoading = true
+          const { filters } = this
           platformJobExport({
             page: this.pagination.page,
             capacity: 1000000,
             jobType: '0',
-            model: this.filters
+            model: {
+              ...filters,
+              jobType: '0',
+              createDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
+              createDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
+            }
           })
             .then(response => {
               this.download(response)
@@ -213,9 +230,9 @@
       this.pagination.page = 1
       this.filters = {
         selDate: [],
-        fastdate: 0
       }
       this.getList()
+      // this.changeRadio('0')
     },
     handleDetail(row) {
       this.isShowDetail = true
@@ -227,6 +244,7 @@
     },
     handleSizeChange(capacity) {
       this.pagination.pageSize = capacity
+      this.getList()
     }
   }
 }
@@ -238,4 +256,4 @@
   color: #000000;
   margin-bottom: 15px;
 }
-</style>
\ No newline at end of file
+</style>

--
Gitblit v1.9.3