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

liuyg

2021-12-29 ef992ecbf20a65db22860b54a54f98bff0a5b04d

 src/views/securityUnitChild/manager.vue

@@ -74,7 +74,7 @@
import { mapGetters } from "vuex";
import { getToken } from "@/util/auth";
export default {
  props: ["deptid"],
  props: ["deptid","stats"],
  data() {
    var deptid = this.deptid;
    if (deptid == undefined) {
@@ -126,11 +126,21 @@
            label: "姓名",
            prop: "name",
            search: true,
            rules: [{
                required: true,
                message: "请输入姓名",
                trigger: "blur"
            }],
          },
          {
            label: "职务",
            prop: "post",
            search: true,
            rules: [{
                required: true,
                message: "请输入职务",
                trigger: "blur"
            }],
          },
          {
            label: "身份证",
@@ -139,6 +149,42 @@
          {
            label: "联系电话",
            prop: "cell",
          },
          {
            label: "学历",
            prop: "education",
            display:false,
            row:true,
            hide:true,
            rules: [{
                required: true,
                message: "请选择学历",
                trigger: "blur"
            }],
            dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationTypes",
            search: false,
            searchSpan: 4,
            type: "select",
            props: {
                label: "dictValue",
                value: "dictKey"
            },
            dataType: "number",
          },
          {
            label: "证书",
            prop: "paper",
            type: "upload",
            dataType:"string",
            listType: "picture-card",
            span: 24,
            propsHttp: {
              res: "data",
            },
            tip: "只能上传jpg/png格式图片，且不超过2Mb",
            action: "/api/blade-resource/oss/endpoint/put-files",
            display:false,
            hide:true,
          },
        ],
      },
@@ -173,6 +219,23 @@
  },
  created() {
    this.option.height = this.windowHeight - 320;
    if (this.stats == "1") {
        //分公司
        const educationcolumn = this.findObject(
            this.option.column,
            "education"
          );
          const papercolumn = this.findObject(
            this.option.column,
            "paper"
          );
          //法人及电话不可见
          educationcolumn.display = true;
          educationcolumn.hide = false;
          educationcolumn.search = true;
          papercolumn.display = true;
          papercolumn.hide = false;
      }
  },
  computed: {
    ...mapGetters(["permission", "userInfo", "windowHeight"]),
@@ -250,7 +313,7 @@
      );
    },
    uploadAfter(res, done, loading, column) {
      window.console.log(column);
      // window.console.log(column);
      this.excelBox = false;
      this.refreshChange();
      done();