Bladeren bron

bug 修复

lilei 2 jaren geleden
bovenliggende
commit
d34fcad079

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1663838437853
+  "version": 1663841283728
 }

+ 1 - 2
src/layouts/BasicLayout.vue

@@ -230,7 +230,6 @@ export default {
       if (a !== b && a) {
         // 新未读消息
         if (a.type == 'new_remind' && this.nowRoute.indexOf('notice') < 0) {
-          console.log(a.type)
           this.getNotes()
           // 播放音效
           this.playAudio()
@@ -372,7 +371,7 @@ export default {
       }
       // 货架异常
       if (data.notice.extInfo.bizType == 'SHELF_WARN') {
-        this.$router.push({ name: 'shelfOrderList', query: { shelfSn: data.notice.extInfo.bizSn } })
+        this.$router.push({ name: 'shelfOrderList', query: { bizType: 'SHELF_WARN', shelfSn: data.notice.extInfo.bizSn } })
       }
       // 设置已读
       this.setRead(data)

+ 1 - 1
src/views/notice/list.vue

@@ -177,7 +177,7 @@ export default {
       }
       // 货架异常
       if (data.notice.extInfo.bizType == 'SHELF_WARN') {
-        this.$router.push({ name: 'shelfOrderList', query: { shelfSn: data.notice.extInfo.bizSn } })
+        this.$router.push({ name: 'shelfOrderList', query: { bizType: 'SHELF_WARN', shelfSn: data.notice.extInfo.bizSn } })
       }
       this.hasRead({ msg_id: data.id }).then(res => {
         // 刷新列表

+ 2 - 1
src/views/numsGoodsShelves/replenishmentManagement/list.vue

@@ -416,7 +416,8 @@ export default {
           this.tabPaneData[3].countNum = res.data.WAIT_CHECK || 0
           this.tabPaneData[4].countNum = res.data.FINISH || 0
           this.tabPaneData[5].countNum = res.data.CANCEL || 0
-          this.queryParam.bizType = this.curBizType
+          this.queryParam.bizType = this.$route.query && this.$route.query.bizType || this.curBizType
+          this.curBizType = this.queryParam.bizType
           this.$refs.table.refresh(!flag)
         }
         this.spinning = false

+ 6 - 2
src/views/numsGoodsShelves/shelfOrder/list.vue

@@ -12,7 +12,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="货架名称">
-                <shelfSList mode="multiple" v-model="queryParam.shelfSnList"></shelfSList>
+                <shelfSList ref="shelfSList" mode="multiple" v-model="queryParam.shelfSnList"></shelfSList>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -143,7 +143,11 @@ export default {
       this.queryParam.orderEndDate = ''
       this.queryParam.orderBillNo = ''
       this.queryParam.billState = undefined
-      this.queryParam.shelfSnList = undefined
+      if (this.$route.query && this.$route.query.bizType == 'SHELF_WARN') {
+        this.queryParam.shelfSnList = [this.$route.query.shelfSn]
+      } else {
+        this.queryParam.shelfSnList = undefined
+      }
       this.$refs.table.refresh(true)
     },
     setTableH () {