Merge branch 'master' into develop

zenglf

2023-09-28 8e75a78f55d60565eb48b25eafd4eb07939ce2cc

 src/views/system/modules/DepartList/DepartDataruleModal.vue

@@ -72,7 +72,11 @@
      },
      saveDataruleForRole(){
        if(!this.dataruleChecked || this.dataruleChecked.length==0){
          this.$message.warning("请注意，现未勾选任何数据权限!")
          // this.$message.warning("请注意，现未勾选任何数据权限!")
          this.$notification.warning({
            message:'消息',
            description:"请注意，现未勾选任何数据权限!"
          });
        }
        let params = {
          permissionId:this.functionId,
@@ -81,9 +85,19 @@
        }
        postAction(this.url.datarule,params).then(res=>{
          if(res.success){
            this.$message.success(res.message)
            // this.$message.success(res.message)
            this.$notification.warning({
              message:'消息',
              description:res.message
            });

          }else{
            this.$message.error(res.message)

            // this.$message.error(res.message)
            this.$notification.warning({
              message:'消息',
              description:res.message
            });
          }
        })
      },