feat:物流通知

src/api/dashboard.js

@@ -79,3 +79,12 @@ export function setMenuList(params) {
     params
   })
 }
+
+// 常用菜单-列表
+export function getListInvoiceOrder(params) {
+  return request({
+    url: `/pick/listInvoiceOrder`,
+    method: 'get',
+    params
+  })
+}

src/layout/components/Navbar.vue

@@ -16,7 +16,7 @@
           ></i>
         </el-tooltip>
       </div> -->
-      <div class="right-menu-item hover-effect" style="display: flex" @click="handleNotice">
+      <div class="right-menu-item hover-effect" style="display: flex" @click="handleNotice('click')">
         <el-badge value="示">
           <i class="el-icon-message-solid" style="font-size: 24px; line-height: 50px" />
         </el-badge>
@@ -271,7 +271,7 @@ export default {
       })
     },
     handleNotice(flag = true) {
-      if (flag) {
+      if (flag || flag == 'click') {
         this.getNoticeList()
       }
       this.$store.commit('user/SET_STATUS', !this.hasNotice)

src/views/dashboard/index.vue

@@ -74,12 +74,14 @@
         <el-radio-button label="1">系统通知</el-radio-button>
         <el-radio-button label="2">文件下发</el-radio-button>
         <el-radio-button label="3">返利确认单</el-radio-button>
+        <el-radio-button label="4">物流通知</el-radio-button>
       </el-radio-group>
       <br />
       <br />
       <!-- 系统通知 -->
       <div v-show="type == '1'" class="table">
         <el-table
+          ref="table"
           v-loading="listLoading"
           class="cql"
           :data="dataList"
@@ -103,6 +105,7 @@
       <!-- 文件下发 -->
       <div v-show="type == '2'" class="table">
         <el-table
+          ref="table"
           v-loading="listLoading"
           :data="fileList"
           element-loading-text="Loading"
@@ -125,6 +128,7 @@
       <!-- 返利确认单 -->
       <div v-show="type == '3'" class="table">
         <el-table
+          ref="table"
           v-loading="listLoading"
           :data="rebateList"
           element-loading-text="Loading"
@@ -152,7 +156,29 @@
           </el-table-column>
         </el-table>
       </div>
-
+      <!-- 物流通知 -->
+      <div v-show="type == '4'" class="table">
+        <el-table
+          ref="table"
+          v-loading="listLoading"
+          :data="invoiceOrderList"
+          element-loading-text="Loading"
+          border
+          fit
+          highlight-current-row
+          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="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="" 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>
       <br />
       <br />
       <!-- 分页 -->
@@ -210,6 +236,28 @@
         <el-button type="primary" size="mini" @click="closeFn">关闭</el-button>
       </div>
     </el-dialog>
+    <el-dialog title="物流信息" :visible.sync="visible" width="60%" @close="onClose" :close-on-click-modal="false">
+      <el-timeline class="logistics" :reverse="false" v-if="logisticsDetail.length">
+        <el-timeline-item
+          placement="top"
+          type="success"
+          v-for="(item, index) in logisticsDetail"
+          :key="index"
+          :timestamp="item.time"
+        >
+          <el-row :gutter="20">
+            <el-col class="logistics-title"> {{ item.status }} </el-col>
+            <el-col>
+              <div class="flex">
+                <div>{{ item.context }}</div>
+                <!-- <div>{{ item.createTime }}</div> -->
+              </div>
+            </el-col>
+          </el-row>
+        </el-timeline-item>
+      </el-timeline>
+      <div v-else class="tip">暂无物流信息</div>
+    </el-dialog>
   </div>
 </template>
 
@@ -223,12 +271,12 @@ import {
   getRebateOrderList,
   getRouter,
   getMenuList,
-  setMenuList
+  setMenuList,
+  getListInvoiceOrder
 } from '@/api/dashboard'
+import { getListOrderTrack } from '@/api/supply/pickup'
 import { getFileUrl } from '@/api/common'
 import { mapGetters } from 'vuex'
-import { getInfo, getOrder, getGoodsRank } from '@/api/dashboard'
-import { dateFormat } from '@/utils/util'
 
 export default {
   name: 'Dashboard',
@@ -268,7 +316,12 @@ export default {
       menuList: [],
       dialogVisible: false,
       checkList: [],
-      normsMenuList: []
+      normsMenuList: [],
+      invoiceOrderList: [],
+      bol: true,
+      visible: false,
+      orderId: '',
+      logisticsDetail: []
     }
   },
 
@@ -386,6 +439,12 @@ export default {
           isSecondExamine: false
         })
       }
