Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_enterprises

shuishen

2021-09-01 4da370f500cbabfbeb75f8006b8a3403656c4c5f

 src/views/securityUnitChild/social.vue

@@ -76,6 +76,7 @@
  props: ["deptid"],
  data() {
    var deptid = this.deptid;

    return {
      do: 0,
      form: { cardid: "" },
@@ -325,7 +326,7 @@
              res: "data",
            },
            tip: "请上传 .xls,.xlsx 标准格式文件",
            action: "/api/social/import-user",
            action: "/api/social/import-user?deptid=" + deptid,
          },
          // {
          //   label: "数据覆盖",