|
@@ -146,13 +146,6 @@
|
|
|
<el-row :gutter="12" class="mt-20" style="height: 404px;">
|
|
<el-row :gutter="12" class="mt-20" style="height: 404px;">
|
|
|
<el-col :span="18" class="box-col">
|
|
<el-col :span="18" class="box-col">
|
|
|
<el-card class="box-card">
|
|
<el-card class="box-card">
|
|
|
- <!-- <div slot="header" class="clearfix">
|
|
|
|
|
- <span>通知公告</span>
|
|
|
|
|
- <span style="float: right; padding: 3px 0">
|
|
|
|
|
- <i class="el-icon-edit"></i>
|
|
|
|
|
- <i class="el-icon-setting"></i>
|
|
|
|
|
- </span>
|
|
|
|
|
- </div> -->
|
|
|
|
|
<div class="card-content">
|
|
<div class="card-content">
|
|
|
<el-tabs v-model="activeTab" @tab-click="handleTabClick">
|
|
<el-tabs v-model="activeTab" @tab-click="handleTabClick">
|
|
|
<el-tab-pane label="通知公告" name="notice"></el-tab-pane>
|
|
<el-tab-pane label="通知公告" name="notice"></el-tab-pane>
|
|
@@ -161,7 +154,7 @@
|
|
|
</el-tabs>
|
|
</el-tabs>
|
|
|
|
|
|
|
|
<div v-if="notifications.length > 0" class="notification-list">
|
|
<div v-if="notifications.length > 0" class="notification-list">
|
|
|
- <div v-for="(item, index) in notifications" :key="index" class="notification-item">
|
|
|
|
|
|
|
+ <div v-for="(item, index) in notifications" :key="index" class="notification-item" @click="handleNotificationsClick(item)">
|
|
|
<div class="notification-dot"></div>
|
|
<div class="notification-dot"></div>
|
|
|
<div class="notification-content">
|
|
<div class="notification-content">
|
|
|
<div class="notification-header">
|
|
<div class="notification-header">
|
|
@@ -174,7 +167,7 @@
|
|
|
</div>
|
|
</div>
|
|
|
<div v-else class="notification-text">{{ item.content }}</div>
|
|
<div v-else class="notification-text">{{ item.content }}</div>
|
|
|
</div>
|
|
</div>
|
|
|
- <div class="notification-info"><span style="margin-right: 20px;">{{ item.department }}</span> {{ item.createUser }}</div>
|
|
|
|
|
|
|
+ <div class="notification-info">{{ item.createUser }} <span style="margin-left: 20px;">{{ item.department }}</span></div>
|
|
|
</div>
|
|
</div>
|
|
|
<div class="notification-date">{{ item.createTime }}</div>
|
|
<div class="notification-date">{{ item.createTime }}</div>
|
|
|
</div>
|
|
</div>
|
|
@@ -323,6 +316,17 @@ export default {
|
|
|
this.getMyWorkCalendar();
|
|
this.getMyWorkCalendar();
|
|
|
},
|
|
},
|
|
|
methods: {
|
|
methods: {
|
|
|
|
|
+ handleNotificationsClick(item) {
|
|
|
|
|
+ console.log('item~~~', item);
|
|
|
|
|
+ this.$router.push({
|
|
|
|
|
+ path: '/page-wt/documents/noticeIssuance/add-or-edit',
|
|
|
|
|
+ // query
|
|
|
|
|
+ query: {
|
|
|
|
|
+ id: item.id,
|
|
|
|
|
+ type: 'detail'
|
|
|
|
|
+ }
|
|
|
|
|
+ });
|
|
|
|
|
+ },
|
|
|
async getMyWorkCalendar() {
|
|
async getMyWorkCalendar() {
|
|
|
const res = await getMyWorkCalendar({
|
|
const res = await getMyWorkCalendar({
|
|
|
startDate: this.calendarRange[0],
|
|
startDate: this.calendarRange[0],
|
|
@@ -396,7 +400,7 @@ export default {
|
|
|
this.handelRouterTo('/page-qms/inspectionWork')
|
|
this.handelRouterTo('/page-qms/inspectionWork')
|
|
|
break;
|
|
break;
|
|
|
case '生产工单':
|
|
case '生产工单':
|
|
|
- this.handelRouterTo('/page-mes/produceOrder')
|
|
|
|
|
|
|
+ this.handelRouterTo('/page-mes/produceOrder?isWt=true')
|
|
|
break;
|
|
break;
|
|
|
case '盘点工单':
|
|
case '盘点工单':
|
|
|
this.handelRouterTo('/page-wms/warehouseManagement/stocktaking/work')
|
|
this.handelRouterTo('/page-wms/warehouseManagement/stocktaking/work')
|
|
@@ -974,7 +978,7 @@ export default {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
.notification-title {
|
|
.notification-title {
|
|
|
- font-size: 14px;
|
|
|
|
|
|
|
+ font-size: 15px;
|
|
|
font-weight: 500;
|
|
font-weight: 500;
|
|
|
color: #333;
|
|
color: #333;
|
|
|
margin-right: 12px;
|
|
margin-right: 12px;
|
|
@@ -983,11 +987,12 @@ export default {
|
|
|
text-overflow: ellipsis;
|
|
text-overflow: ellipsis;
|
|
|
flex-shrink: 1;
|
|
flex-shrink: 1;
|
|
|
max-width: 200px;
|
|
max-width: 200px;
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
.notification-info {
|
|
.notification-info {
|
|
|
font-size: 12px;
|
|
font-size: 12px;
|
|
|
- color: #999;
|
|
|
|
|
|
|
+ color: #333;
|
|
|
white-space: nowrap;
|
|
white-space: nowrap;
|
|
|
overflow: hidden;
|
|
overflow: hidden;
|
|
|
text-overflow: ellipsis;
|
|
text-overflow: ellipsis;
|
|
@@ -995,7 +1000,7 @@ export default {
|
|
|
|
|
|
|
|
.notification-text {
|
|
.notification-text {
|
|
|
font-size: 12px;
|
|
font-size: 12px;
|
|
|
- color: #666;
|
|
|
|
|
|
|
+ color: #333;
|
|
|
line-height: 1.4;
|
|
line-height: 1.4;
|
|
|
flex: 1;
|
|
flex: 1;
|
|
|
min-width: 0;
|
|
min-width: 0;
|