fix: bug修复

src/api/supply/pickup.js

@@ -1,7 +1,7 @@
 import request, { postBlob, handleImport, getBlob } from '@/utils/request'
 
 // 提货-列表V2
-export function getPickupListV2(data) {
+export function pickListV2(data) {
   return request({
     url: `/pick/listV2?moduleId=${data.moduleId}`,
     method: 'post',
@@ -11,6 +11,27 @@ export function getPickupListV2(data) {
 
 
 //提货-列表V2导出
+export function pickListV2Export(data, name) {
+  return postBlob({
+    url: '/pick/listV2/export',
+    method: 'post',
+    data,
+    name
+  })
+}
+
+
+
+export function getPickupListV2(data) {
+  return request({
+    url: `/pick/listV2?moduleId=${data.moduleId}`,
+    method: 'post',
+    data
+  })
+}
+
+
+
 export function exportPickupListV2(data, name) {
   return postBlob({
     url: '/pick/listV2/export',

src/layout/components/Navbar.vue

@@ -21,17 +21,17 @@
           <el-option v-for="item in areaOpti" :key="item.value" :label="item.label" :value="item.value"> </el-option>
         </el-select>
       </div>
-      <div class="right-menu-item hover-effect" style="display: flex" @click="handleShow">
+      <!-- <div class="right-menu-item hover-effect" style="display: flex" @click="handleShow">
         <el-badge>
           <i class="el-icon-message-solid" style="font-size: 24px; line-height: 50px" />
         </el-badge>
         <span style="font-size: 16px; margin-left: 15px">物流通知</span>
-      </div>
+      </div> -->
       <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>
-        <span style="font-size: 16px; margin-left: 15px">到货通知</span>
+        <span style="font-size: 16px; margin-left: 15px">物流到货通知</span>
       </div>
       <div class="right-menu-item hover-effect" @click="toEngine">
         <i class="el-icon-s-platform" style="font-size: 18px" />
@@ -80,7 +80,13 @@
     </el-dialog>
 
     <el-dialog title="到货通知" :modal="false" width="70%" :visible.sync="hasNotice" @close="handleNotice(false)">
-      <div class="mymain-container">
+      <div style="margin-top: 20px">
+        <el-radio-group v-model="noticeType" size="mini" @change="handleChangeNotice">
+          <el-radio-button :label="1">物流通知</el-radio-button>
+          <el-radio-button :label="2">到货通知</el-radio-button>
+        </el-radio-group>
+      </div>
+      <div v-show="noticeType === 2" class="mymain-container">
         <el-form ref="form" :model="form" label-width="80px" label-position="left" size="mini">
           <el-row>
             <el-col>
@@ -155,6 +161,66 @@
           </div>
         </div>
       </div>
+      <div v-show="noticeType === 1" class="mymain-container">
+        <div 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>
+              <template slot-scope="scope">
+                <el-link v-if="!isCustomer" type="primary" :underline="false" @click="handleJump(scope.row.id)">{{
+                  scope.row.id
+                }}</el-link>
+                <template v-else>{{ scope.row.id }}</template>
+              </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>
+              <template slot-scope="scope">
+                {{ scope.row.address ? scope.row.address : '——' }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="收货客户" prop="receivingName" min-width="160" show-overflow-tooltip>
+              <template slot-scope="scope">{{ scope.row.receivingName ? scope.row.receivingName : '——' }}</template>
+            </el-table-column>
+            <el-table-column align="center" label="" min-width="80" 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 class="flex">
+            <div></div>
+            <div class="fr">
+              <el-pagination
+                :current-page="currentPage"
+                :page-sizes="[10, 20, 30, 50]"
+                :page-size="10"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="listTotal"
+                @size-change="handleSizeChange"
+                @current-change="handleCurrentChange"
+              />
+            </div>
+          </div>
+        </div>
+      </div>
     </el-dialog>
     <el-dialog title="物流通知" :visible.sync="isLogistics" width="60%" :modal="false" @close="isLogistics = false">
       <div class="table">
@@ -194,7 +260,6 @@
           </el-table-column>
         </el-table>
       </div>
-
       <!-- 分页 -->
       <div class="fr">
         <el-pagination
@@ -313,6 +378,7 @@ export default {
   mixins: [mixin],
   data() {
     return {
+      noticeType: 1,
       intivalId: '',
       timer: '',
       noticeCount: 0,
@@ -391,6 +457,9 @@ export default {
         if (!this.noticeList.length && !this.myType) {
           return false
         } else {
+          // if (this.noticeList.length) {
+          //   return true
+          // }
           return this.isNotice
         }
       },
@@ -402,7 +471,18 @@ export default {
   },
   methods: {
     getList() {
-      this.getNoticeList()
+      // this.getNoticeList()
+    },
+    handleChangeNotice(e) {
+      if (e === 2) {
+        this.currentPage2 = 1
+        this.pageSize2 = 10
+        this.getNoticeList()
+      } else {
+        this.pageSize = 1
+        this.currentPage = 10
+        this.getListInvoiceOrder()
+      }
     },
     getNoticeList() {
       this.listLoading = true
@@ -428,17 +508,27 @@ export default {
         this.listLoading = false
       })
     },
+      // 获取物流列表
+     async getListInvoiceOrder(data) {
+      const res = await getListInvoiceOrder({
+        pageSize: this.pageSize,
+        pageNum: this.currentPage
+      })
+      this.invoiceOrderList = res.data.records
+      this.listTotal = res.data.total
+    },
     handleNotice(flag = true) {
       if (flag || flag == 'click') {
         if (flag == 'click') {
           this.myType = flag
         }
-        this.getNoticeList()
+        this.getListInvoiceOrder()
         this.$store.commit('user/SET_STATUS', true)
       } else {
         if (!flag) {
           this.myType = ''
         }
+        this.noticeType = 1
         this.$store.commit('user/SET_STATUS', false)
       }
     },
@@ -663,16 +753,7 @@ export default {
         that.lockReconnect = false
       }, 20000)
     },
-    // 获取物流列表
-    async getListInvoiceOrder(data) {
-      this.invoiceOrderList = []
-      const res = await getListInvoiceOrder({
-        pageSize: this.pageSize,
-        pageNum: this.currentPage
-      })
-      this.invoiceOrderList = res.data.records
-      this.listTotal = res.data.total
-    },
+ 
     handleShow() {
       ;(this.isLogistics = true), this.getListInvoiceOrder()
     },
@@ -729,14 +810,14 @@ export default {
 
 <style lang="scss" scoped>
 @import '~@/styles/variables.scss';
-.right-menu-item{
-::v-deep .el-input__inner {
-  width: 80px;
-  font-size: 16px;
+.right-menu-item {
+  ::v-deep .el-input__inner {
+    width: 80px;
+    font-size: 16px;
 
-  color: #333333;
-  border: 0 !important;
-}
+    color: #333333;
+    border: 0 !important;
+  }
 }
 
 ::v-deep .is-fixed {

src/views/finance/receivable_list.vue

@@ -197,6 +197,8 @@ export default {
       this.addOff(() => {
         this.showPage = 1
       })()
+      this.$refs.pageRef.refreshList()
+
     },
     //获取经销商列表
     async getCustomerDataList() {