feat: 物流通知

src/layout/components/Navbar.vue

@@ -172,15 +172,23 @@
           stripe
         >
           <el-table-column align="center" type="index" min-width="160" show-overflow-tooltip />
-          <el-table-column align="center" label="发货单" prop="id" min-width="160" show-overflow-tooltip />
+          <el-table-column align="center" label="发货单" prop="id" min-width="160" show-overflow-tooltip >
+            <template slot-scope="scope">
+              <el-link type="primary" :underline="false" @click="handleJump(scope.row.id)">{{ scope.row.id }}</el-link>
+              <!-- <router-link :to="{path:'/exwarehouse/sum_list',query:{id:scope.row.id}}" exact></router-link> -->
+            </template>
+          </el-table-column>
           <el-table-column align="center" label="内容" prop="orderTrackStatus" min-width="160" show-overflow-tooltip />
           <el-table-column align="center" label="时间" prop="orderTrackTime" min-width="160" show-overflow-tooltip />
+          <el-table-column align="center" label="收货地址" prop="address" min-width="160" show-overflow-tooltip />
+          <el-table-column align="center" label="收货客户" prop="receivingName" min-width="160" show-overflow-tooltip />
           <el-table-column align="center" label="" min-width="160" show-overflow-tooltip fixed="right">
             <template slot-scope="scope">
               <el-button type="text" class="textColor" @click="handLogistics(scope.row)">查看</el-button>
             </template>
           </el-table-column>
         </el-table>
+        <div v-else class="tip">暂无物流通知</div>
       </div>
 
       <!-- 分页 -->
@@ -291,6 +299,8 @@ import { getListInvoiceOrder } from '@/api/dashboard'
 import { bindEngineAccount, checkEngineAccount } from '@/api/setting'
 import mixin from '@/mixin'
 import ret from 'bluebird/js/release/util'
+import path from 'path'
+import { query } from 'quill'
 export default {
   components: {
     Breadcrumb,
@@ -660,6 +670,10 @@ export default {
       this.logisticsDetail = []
       this.orderId = ''
       this.visible = false
+    },
+    handleJump(id){
+      this.$router.push({path:`/exwarehouse/sum_list?id=${id}`})
+      this.isLogistics  = false
     }
   }
 }

src/views/dashboard/index.vue

@@ -172,6 +172,8 @@
           <el-table-column align="center" label="发货单" prop="id" min-width="160" show-overflow-tooltip />
           <el-table-column align="center" label="内容" prop="orderTrackStatus" min-width="160" show-overflow-tooltip />
           <el-table-column align="center" label="时间" prop="orderTrackTime" min-width="160" show-overflow-tooltip />
+          <el-table-column align="center" label="收货地址" prop="address" min-width="160" show-overflow-tooltip />
+          <el-table-column align="center" label="收货客户" prop="receivingName" min-width="160" show-overflow-tooltip />
           <el-table-column align="center" label="" min-width="160" show-overflow-tooltip fixed="right">
             <template slot-scope="scope">
               <el-button type="text" class="textColor" @click="handLogistics(scope.row)">查看</el-button>

src/views/supply/pickup/sum_list.vue

@@ -258,9 +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" >
+          <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>
+              <el-button v-if="scope.row.pickType != '1'" @click="handLogistics(scope.row)" type="text" size="small"
+                >物流信息</el-button
+              >
             </template>
           </el-table-column>
         </el-table>
@@ -298,14 +300,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 {
@@ -336,7 +338,8 @@ export default {
       warehouseList: [],
       visible: false,
       orderId: '',
-      logisticsDetail: []
+      logisticsDetail: [],
+      flag: false
     }
   },
 
@@ -359,14 +362,31 @@ export default {
       }
     }
   },
-
+  watch: {
+    '$route.query.id'(val, oval) {
+      if (val) {
+        this.screenForm.orderNum = val
+        this.getList()
+      }
+    }
+  },
   created() {
-    this.getList()
+    // this.getList()
     this.getWarehouseList()
     this.getLogisticsList()
     this.getPickupManList()
   },
-
+  activated() {
+    if (this.$route.query && this.$route.query.id) {
+      this.screenForm.orderNum = this.$route.query.id
+    } else {
+      this.screenForm.orderNum = ''
+    }
+    this.getList()
+  },
+  deactivated() {
+    console.log('ceshi')
+  },
   methods: {
     // 查询列表
     getList() {
@@ -461,12 +481,12 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.logistics-title{
+.logistics-title {
   padding-bottom: 10px;
 }
-.tip{
+.tip {
   height: 200px;
-    text-align: center;
-    line-height: 200px;
+  text-align: center;
+  line-height: 200px;
 }
 </style>