From 2efae126be2f09f32999bde98ece30650c9c2775 Mon Sep 17 00:00:00 2001
From: zhangdi <1104545947@qq.com>
Date: Wed, 15 Apr 2026 13:48:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=B5=81=E9=85=8D=E9=80=81=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/detailsLogisticsDialog.vue     | 13 ++++-
 .../logisticsDistribution.vue                 | 56 ++++++++++++-------
 2 files changed, 47 insertions(+), 22 deletions(-)

diff --git a/src/views/logisticsManagement/components/detailsLogisticsDialog.vue b/src/views/logisticsManagement/components/detailsLogisticsDialog.vue
index ed84014..98d6d8d 100644
--- a/src/views/logisticsManagement/components/detailsLogisticsDialog.vue
+++ b/src/views/logisticsManagement/components/detailsLogisticsDialog.vue
@@ -1,7 +1,7 @@
 <template>
-  <el-dialog title="详情" append-to-body :modelValue="openShow" width="70%" @close="closeDialog">
+  <el-dialog title="详情" append-to-body :modelValue="openShow" width="70%" @close="closeDialog" :loading="detailsLoading">
     <el-descriptions title="物料记录"></el-descriptions>
-    <el-table :data="detailsInfo.boxbarcodeDetailsVO.yieldOrderList|| []" style="width: 100%">
+    <el-table :data="yieldOrderList|| []" style="width: 100%">
       <el-table-column type="index" width="50" label="序号"> </el-table-column>
       <el-table-column prop="cardNo" label="流程卡号" show-overflow-tooltip> </el-table-column>
       <el-table-column prop="yoCode" label="生产单号" show-overflow-tooltip> </el-table-column>
@@ -44,6 +44,8 @@ export default {
     return {
       openShow: false,
       detailsInfo: {},
+      yieldOrderList:[],
+      detailsLoading:true
     };
   },
   mounted() {
@@ -52,11 +54,16 @@ export default {
   },
   methods: {
     async detailsFn() {
+      this.detailsLoading = true;
       await taskDetails({ boxBarcode: this.rowItem.boxBarcode, taskId: this.rowItem.id }).then(
         res => {
+          this.detailsLoading = false
+          this.yieldOrderList = res.data.data.boxbarcodeDetailsVO.yieldOrderList;
           this.detailsInfo = res.data.data;
         }
-      );
+      ).catch(err => {
+        this.detailsLoading = false
+      })
     },
     closeDialog() {
       this.openShow = false;
diff --git a/src/views/logisticsManagement/logisticsDistribution.vue b/src/views/logisticsManagement/logisticsDistribution.vue
index 2f4305b..a452a32 100644
--- a/src/views/logisticsManagement/logisticsDistribution.vue
+++ b/src/views/logisticsManagement/logisticsDistribution.vue
@@ -47,7 +47,12 @@
     ></receiveDialog>
 
     <!-- 详情 -->
-     <detailsLogisticsDialog v-if="detailsLogisticsShow" :showDialog="detailsLogisticsShow" @closeDialog="closeDialog" :rowItem="rowItem"></detailsLogisticsDialog>
+    <detailsLogisticsDialog
+      v-if="detailsLogisticsShow"
+      :showDialog="detailsLogisticsShow"
+      @closeDialog="closeDialog"
+      :rowItem="rowItem"
+    ></detailsLogisticsDialog>
   </basic-container>
 </template>
 
@@ -63,11 +68,11 @@ export default {
     addLogisticsDialog,
     returnDialog,
     receiveDialog,
-    detailsLogisticsDialog
+    detailsLogisticsDialog,
   },
   data() {
     return {
-      detailsLogisticsShow:false,
+      detailsLogisticsShow: false,
       showReceiveDialog: false,
       showReturnDialog: false,
       showAddDialogd: false,
@@ -130,16 +135,16 @@ export default {
             sortable: true,
             span: 12,
             width: 160,
-            searchOrder:18,
+            searchOrder: 18,
           },
-           {
+          {
             label: '任务编号',
             prop: 'taskId',
             search: true,
             sortable: true,
             span: 12,
             width: 160,
-            searchOrder:18,
+            searchOrder: 18,
             hide: true,
           },
           {
@@ -149,7 +154,6 @@ export default {
             sortable: true,
             span: 12,
             width: 120,
-            
           },
           {
             label: '起点-区域',
@@ -158,7 +162,14 @@ export default {
             sortable: true,
             span: 12,
             width: 120,
-            searchOrder:17,
+            searchOrder: 17,
+            type: 'select',
+            filterable: true,
+            dicUrl: '/blade-desk/station/getStationRegionList?isStart=true',
+            props: {
+              label: 'stationRegion',
+              value: 'stationRegion',
+            },
           },
           {
             label: '起点-站点',
@@ -167,7 +178,7 @@ export default {
             sortable: true,
             span: 12,
             width: 120,
-            searchOrder:16,
+            searchOrder: 16,
           },
           {
             label: '终点-作业中心',
@@ -184,7 +195,7 @@ export default {
             sortable: true,
             span: 12,
             width: 120,
-            searchOrder:15,
+            searchOrder: 15,
           },
           {
             label: '终点-区域',
@@ -194,7 +205,14 @@ export default {
             span: 12,
             width: 120,
             hide: true,
-            searchOrder:15,
+            searchOrder: 15,
+            type: 'select',
+            filterable: true,
+            dicUrl: '/blade-desk/station/getStationRegionList?isStart=false',
+            props: {
+              label: 'stationRegion',
+              value: 'stationRegion',
+            },
           },
           {
             label: '终点-站点',
@@ -203,9 +221,9 @@ export default {
             sortable: true,
             span: 12,
             width: 120,
-            searchOrder:14,
+            searchOrder: 14,
           },
-          
+
           {
             label: '箱条码',
             prop: 'boxBarcode',
@@ -213,7 +231,7 @@ export default {
             sortable: true,
             span: 12,
             width: 120,
-            searchOrder:20,
+            searchOrder: 20,
           },
           // {
           //   label: '站点名称',
@@ -305,7 +323,7 @@ export default {
             endPlaceholder: '结束日期',
             rangeSeparator: '-',
             searchRange: true,
-            searchOrder:19,
+            searchOrder: 19,
           },
         ],
       },
@@ -325,15 +343,15 @@ export default {
       // this.showAddDialogd = true;
       this.showReturnDialog = true;
     },
-    detailsFn(row){
-      this.rowItem = row
-      this.detailsLogisticsShow = true
+    detailsFn(row) {
+      this.rowItem = row;
+      this.detailsLogisticsShow = true;
     },
     closeDialog() {
       this.showAddDialogd = false;
       this.showReturnDialog = false;
       this.showReceiveDialog = false;
-      this.detailsLogisticsShow = false
+      this.detailsLogisticsShow = false;
       this.onLoad(this.page, this.query);
     },
     rowSave(row, done, loading) {