Merge remote-tracking branch 'origin/master'

zhaowei

10 天以前 008245cbe95c63a80f9a255378a5ffbe25d15085

 src/views/mdc/base/modules/shift/ShiftSystem.vue

@@ -1,11 +1,11 @@
<template>
  <a-card :bordered="false" class="shift_system">
  <div class="shift_system">
    <!-- 操作按钮区域 -->
    <div class="table-operator">
      <a-button type="primary" @click="handleAdd" icon="plus">新增</a-button>
    </div>
    <!-- table区域-begin -->
    <div>
    <div style="flex: 1;overflow: auto">
      <a-table ref="table" bordered size="middle" rowKey="id" :columns="columns"
               :dataSource="dataSource" :pagination="false" :loading="loading"
               :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange,type:'radio'}">
@@ -55,12 +55,13 @@
    </div>

    <shift-system-model ref="modalForm" @ok="modalFormOk"></shift-system-model>
  </a-card>
  </div>
</template>

<script>
  import qs from 'qs'
  import {
    requestPut, putAction, deleteAction
    requestPut, putAction, deleteAction,postAction
  } from '@/api/manage'
  import {
    JeecgListMixin
@@ -81,7 +82,8 @@
        url: {
          list: '/mdc/mdcMdcShift/queryPageList',
          changeStatus: '/mdc/mdcMdcShift/changeStatus',
          deleteBatch:'/mdc/mdcMdcShift/deleteShift'
          deleteBatch:'/mdc/mdcMdcShift/deleteShift',
          changeDefaultShift: '/mdc/mdcMdcShift/changeDefaultShift'
        },
        columns: [
          {
@@ -115,10 +117,16 @@
        let _this = this
        putAction(this.url.changeStatus, { id: id, status: status }).then((res) => {
          if (res.success) {
            _this.$message.success('操作成功！')
            _this.$notification.success({
              message:'消息',
              description:res.message
            })
            _this.loadData()
          } else {
            that.$message.warning('操作失败！')
            _this.$notification.warning({
              message:'消息',
              description:res.message
            });
          }
        })
      },
@@ -128,7 +136,22 @@
        this.$refs.modalForm.disableSubmit = false
      },
      handleDefault:function(record){

        postAction(this.url.changeDefaultShift,qs.stringify({id:record.id})).then((res) =>{
            if(res.success){
              // this.$message.success(res.message);
              this.$notification.success({
                message:'消息',
                description:res.message
              });
              this.loadData()
            }else{
              // this.$message.success(res.message);
              this.$notification.warning({
                message:'消息',
                description:res.message
              });
            }
        })
      },
      handleDelete: function(record){
        if(!this.url.deleteBatch){
@@ -138,10 +161,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,34 +195,35 @@
</script>

<style lang="less" scoped>
  .shift_system{
    overflow: auto;
    display: flex;
    flex-direction: column;
  }

  @media screen and (min-width: 1920px){
    .shift_system{
      height: 748px!important;
      overflow: scroll;
    }
  }
  @media screen and (min-width: 1680px) and (max-width: 1920px){
    .shift_system{
      height: 748px!important;
      overflow: scroll;
    }
  }
  @media screen and (min-width: 1400px) and (max-width: 1680px){
    .shift_system{
      height: 600px!important;
      overflow: scroll;
    }
  }
  @media screen and (min-width: 1280px) and (max-width: 1400px){
    .shift_system{
      height: 501px!important;
      overflow: scroll;
    }
  }
  @media screen and (max-width: 1280px){
    .shift_system{
      height: 501px!important;
      overflow: scroll;
    }
  }
</style>