Merge remote-tracking branch 'origin/master'

zhaowei

4 天以前 31d62d0ac0bf6fdcb200ffeaa7b4e15aaf2d4946

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

@@ -121,10 +121,18 @@
            }
            obj.then((res) => {
              if (res.success) {
                that.$message.success(res.message)
                // that.$message.success(res.message)
                that.$notification.success({
                  message:'消息',
                  description:res.message
                });
                that.$emit('ok', res.result)
              } else {
                that.$message.warning(res.message)
                // that.$message.warning(res.message)
                that.$notification.warning({
                  message:'消息',
                  description:res.message
                });
              }
            }).finally(() => {
              that.confirmLoading = false