Merge branch 'master' into develop

zenglf

2023-09-28 8e75a78f55d60565eb48b25eafd4eb07939ce2cc

 src/views/mdc/base/modules/deviceRepair/DeviceRepairEditListModel.vue

@@ -150,7 +150,11 @@
      },
      loadData(arg) {
        if(!this.url.list){
          this.$message.error("请设置url.list属性!")
          // this.$message.error("请设置url.list属性!")
          this.$notification.error({
            message:'消息',
            description:"请设置url.list属性!"
          });
          return
        }
        //加载数据 若传入参数1则加载第一页的内容
@@ -177,7 +181,11 @@
            }
            //update-end---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
          }else{
            this.$message.warning(res.message)
            // this.$message.warning(res.message)
            this.$notification.warning({
              message:'消息',
              description:res.message
            });
          }
        }).finally(() => {
          this.loading = false