rev:1.生产入库:650的箱子优先入1层 2.1层空托盘扩容 3.立库主存区仓位预警提示 4.仓位查询页面优化:增加立库层数、是否空位条件查询。
This commit is contained in:
@@ -1,21 +1,22 @@
|
||||
<template>
|
||||
<el-popover
|
||||
placement="top-end"
|
||||
width="450"
|
||||
width="900"
|
||||
trigger="manual"
|
||||
v-model="visible">
|
||||
点击信息标识已读
|
||||
<div style="margin: 5px" v-loading="loading">
|
||||
<el-tabs v-model="activeName" @tab-click="handleClick">
|
||||
<el-tab-pane :label="d.label" :name="d.value" v-for="d in dict.notice_type" :key="d.id">
|
||||
<el-tabs v-model="activeName" @tab-click="handleClick" >
|
||||
<el-tab-pane :label="d.label" :name="d.value" v-for="d in dict.notice_type" :key="d.id" >
|
||||
<el-empty v-if="notReadMsgList && notReadMsgList[d.value-1] && notReadMsgList[d.value-1].length === 0" description="暂无信息" ></el-empty>
|
||||
<div v-for="o in notReadMsgList[d.value-1]" :key="o.notice_id">
|
||||
<a href="javascript:" @click="showMessage(o)">
|
||||
<el-row @click="showMessage">
|
||||
<el-col :span="6">
|
||||
<el-col :span="2">
|
||||
<el-tag type="danger">{{ dict.label.notice_type[o.notice_type] }}</el-tag>
|
||||
</el-col>
|
||||
<el-col :span="9" style="font-weight: bolder">{{o.notice_title}}</el-col>
|
||||
<el-col :span="9" style="color: #cccccc">{{o.create_time}}</el-col>
|
||||
<el-col :span="15" style="font-weight: bolder">{{o.notice_title}}</el-col>
|
||||
<el-col :span="7" style="color: #cccccc">{{o.create_time}}</el-col>
|
||||
</el-row>
|
||||
<el-divider ></el-divider>
|
||||
</a>
|
||||
@@ -38,6 +39,7 @@
|
||||
<script>
|
||||
import crudNotice from './sysNotice'
|
||||
import { NOTICE_MESSAGE_UPDATE, NOTICE_SHOW_MESSAGE } from './VueBaseCode'
|
||||
import crudStage from '@/api/logicflow/stage'
|
||||
export default {
|
||||
dicts: ['deal_status', 'have_read_type', 'notice_type'],
|
||||
name: 'NoticeIcon',
|
||||
@@ -45,7 +47,7 @@ export default {
|
||||
return {
|
||||
loading: false,
|
||||
visible: false,
|
||||
activeName: '1',
|
||||
activeName: '2',
|
||||
// 未读消息数量
|
||||
notReadMsgCount: 0,
|
||||
// 消息内容
|
||||
@@ -85,6 +87,19 @@ export default {
|
||||
this.notReadMsgCount = res
|
||||
})
|
||||
},
|
||||
beforeDestroy() {
|
||||
// js提供的clearInterval方法用来清除定时器
|
||||
console.log('定时器销毁')
|
||||
clearInterval(this.timer)
|
||||
},
|
||||
// 定时获取消息数量
|
||||
initStageData() {
|
||||
// todo: 定时器
|
||||
this.timer = setInterval(() => {
|
||||
console.log('定时器启动')
|
||||
this.receivedCount()
|
||||
}, 50000)
|
||||
},
|
||||
/**
|
||||
* 查看消息
|
||||
*/
|
||||
@@ -92,6 +107,7 @@ export default {
|
||||
// 标记已读
|
||||
crudNotice.read(message.notice_id).then(() => {
|
||||
this.receivedCount()
|
||||
this.getMessage()
|
||||
})
|
||||
this.$bus.emit(NOTICE_SHOW_MESSAGE, message)
|
||||
this.visible = false
|
||||
@@ -113,6 +129,7 @@ export default {
|
||||
mounted() {
|
||||
this.getMessage()
|
||||
this.receivedCount()
|
||||
this.initStageData()
|
||||
this.$bus.on(NOTICE_MESSAGE_UPDATE, this.receivedCount) // 监听事件
|
||||
},
|
||||
destroyed() {
|
||||
|
||||
Reference in New Issue
Block a user