src/views/logisticsManagement/components/detailsLogisticsDialog.vue

@@ -1,7 +1,7 @@
 <template>
-  <el-dialog title="详情" append-to-body :modelValue="openShow" width="70%" @close="closeDialog" :loading="detailsLoading">
+  <el-dialog title="详情" append-to-body :modelValue="openShow" width="70%" @close="closeDialog">
     <el-descriptions title="物料记录"></el-descriptions>
-    <el-table :data="yieldOrderList|| []" style="width: 100%">
+    <el-table :data="detailsInfo.boxbarcodeDetailsVO.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,8 +44,6 @@ export default {
     return {
       openShow: false,
       detailsInfo: {},
-      yieldOrderList:[],
-      detailsLoading:true
     };
   },
   mounted() {
@@ -54,16 +52,11 @@ 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;

src/views/logisticsManagement/logisticsDistribution.vue

@@ -47,12 +47,7 @@
     ></receiveDialog>
 
     <!-- 详情 -->
-    <detailsLogisticsDialog
+     <detailsLogisticsDialog v-if="detailsLogisticsShow" :showDialog="detailsLogisticsShow" @closeDialog="closeDialog" :rowItem="rowItem"></detailsLogisticsDialog>
-      v-if="detailsLogisticsShow"
-      :showDialog="detailsLogisticsShow"
-      @closeDialog="closeDialog"
-      :rowItem="rowItem"
-    ></detailsLogisticsDialog>
   </basic-container>
 </template>
 
@@ -68,11 +63,11 @@ export default {
     addLogisticsDialog,
     returnDialog,
     receiveDialog,
-    detailsLogisticsDialog,
+    detailsLogisticsDialog
   },
   data() {
     return {
-      detailsLogisticsShow: false,
+      detailsLogisticsShow:false,
       showReceiveDialog: false,
       showReturnDialog: false,
       showAddDialogd: false,
@@ -135,16 +130,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,
           },
           {
@@ -154,6 +149,7 @@ export default {
             sortable: true,
             span: 12,
             width: 120,
+            
           },
           {
             label: '起点-区域',
@@ -162,14 +158,7 @@ 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: '起点-站点',
@@ -178,7 +167,7 @@ export default {
             sortable: true,
             span: 12,
             width: 120,
-            searchOrder: 16,
+            searchOrder:16,
           },
           {
             label: '终点-作业中心',
@@ -195,7 +184,7 @@ export default {
             sortable: true,
             span: 12,
             width: 120,
-            searchOrder: 15,
+            searchOrder:15,
           },
           {
             label: '终点-区域',
@@ -205,14 +194,7 @@ 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: '终点-站点',
@@ -221,9 +203,9 @@ export default {
             sortable: true,
             span: 12,
             width: 120,
-            searchOrder: 14,
+            searchOrder:14,
           },
-
+          
           {
             label: '箱条码',
             prop: 'boxBarcode',
@@ -231,7 +213,7 @@ export default {
             sortable: true,
             span: 12,
             width: 120,
-            searchOrder: 20,
+            searchOrder:20,
           },
           // {
           //   label: '站点名称',
@@ -323,7 +305,7 @@ export default {
             endPlaceholder: '结束日期',
             rangeSeparator: '-',
             searchRange: true,
-            searchOrder: 19,
+            searchOrder:19,
           },
         ],
       },
@@ -343,15 +325,15 @@ export default {
       // this.showAddDialogd = true;
       this.showReturnDialog = true;
     },
-    detailsFn(row) {
+    detailsFn(row){
-      this.rowItem = row;
+      this.rowItem = row
-      this.detailsLogisticsShow = true;
+      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) {