Parcourir la source

fix:到货通知

zh il y a 2 ans
Parent
commit
25fa14368a

+ 21 - 11
src/layout/components/Navbar.vue

@@ -182,13 +182,13 @@
           </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 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 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">
@@ -306,6 +306,7 @@ import { getListInvoiceOrder } from '@/api/dashboard'
 
 import { bindEngineAccount, checkEngineAccount } from '@/api/setting'
 import mixin from '@/mixin'
+import { type } from 'os'
 
 export default {
   components: {
@@ -350,7 +351,8 @@ export default {
       listTotal: 0, // 列表总数
       currentPage2: 1, // 当前页码
       pageSize2: 10, // 每页数量
-      listTotal2: 0 // 列表总数
+      listTotal2: 0, // 列表总数
+      myType: ''
     }
   },
   mounted() {
@@ -388,7 +390,7 @@ export default {
     hasNotice: {
       get() {
         // 数据为空是不展示消息通知弹框
-        if (!this.noticeList.length) {
+        if (!this.noticeList.length && !this.myType) {
           return false
         } else {
           return this.isNotice
@@ -418,9 +420,17 @@ export default {
     },
     handleNotice(flag = true) {
       if (flag || flag == 'click') {
+        if (flag == 'click') {
+          this.myType = flag
+        }
         this.getNoticeList()
+        this.$store.commit('user/SET_STATUS', true)
+      } else {
+        if (!flag) {
+          this.myType = ''
+        }
+        this.$store.commit('user/SET_STATUS', false)
       }
-      this.$store.commit('user/SET_STATUS', !this.hasNotice)
     },
     toggleSideBar() {
       this.$store.dispatch('app/toggleSideBar')
@@ -656,8 +666,8 @@ export default {
     handleShow() {
       ;(this.isLogistics = true), this.getListInvoiceOrder()
     },
-        // 更改每页数量
-        handleSizeChange2(val) {
+    // 更改每页数量
+    handleSizeChange2(val) {
       this.pageSize2 = val
       this.currentPage2 = 1
       this.getNoticeList()

+ 2 - 2
src/views/basic_data/dealer/components/dealer_list-detail.vue

@@ -398,8 +398,8 @@ export default {
  
       updatePick({
         id: this.detailsId,
-        isFront: this.isFront,
-        isPick: this.isPick,
+        isFront: this.isFront?this.isFront:false,
+        isPick: this.isPick?this.isPick:false,
         pickCategory:this.isPick? this.pickCategory.join(','):'',
         frontCategory:this.isFront? this.frontCategory.join(','):''
       }).then(res => {