|
@@ -49,7 +49,7 @@
|
|
|
<!-- 消息通知 -->
|
|
|
<div class="notes-box" v-if="notesList.length && nowRoute.indexOf('notice')<0">
|
|
|
<div v-for="item in notesList" :key="item.id">
|
|
|
- <a-alert v-if="item.notice.bizType=='TEMP_ORDER'" type="error" showIcon closable @close="setRead(item)">
|
|
|
+ <a-alert v-if="item.notice.bizType=='TEMP_ORDER'" type="warning" showIcon closable @close="setRead(item)">
|
|
|
<div slot="description">
|
|
|
【急送提醒】{{ item.notice.plainContent }} <a-button @click="toAction(item)" size="small" type="link" class="button-info">点击查看</a-button>
|
|
|
</div>
|
|
@@ -64,13 +64,16 @@
|
|
|
【订单提醒】{{ item.notice.plainContent }} <a-button @click="toAction(item)" size="small" type="link" class="button-info">点击查看</a-button>
|
|
|
</div>
|
|
|
</a-alert>
|
|
|
- <a-alert v-if="item.notice.bizType=='SHELF_WARN'" type="error" showIcon closable @close="setRead(item)">
|
|
|
+ <a-alert v-if="item.notice.bizType=='SHELF_WARN'" type="warning" showIcon closable @close="setRead(item)">
|
|
|
<div slot="description">
|
|
|
【货架异常提醒】{{ item.notice.plainContent }} <a-button @click="toAction(item)" size="small" type="link" class="button-info">点击查看</a-button>
|
|
|
</div>
|
|
|
</a-alert>
|
|
|
</div>
|
|
|
- <div class="notes-more" @click="toNotes">更多消息>></div>
|
|
|
+ <div class="notes-footer">
|
|
|
+ <div class="notes-more" @click="noDoNotes">暂不处理</div>
|
|
|
+ <div class="notes-more" @click="toNotes">更多消息>></div>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
<audio controls="controls" hidden :src="mp3" ref="audio"></audio>
|
|
|
<!-- 视频播放弹窗 -->
|
|
@@ -343,7 +346,7 @@ export default {
|
|
|
notice: {
|
|
|
type: 'tx'
|
|
|
},
|
|
|
- readFlag: 0
|
|
|
+ readFlag: 1
|
|
|
}).then((res) => {
|
|
|
if (res.status == 200) {
|
|
|
const data = res.data
|
|
@@ -359,9 +362,15 @@ export default {
|
|
|
})
|
|
|
},
|
|
|
toAction (data) {
|
|
|
+ console.log(this.nowRoute)
|
|
|
// 急送订单
|
|
|
if (data.notice.extInfo.bizType == 'TEMP_ORDER') {
|
|
|
- this.$router.push({ name: 'salesDetail', params: { sn: data.notice.extInfo.bizSn } })
|
|
|
+ if (this.nowRoute.indexOf('salesManagement/salesQuery/detail') >= 0) {
|
|
|
+ this.$router.go(-1)
|
|
|
+ }
|
|
|
+ setTimeout(() => {
|
|
|
+ this.$router.push({ name: 'salesDetail', params: { sn: data.notice.extInfo.bizSn } })
|
|
|
+ }, 500)
|
|
|
}
|
|
|
// 补货订单
|
|
|
if (data.notice.extInfo.bizType == 'SHELF_REPLENISH') {
|
|
@@ -369,7 +378,12 @@ export default {
|
|
|
}
|
|
|
// 货架订单
|
|
|
if (data.notice.extInfo.bizType == 'SHELF_ORDER') {
|
|
|
- this.$router.push({ name: 'shelfOrderDetail', params: { sn: data.notice.extInfo.bizSn } })
|
|
|
+ if (this.nowRoute.indexOf('numsGoodsShelves/shelfOrder/shelfOrderDetail') >= 0) {
|
|
|
+ this.$router.go(-1)
|
|
|
+ }
|
|
|
+ setTimeout(() => {
|
|
|
+ this.$router.push({ name: 'shelfOrderDetail', params: { sn: data.notice.extInfo.bizSn } })
|
|
|
+ }, 500)
|
|
|
}
|
|
|
// 货架异常
|
|
|
if (data.notice.extInfo.bizType == 'SHELF_WARN') {
|
|
@@ -389,6 +403,9 @@ export default {
|
|
|
},
|
|
|
toNotes () {
|
|
|
this.$router.push({ path: '/notice' })
|
|
|
+ },
|
|
|
+ noDoNotes () {
|
|
|
+ this.notesList = []
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -416,15 +433,24 @@ export default {
|
|
|
.ant-alert-with-description .ant-alert-description{
|
|
|
font-size: 14px;
|
|
|
}
|
|
|
- .notes-more{
|
|
|
- padding: 10px;
|
|
|
- text-align:center;
|
|
|
- color:#00aaff;
|
|
|
- font-size: 14px;
|
|
|
- cursor:pointer;
|
|
|
+ .notes-footer{
|
|
|
+ display:flex;
|
|
|
background: #fff;
|
|
|
border: 1px solid #eee;
|
|
|
border-radius: 5px 5px 0 0;
|
|
|
+ > div{
|
|
|
+ width: 50%;
|
|
|
+ &:first-child{
|
|
|
+ border-right:1px solid #eee;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ .notes-more{
|
|
|
+ padding: 10px;
|
|
|
+ text-align:center;
|
|
|
+ color:#00aaff;
|
|
|
+ font-size: 14px;
|
|
|
+ cursor:pointer;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
</style>
|