From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/mdc/base/modules/shift/ShiftInfo.vue | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/views/mdc/base/modules/shift/ShiftInfo.vue b/src/views/mdc/base/modules/shift/ShiftInfo.vue
index 7d80453..e6d104e 100644
--- a/src/views/mdc/base/modules/shift/ShiftInfo.vue
+++ b/src/views/mdc/base/modules/shift/ShiftInfo.vue
@@ -1,11 +1,11 @@
<template>
- <a-card :bordered="false" class="shift_info">
+ <div class="shift_info">
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
<div class="table-operator">
<a-button type="primary" v-if="Object.keys(shiftSystemRow).length>0" @click="handleAdd" icon="plus">閰嶇疆</a-button>
</div>
<!-- table鍖哄煙-begin -->
- <div style="width: 100%;">
+ <div style="width: 100%;flex: 1;overflow: auto">
<a-table ref="table" bordered size="middle" rowKey="id" :columns="columns"
:dataSource="dataSource" :pagination="false" :loading="loading">
<span
@@ -50,7 +50,7 @@
</div>
<shift-info-model ref="modalForm" @ok="modalFormOk"></shift-info-model>
- </a-card>
+ </div>
</template>
<script>
@@ -154,7 +154,7 @@
deleteAction(that.url.deleteBatch, {id: record}).then((res) => {
if (res.success) {
// that.$message.success(res.message);
- that.$notification.warning({
+ that.$notification.success({
message:'娑堟伅',
description:res.message
});
@@ -173,7 +173,7 @@
putAction(this.url.changeStatus, { id: id, status: status }).then((res) => {
if (res.success) {
// _this.$message.success('鎿嶄綔鎴愬姛锛�')
- _this.$notification.warning({
+ _this.$notification.success({
message:'娑堟伅',
description:"鎿嶄綔鎴愬姛"
});
@@ -201,34 +201,35 @@
</script>
<style lang="less" scoped>
+ .shift_info{
+ overflow: hidden;
+ display: flex;
+ flex-direction: column;
+ }
+
@media screen and (min-width: 1920px){
.shift_info{
height: 748px!important;
- overflow: scroll;
}
}
@media screen and (min-width: 1680px) and (max-width: 1920px){
.shift_info{
height: 748px!important;
- overflow: scroll;
}
}
@media screen and (min-width: 1400px) and (max-width: 1680px){
.shift_info{
height: 600px!important;
- overflow: scroll;
}
}
@media screen and (min-width: 1280px) and (max-width: 1400px){
.shift_info{
height: 501px!important;
- overflow: scroll;
}
}
@media screen and (max-width: 1280px){
.shift_info{
height: 501px!important;
- overflow: scroll;
}
}
</style>
--
Gitblit v1.9.3