Merge branch 'master' into develop

zenglf

2023-09-28 8e75a78f55d60565eb48b25eafd4eb07939ce2cc

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

@@ -33,6 +33,9 @@
              <a-icon type="down"/>
            </a>
            <a-menu slot="overlay">
                <a-menu-item v-if="record.shiftStatus == 1">
                <a key="0" @click="handleDefault(record)">设置为默认</a>
              </a-menu-item>
              <a-menu-item v-if="record.shiftStatus == 1">
                <a key="1" @click="handleEdit(record)">编辑</a>
              </a-menu-item>
@@ -56,8 +59,9 @@
</template>

<script>
  import qs from 'qs'
  import {
    requestPut, putAction, deleteAction
    requestPut, putAction, deleteAction,postAction
  } from '@/api/manage'
  import {
    JeecgListMixin
@@ -78,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,7 +120,7 @@
            _this.$message.success('操作成功！')
            _this.loadData()
          } else {
            that.$message.warning('操作失败！')
            _this.$message.warning('操作失败！')
          }
        })
      },
@@ -123,6 +128,24 @@
        this.$refs.modalForm.add()
        this.$refs.modalForm.title = '班制配置'
        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.warning({
                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){
@@ -132,10 +155,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.warning({
              message:'消息',
              description:res.message
            });
            that.loadData();
          } else {
            that.$message.warning(res.message);
            // that.$message.warning(res.message);
            that.$notification.warning({
              message:'消息',
              description:res.message
            });
          }
        });
      },