fix: 合并丢失

src/views/supply/pickup/sum_list.vue

@@ -149,16 +149,6 @@
               {{ scope.row.printNum ? '已打单' : '未打单' }}
             </template>
           </el-table-column>
-          <el-table-column align="left" label="是否上楼" prop="isUp" min-width="160" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ scope.row.isUp == 'YES' ? '是' : '否' }}
-            </template>
-          </el-table-column>
-          <el-table-column align="left" label="是否卸货" prop="isDischarge" min-width="160" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ scope.row.isDischarge == 'YES' ? '是' : '否' }}
-            </template>
-          </el-table-column>
           <el-table-column align="left" label="打单日期" prop="printTime" min-width="160" show-overflow-tooltip />
           <!-- <el-table-column align="left" label="信息密钥" prop="informationKey" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
@@ -268,6 +258,11 @@
             </template>
           </el-table-column>
           <el-table-column align="left" label="备注" prop="remark" min-width="100" show-overflow-tooltip />
+          <el-table-column fixed="right" label="操作" width="100" >
+            <template slot-scope="scope">
+              <el-button v-if="scope.row.pickType != '1' " @click="handLogistics(scope.row)" type="text" size="small">物流信息</el-button>
+            </template>
+          </el-table-column>
         </el-table>
       </div>
     </div>
@@ -303,14 +298,14 @@
             </el-col>
           </el-row>
         </el-timeline-item>
-      </el-timeline>
-      <div v-else class="tip">暂无物流信息</div>
+      </el-timeline>   
+      <div v-else class="tip">暂无物流信息</div>   
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { getPickupList, getPickupManList, getListOrderTrack } from '@/api/supply/pickup'
+import { getPickupList, getPickupManList,getListOrderTrack } from '@/api/supply/pickup'
 import { getLogisticsList } from '@/api/basic_data/logistics'
 import { getWarehouseList } from '@/api/supply/engin'
 export default {
@@ -448,9 +443,30 @@ export default {
     handleCurrentChange(val) {
       this.currentPage = val
       this.getList()
+    },
+    handLogistics(row) {
+      getListOrderTrack({ orderId: row.invoiceId }).then(res => {
+        this.logisticsDetail = res.data
+      })
+      this.orderId = row.invoiceId
+      this.visible = true
+    },
+    onClose() {
+      this.logisticsDetail = []
+      this.orderId = ''
+      this.visible = false
     }
   }
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.logistics-title{
+  padding-bottom: 10px;
+}
+.tip{
+  height: 200px;
+    text-align: center;
+    line-height: 200px;
+}
+</style>