Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

liuyg

2021-12-25 ef46e4b78e81418a831d4f7f21eb24d2fd4d35e1

 src/views/securityUnitChild/social.vue

@@ -233,8 +233,8 @@
            prop: "residence",
            labelWidth: 110,
            overHidden: true,
            addDisabled: true,
            editDisabled: true,
            addDisabled: false,
            editDisabled: false,
            rules: [
              {
                required: true,
@@ -333,33 +333,6 @@
            tip: "请上传 .xls,.xlsx 标准格式文件",
            action: "/api/social/import-user?deptid=" + deptid,
          },
          // {
          //   label: "数据覆盖",
          //   prop: "isCovered",
          //   type: "switch",
          //   align: "center",
          //   hide: true,
          //   width: 80,
          //   dicData: [
          //     {
          //       label: "否",
          //       value: 0,
          //     },
          //     {
          //       label: "是",
          //       value: 1,
          //     },
          //   ],
          //   value: 0,
          //   slot: true,
          //   rules: [
          //     {
          //       required: true,
          //       message: "请选择是否覆盖",
          //       trigger: "blur",
          //     },
          //   ],
          // },
          {
            label: "模板下载",
            prop: "excelTemplate",
@@ -425,7 +398,7 @@
          var d = res.data.data;
          this.form.cardid = d.cardid;
          this.form.telephone = d.phone;
          this.form.residence = d.nativeplace;
          this.form.residence = d.registered;
          this.form.address = d.address;
          this.form.sex = d.sex;
          this.form.nation = d.nation;