Merge remote-tracking branch 'origin/master'

zhuzhuanzhuan

2023-08-16 fe9f8c2f1c21a2db600d9563aa7baa7ccc42715e

 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.warning({
                  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