Merge remote-tracking branch 'origin/master' into develop

zenglf

2023-09-28 997835429a1d66643364091e8437ebbbeb8ff97a

 src/views/mdc/base/modules/HolidayManagement/HolidayManagementModal.vue

@@ -112,6 +112,22 @@
              },
            ],
          },
          vacationDate:{
            rules:[
              {
                required:true,
                message: "请选择休假时间"
              },
            ],
          },
          vacationType:{
            rules:[
              {
                required:true,
                message: "请选择假期类型"
              },
            ],
          },
        },

        url: {
@@ -126,7 +142,6 @@
    },
    created() {
    },

    methods: {
      // disabledDate(current){
      //   //Can not slect days before today and today
@@ -248,7 +263,7 @@
                obj.then((res) => {
                  if (res.success) {
                    // that.$message.success("添加成功")
                    that.$notification.warning({
                    that.$notification.success({
                      message:'消息',
                      description:"添加成功"
                    });