Merge remote-tracking branch 'origin/master'

zhaowei

10 天以前 008245cbe95c63a80f9a255378a5ffbe25d15085

 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>
@@ -153,10 +153,18 @@
        var that = this;
        deleteAction(that.url.deleteBatch, {id: record}).then((res) => {
          if (res.success) {
            that.$message.success(res.message);
            // that.$message.success(res.message);
            that.$notification.success({
              message:'消息',
              description:res.message
            });
            that.loadData();
          } else {
            that.$message.warning(res.message);
            // that.$message.warning(res.message);
            that.$notification.warning({
              message:'消息',
              description:res.message
            });
          }
        });
      },
@@ -164,10 +172,18 @@
        let _this = this
        putAction(this.url.changeStatus, { id: id, status: status }).then((res) => {
          if (res.success) {
            _this.$message.success('操作成功！')
            // _this.$message.success('操作成功！')
            _this.$notification.success({
              message:'消息',
              description:"操作成功"
            });
            _this.loadData()
          } else {
            that.$message.warning('操作失败！')
            // _this.$message.warning('操作失败！')
            _this.$notification.warning({
              message:'消息',
              description:"操作失败"
            });
          }
        })
      },
@@ -185,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>