+      if (this.type == 4) {
+        this.getListInvoiceOrder({
+          pageSize: this.pageSize,
+          pageNum: this.currentPage
+        })
+      }
     },
     // 更改当前页
     handleCurrentChange(val) {
@@ -411,6 +470,12 @@ export default {
           isSecondExamine: false
         })
       }
+      if (this.type == 4) {
+        this.getListInvoiceOrder({
+          pageSize: this.pageSize,
+          pageNum: this.currentPage
+        })
+      }
     },
     // 获取返利确认单数据
     async getRebateList(data) {
@@ -425,8 +490,15 @@ export default {
       this.dataList = res.data.records
       this.listTotal = res.data.total
     },
+    // 获取物流列表
+    async getListInvoiceOrder(data) {
+      const res = await getListInvoiceOrder(data)
+      this.invoiceOrderList = res.data.records
+      this.listTotal = res.data.total
+    },
     // 选择
     checkFn(v) {
+      this.$refs.table.doLayout()
       this.type = v
       if (v == 1) {
         this.getDataList({
@@ -449,6 +521,12 @@ export default {
           isSecondExamine: false
         })
       }
+      if (v == 4) {
+        this.getListInvoiceOrder({
+          pageSize: this.pageSize,
+          pageNum: this.currentPage
+        })
+      }
     },
     // 关闭
     closeFn() {
@@ -464,6 +542,18 @@ export default {
       this.$router.push({
         path
       })
+    },
+    handLogistics(row) {
+      getListOrderTrack({ orderId: row.id }).then(res => {
+        this.logisticsDetail = res.data
+      })
+      this.orderId = row.id
+      this.visible = true
+    },
+    onClose() {
+      this.logisticsDetail = []
+      this.orderId = ''
+      this.visible = false
     }
   }
 }
@@ -532,4 +622,12 @@ export default {
     text-overflow: ellipsis;
   }
 }
+.logistics-title {
+  padding-bottom: 10px;
+}
+.tip {
+  height: 200px;
+  text-align: center;
+  line-height: 200px;
+}
 </style>

src/views/finance/standbook_list.vue

@@ -166,6 +166,7 @@
       <div class="mymain-container">
         <div class="table">
           <el-table
+            v-if="dataList.length"
             v-loading="listLoading"
             :data="dataList"
             element-loading-text="Loading"
@@ -175,6 +176,7 @@
             stripe
             show-summary
             :summary-method="getSummaries"
+            height="620px"
           >
             <el-table-column
               label="序号"
@@ -374,6 +376,7 @@
       <div class="mymain-container">
         <div class="table">
           <el-table
+            v-if="dataList.length"
             v-loading="listLoading"
             :data="dataList"
             element-loading-text="Loading"
@@ -383,6 +386,7 @@
             stripe
             show-summary
             :summary-method="getSummaries2"
+            height="620px"
           >
             <el-table-column label="序号" align="left" width="50" type="index" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="客户编码" prop="customerCode" min-width="160" show-overflow-tooltip>
@@ -512,7 +516,7 @@
 import { getWalletCustomerList } from '@/api/finance/change_apply'
 import { getAmountCount, getCustomerList, getStandbookList } from '@/api/finance/standbook_list'
 import { numToFixed } from '@/filters'
-import sticky from '@/utils/table-sticky'
+// import sticky from '@/utils/table-sticky'
 export default {
   // mixins: [sticky],
   data() {

src/views/supply/pickup/sum_list.vue

@@ -448,7 +448,7 @@ export default {
       getListOrderTrack({ orderId: row.invoiceId }).then(res => {
         this.logisticsDetail = res.data
       })
-      this.orderId = row.id
+      this.orderId = row.invoiceId
       this.visible = true
     },
     onClose() {