fix:全局通知

src/layout/components/Navbar.vue

@@ -93,7 +93,7 @@
           <el-radio-button :label="2">到货通知</el-radio-button>
         </el-radio-group>
       </div>
-      <div v-show="noticeType === 2" class="mymain-container">
+      <div v-if="noticeType === 2" class="mymain-container">
         <el-form ref="form" :model="form" label-width="80px" label-position="left" size="mini">
           <el-row>
             <el-col>
@@ -168,7 +168,7 @@
           </div>
         </div>
       </div>
-      <div v-show="noticeType === 1" class="mymain-container">
+      <div v-if="noticeType === 1" class="mymain-container">
         <div class="table">
           <el-table
             ref="table"
@@ -283,12 +283,13 @@
       <br />
     </el-dialog>
     <el-dialog
-      title="物流信息"
+      title="物流到货通知"
       :visible.sync="visible"
       width="60%"
       @close="onClose"
       :modal="false"
       :close-on-click-modal="false"
+      :append-to-body="true"
     >
       <el-timeline class="logistics" :reverse="false" v-if="logisticsDetail.length">
         <el-timeline-item
@@ -484,10 +485,12 @@ export default {
       if (e === 2) {
         this.currentPage2 = 1
         this.pageSize2 = 10
+        this.listTotal2 = 0
         this.getNoticeList()
       } else {
-        this.pageSize = 1
-        this.currentPage = 10
+        this.pageSize = 10
+        this.currentPage = 1
+        this.listTotal = 0
         this.getListInvoiceOrder()
       }
     },
@@ -498,6 +501,7 @@ export default {
         pageSize: this.pageSize2,
         specification: this.form.specification
       }).then(res => {
+        console.log(res.data.records,'999');
         this.noticeList = res.data.records
         this.listTotal2 = res.data.total
         // this.listLoading = false
@@ -581,7 +585,7 @@ export default {
     //   }
     // },
     goNotice() {
-      this.$router.push('/notice/index')
+      this.$router.push('/notice')
     },
     openEngineAccount() {
       this.engineForm.engineList = this.userInfo.bindEnginList
@@ -805,8 +809,8 @@ export default {
       this.visible = false
     },
     handleJump(id) {
-      this.$router.push({ path: `/exwarehouse/sum_list?id=${id}` })
-      this.isLogistics = false
+      this.$router.push({ path: `/supply/pickup/sum_list?id=${id}` })
+      this.$store.commit('user/SET_STATUS', false)
     },
     handleChangeArea(changeNum) {
       setUserChanging({ changeNum }).then(res => {

src/views/dashboard.vue

@@ -710,9 +710,9 @@ export default {
       this.visible = false
     },
     handleJump(id) {
-      this.$router.push({ path: `/exwarehouse/sum_list?id=${id}` })
-      this.$store.commit('user/SET_MESSAGE', false)
-      this.inDialog = false
+      this.$router.push({ path: `/supply/pickup/sum_list?id=${id}` })
+      this.$store.commit('user/showMessage', 'no')
+
     }
   }
 }

src/views/supply/pickup/sum_list.vue

@@ -93,7 +93,13 @@ export default {
       orderId: '',
       logisticsDetail: [],
       flag: false,
-      searchData: []
+      searchData: [
+        {
+          param: 'pms.invoice_id',
+          compare: '=',
+          value: this.$route.query.id
+        }
+      ]
     }
   },
   watch: {
@@ -102,7 +108,7 @@ export default {
         this.screenForm.orderNum = val
         this.searchData = [
           {
-            param: 'invoice_id',
+            param: 'pms.invoice_id',
             compare: '=',
             value: val
           }
@@ -115,7 +121,7 @@ export default {
     if (this.$route.query && this.$route.query.id) {
       this.searchData = [
         {
-          param: 'invoice_id',
+          param: 'pms.invoice_id',
           compare: '=',
           value: this.$route.query.id
         }