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

liuyg

2021-12-29 ef992ecbf20a65db22860b54a54f98bff0a5b04d

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

 public/img/top/shield.png

 src/api/accreditationRecords/accreditationRecords.js

@@ -82,4 +82,12 @@
        method: 'post',
        data: row
    })
}

export const batchAccreditation = (row) => {
    return request({
        url: '/api/accreditationRecords/batchAccreditation',
        method: 'post',
        data: row
    })
}

 src/api/securityUnit/securityUnit.js

@@ -95,6 +95,26 @@
    })
}

export const getLicenceDetail = (deptId) => {
    return request({
        url: '/api/licencePaper/detail',
        method: 'get',
        params: {
            deptId,
        }
    })
}

export const getLicenceInfos = (deptId) => {
    return request({
        url: '/api/licencePaper/getLicenceInfos',
        method: 'get',
        params: {
            deptId,
        }
    })
}

export const adddata1 = (row) => {
    return request({
        url: '/api/shareholder/save',
@@ -103,6 +123,29 @@
    })
}

export const submit = (row) => {
    return request({
        url: '/api/business/submit',
        method: 'post',
        data: row
    })
}
export const licenceSubmit = (row) => {
    return request({
        url: '/api/licencePaper/submit',
        method: 'post',
        data: row
    })
}

export const submitGroup = (row) => {
    return request({
        url: '/api/licencePaper/submitGroup',
        method: 'post',
        data: row
    })
}

export const update1 = (row) => {
    return request({
        url: '/api/shareholder/update',

 src/page/index/logo.vue

@@ -1,10 +1,11 @@
<template>
  <div class="avue-logo">
    <transition name="fade">
    <!-- <transition name="fade">
      <span v-if="keyCollapse" class="avue-logo_subtitle" key="0">
        {{ website.logo }}
      </span>
    </transition>
    </transition> -->
    <img v-if="keyCollapse" src="../../../public/img/top/shield.png" />
    <transition-group name="fade">
      <template v-if="!keyCollapse">
        <span class="avue-logo_title" key="1">{{ website.indexTitle }} </span>
@@ -53,6 +54,18 @@
  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15);
  color: rgba(255, 255, 255, 0.8);
  z-index: 1024;
  display: flex;
  align-items: center;
  justify-content: center;
  img {
    // margin: 0 auto;
    width: 25px;
  }
  &:hover {
    img {
      display: none;
    }
  }
  &_title {
    display: block;
    text-align: center;

 src/page/index/top/index.vue

@@ -18,7 +18,7 @@
      </span>
    </div>
    <div class="top-bar__right">
      <el-tooltip
      <!-- <el-tooltip
        v-if="showColor"
        effect="dark"
        :content="$t('navbar.color')"
@@ -27,7 +27,7 @@
        <div class="top-bar__item">
          <top-color></top-color>
        </div>
      </el-tooltip>
      </el-tooltip> -->
      <!-- <el-tooltip
        v-if="showDebug"
        effect="dark"
@@ -82,7 +82,7 @@
          <top-drive></top-drive>
        </div>
      </el-tooltip>
      <el-tooltip
      <!-- <el-tooltip
        effect="dark"
        :content="$t('navbar.notice')"
        placement="bottom"
@@ -90,7 +90,7 @@
        <div class="top-bar__item top-bar__item--show">
          <top-notice></top-notice>
        </div>
      </el-tooltip>
      </el-tooltip> -->
      <!-- 中英文 -->
      <!-- <el-tooltip
        effect="dark"

 src/views/accreditationRecords/accreditationRecords.vue

@@ -46,6 +46,15 @@
          @click="handleExport"
          >保安员证信息导出
        </el-button>
        <el-button
          type="primary"
          size="small"
          plain
          v-if="permission.accreditationRecords_status"
          icon="el-icon-collection-tag"
          @click="handleBatch"
          >已制证
        </el-button>
        <!-- v-if="permission.notice_delete" -->
      </template>
      <template slot-scope="{ row }" slot="category">
@@ -87,6 +96,7 @@
  update,
  add,
  getAccreditationRecords,
  batchAccreditation
} from "@/api/accreditationRecords/accreditationRecords";
import { getDept } from "@/api/system/dept";
import { mapGetters } from "vuex";
@@ -120,7 +130,8 @@
        filterBtn: true,
        calcHeight: 30,
        dialogWidth: 950,
        tip: false,
        tip: true,
        reserveSelection: true,
        searchShow: true,
        searchMenuSpan: 6,
        border: true,
@@ -189,18 +200,11 @@
            label: "企业名称",
            searchLabelWidth: "110",
            prop: "deptName",
            // type: "tree",
            // dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
            // props: {
            //     label: "title",
            //     value: "id",
            // },
            slot: true,
            searchLabelWidth: 80,
            searchSpan: 5,
            search: true,
            overHidden: true,
            minWidth: 200,
            minWidth: 160,
          },
          {
            label: "性别",
@@ -215,23 +219,26 @@
            search: true,
            searchLabelWidth: 90,
            searchSpan: 5,
            width:140,
          },
          {
            label: "年龄",
            prop: "age",
            width:60,
          },
          {
            label: "照片",
            prop: "avatar",
            type: "upload",
            listType: "picture-img",
            width:60
          },
          {
            label: "保安证编号",
            prop: "securityNumber",
            search: true,
            searchLabelWidth: 90,
            minWidth: 105,
            width: 110,
            searchSpan: 5,
            addDisplay: false,
            editDisplay: false,
@@ -243,7 +250,7 @@
            prop: "applyName",
            // search: true,
            searchLabelWidth: 90,
            width: 80,
            minWidth: 80,
            // searchSpan: 4,
            addDisplay: false,
            editDisplay: false,
@@ -254,7 +261,7 @@
            prop: "applyUnit",
            search: true,
            searchLabelWidth: 120,
            minWidth: 105,
            minWidth: 120,
            searchSpan: 5,
            addDisplay: false,
            editDisplay: false,
@@ -265,7 +272,7 @@
            prop: "createTime",
            // search: true,
            searchLabelWidth: 90,
            minWidth: 105,
            width: 140,
            // searchSpan: 4,
            addDisplay: false,
            editDisplay: false,
@@ -295,6 +302,31 @@
              {
                label: "无",
                value: 2,
              },
            ],
          },
          {
            label: "是否制证",
            prop: "status",
            type: "select",
            slot: true,
            search: true,
            editDisplay: false,
            addDisplay: false,
            searchSpan: 4,
            width: 80,
            dicData: [
              {
                label: "全部",
                value: 3,
              },
              {
                label: "已制证",
                value: 2,
              },
              {
                label: "未制证",
                value: 1,
              },
            ],
          },
@@ -334,6 +366,9 @@
    this.getDeptInfo(this.userInfo.dept_id);
  },
  created() {
    if (this.userInfo.role_name == "上岗证办理管理员") {
      this.questionBankSearch["status"] = 1;
    }
    if (this.userInfo.role_name == "公安管理员") {
      //判断是否为市局管理员
      if (this.userInfo.jurisdiction == "1372091709474910209") {
@@ -346,6 +381,45 @@
    }
  },
  methods: {
    //证书批量修改为已制证
    handleBatch() {
      if (this.choiceList.length === 0) {
        this.$message.warning("请勾选至少一位持证保安员");
        return;
      }
      this.$confirm(
        "共选择人数" + this.choiceList.length + "人,确定已制证?",
        {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning",
        }
      )
        .then(() => {
          let cho = this.choiceList;
          let str = "";
          for (let k in cho) {
            str += cho[k].id;
            if (k != cho.length - 1) {
              str += ",";
            }
          }
          const data = {
            ids: str,
            createUser: this.userInfo.user_id,
            type: 1,
          };
          return batchAccreditation(data);
        })
        .then(() => {
          this.onLoad(this.page, this.questionBankSearch);
          this.$refs.crud.toggleSelection();
          this.$message({
            type: "success",
            message: "操作成功!",
          });
        });
    },
    //获取当前用户部门信息
    getDeptInfo(deptId) {
      var that = this;
@@ -439,7 +513,13 @@
      done();
    },
    selectionChange(list) {
      this.selectionList = list;
      // this.selectionList = list;
      this.choiceList = [];
      for (let k in list) {
        this.choiceList.push({
          id: list[k].id,
        });
      }
    },
    selectionClear() {
      this.selectionList = [];
@@ -459,7 +539,7 @@
          return remove(this.ids);
        })
        .then(() => {
          this.onLoad(this.page);
          this.onLoad(this.page, this.questionBankSearch);
          this.$message({
            type: "success",
            message: "操作成功!",
@@ -482,7 +562,7 @@
      this.page.pageSize = pageSize;
    },
    refreshChange() {
      this.onLoad(this.page, this.query);
      this.onLoad(this.page, this.questionBankSearch);
    },
    onLoad(page, params = {}) {
      params = this.questionBankSearch;
@@ -548,6 +628,7 @@
          startTime: this.questionBankSearch.startTime,
          endTime: this.questionBankSearch.endTime,
          isAvatar: this.questionBankSearch.isAvatar,
          status: this.questionBankSearch.status,
        };
        //导出
        if (this.userInfo.role_name == "保安公司管理员") {

 src/views/licenseApproval/securityGuard.vue

@@ -129,7 +129,7 @@
        ref="licence"
      >
        <div class="licence" id="licence" v-if="dialogVisible">
          <div class="licence-head">备案回执</div>
          <div class="licence-head">备案证</div>
          <div class="head-tid">
            编号
            <span class="fontStyle">{{

 src/views/securityAnalysis/child/certificate.vue

@@ -10,6 +10,7 @@
      :data="data1"
      :page.sync="page1"
      :table-loading="loading1"
       @sort-change="sortChange"
      @on-load="getPractitionersPageInfo(page1)"
      @search-change="searchChange"
      @search-reset="searchReset"
@@ -38,6 +39,8 @@
      search = false;
    }
    return {
      sort: "",
      sortName: "",
      securityid1: "",
      ExperienceVisible: false,
      loading1: true,
@@ -84,6 +87,7 @@
            // prop: "deptName",
            prop: "deptId",
            type: "tree",
            sort:true,
            dicUrl: dicUrl,
            props: {
              label: "title",
@@ -176,6 +180,11 @@
            ],
          },
          {
            label: "保安证编号",
            prop: "securitynumber",
            disabled: true,
          },
          {
            label: "发证时间",
            prop: "paperTime",
            disabled: true,
@@ -185,6 +194,35 @@
    };
  },
  methods: {
    //排序
    sortChange(value) {
      // console.log(value, 51151515);
      if (value.order == "ascending") {
        this.sort = "asc";
      }
      if (value.order == "descending") {
        this.sort = "desc";
      }
      this.sortName = value.prop;
      //字段匹配
      if (value.prop == "sexs") {
        this.sortName = "sex";
      }
      if (value.prop == "examinationType") {
        this.sortName = "examination_type";
      }
      if (value.prop == "userType") {
        this.sortName = "user_type";
      }
      this.onLoad(this.page, this.query);
    },
    //清空按钮
    selectionClear() {
      // this.selectionList = [];
      this.sort = "";
      this.sortName = "";
      // this.$refs.crud.toggleSelection();
    },
    getPractitionersPageInfo(page, params = {}) {
      if (this.card.jurisdiction == 1372091709474910209) {
        this.card.jurisdiction = "";

 src/views/securityAnalysis/child/dispatch.vue

@@ -191,11 +191,7 @@
              },
            ],
          },
          // {
          //   label: " 派遣人数",
          //   prop: "num",
          //   labelWidth: 118,
          // },
          
          {
            label: "合同开始时间",
            prop: "startTime",
@@ -219,6 +215,12 @@
            // overHidden: true
          },
          {
            label: " 派遣人数",
            prop: "snum",
            labelWidth: 118,
            width:90
          },
          {
            label: " 负责人",
            prop: "linkman",
            labelWidth: 118,

 src/views/securityUnit/selfRecruitedSecurityGuard.vue

@@ -218,7 +218,7 @@
            },
            rules: [
              {
                required: true,
                required: false,
                message: "请选择所属辖区",
                trigger: "click",
              },
@@ -439,7 +439,6 @@
    rowUpdate(row, index, done, loading) {
      delete row.tenantid;
      delete row.regstsat;
      console.log(row, 0);
      update(row).then(
        () => {
          this.onLoad(this.page);

 src/views/securityUnitChild/data.js

@@ -106,7 +106,7 @@
        label: "企业属性",
        prop: "stats",
        type: "tree",
        dicUrl: "/api/blade-system/dict-biz/dictionary?code=statsType",
        dicUrl: "/api/blade-system/dict-biz/dictionary?code=stats",
        props: {
            label: "dictValue",
            value: "dictKey"
@@ -185,6 +185,1012 @@
    },

]

export var filialeColumn = [{
        label: "",
        labelWidth: 20,
        type: 'title',
        prop: "title",
        span: 24,
        styles: {
            fontSize: '24px'
        }
    },
    {
        label: "企业名称",
        prop: "enterprisename",
        span: 12,
        labelWidth: 145,
        disabled: true,
        rules: [{
            required: true,
            message: "请输入企业名称",
            trigger: "blur",
        }, ],
    },
    {
        label: "所属辖区",
        prop: "jurisdiction",
        // multiple: true,
        //父节点不能选
        parent: false,
        type: "tree",
        dicUrl: "/api//jurisdiction/lazy-trees",
        props: {
            label: "title",
            value: "id",
        },
        span: 12,
        labelWidth: 145,
        width: 110,
        overHidden: true,
        disabled: true,
        rules: [{
            required: true,
            message: "请选择所属辖区",
            trigger: "click",
        }, ],
    },
    {
        label: "分公司负责人",
        prop: "representative",
        span: 12,
        labelWidth: 145,
        disabled: true,
        rules: [{
            required: true,
            message: "请输入分公司负责人",
            trigger: "blur",
        }, ],
    }, {
        label: "分公司负责人电话",
        prop: "representativecell",
        span: 12,
        labelWidth: 145,
        disabled: true,
        rules: [{
            required: true,
            message: "请输入分公司负责人电话",
            trigger: "blur",
        }, ],
    },
    {
        label: "联系人",
        prop: "contacts",
        span: 12,
        labelWidth: 145,
        disabled: true,
        rules: [{
            required: true,
            message: "请输入联系人",
            trigger: "blur",
        }, ],
    }, {
        label: "联系电话",
        prop: "contactscell",
        span: 12,
        labelWidth: 145,
        disabled: true,
        rules: [{
            required: true,
            message: "请输入联系电话",
            trigger: "blur",
        }, ],
    },
    {
        label: "企业属性",
        prop: "stats",
        type: "tree",
        dicUrl: "/api/blade-system/dict-biz/dictionary?code=stats",
        props: {
            label: "dictValue",
            value: "dictKey"
        },
        span: 12,
        labelWidth: 145,
        disabled: true,
        rules: [{
            required: true,
            message: "请输入企业属性",
            trigger: "blur",
        }, ],
    },
    {
        label: "注册地址",
        prop: "address",
        span: 12,
        labelWidth: 145,
        disabled: true,
        // search: true,
        rules: [{
            required: true,
            message: "请输入注册地址",
            trigger: "blur",
        }, ],
    },
    {
        label: "办公地址",
        prop: "industry",
        span: 12,
        labelWidth: 145,
        disabled: true,
        rules: [{
            required: true,
            message: "请选择办公地址",
            trigger: "blur",
        }, ],
    },
    {
        label: "服务区域",
        labelWidth: 145,
        prop: "fregion",
        display: false,
        rules: [{
            required: true,
            message: "请输入服务区域",
            trigger: "blur",
        }, ],
    },
    {
        label: "服务时间",
        labelWidth: 145,
        prop: "ftime",
        type: "date",
        format: "yyyy-MM-dd",
        valueFormat: "yyyy-MM-dd",
        display: false,
        rules: [{
            required: true,
            message: "请选择服务时间",
            trigger: "blur",
        }, ],
    },
    {
        label: "登记机关",
        prop: "registration",
        // span: 11,
        labelWidth: 145,
        disabled: true,
        span: 12,
        rules: [{
            required: true,
            message: "请输入登记机关",
            trigger: "blur",
        }, ],
    },

]

//自招保安单位基本信息
export var selfColumn = [{
        label: "",
        labelWidth: 20,
        type: 'title',
        prop: "title",
        span: 24,
        styles: {
            fontSize: '24px'
        }
    },
    {
        label: "企业名称",
        prop: "enterprisename",
        span: 12,
        labelWidth: 145,
        disabled: true,
        rules: [{
            required: true,
            message: "请输入企业名称",
            trigger: "blur",
        }, ],
    },
    {
        label: "所属辖区",
        prop: "jurisdiction",
        // multiple: true,
        //父节点不能选
        parent: false,
        type: "tree",
        dicUrl: "/api//jurisdiction/lazy-trees",
        props: {
            label: "title",
            value: "id",
        },
        span: 12,
        labelWidth: 145,
        width: 110,
        overHidden: true,
        disabled: true,
        rules: [{
            required: true,
            message: "请选择所属辖区",
            trigger: "click",
        }, ],
    },
    {
        label: "联系人",
        prop: "contacts",
        span: 12,
        labelWidth: 145,
        disabled: true,
        rules: [{
            required: true,
            message: "请输入联系人",
            trigger: "blur",
        }, ],
    }, {
        label: "联系电话",
        prop: "contactscell",
        span: 12,
        labelWidth: 145,
        disabled: true,
        rules: [{
            required: true,
            message: "请输入联系电话",
            trigger: "blur",
        }, ],
    },
    {
        label: "企业属性",
        prop: "stats",
        type: "tree",
        dicUrl: "/api/blade-system/dict-biz/dictionary?code=stats",
        props: {
            label: "dictValue",
            value: "dictKey"
        },
        span: 12,
        labelWidth: 145,
        disabled: true,
        rules: [{
            required: true,
            message: "请输入企业属性",
            trigger: "blur",
        }, ],
    },
    {
        label: "注册地址",
        prop: "address",
        span: 12,
        labelWidth: 145,
        disabled: true,
        // search: true,
        rules: [{
            required: true,
            message: "请输入注册地址",
            trigger: "blur",
        }, ],
    },
    {
        label: "服务区域",
        labelWidth: 145,
        prop: "fregion",
        rules: [{
            required: true,
            message: "请输入服务区域",
            trigger: "blur",
        }, ],
    },
    {
        label: "服务时间",
        labelWidth: 145,
        prop: "ftime",
        type: "date",
        format: "yyyy-MM-dd",
        valueFormat: "yyyy-MM-dd",
        rules: [{
            required: true,
            message: "请选择服务时间",
            trigger: "blur",
        }, ],
    },
    {
        label: "登记机关",
        prop: "registration",
        // span: 11,
        labelWidth: 145,
        disabled: true,
        span: 12,
        rules: [{
            required: true,
            message: "请输入登记机关",
            trigger: "blur",
        }, ],
    },

]

export var businessColumn = [{
        label: "总公司工商信息",
        labelWidth: "110",
        prop: "baseInfo",
        icon: "el-icon-user-solid",
        column: [{
                label: "统一社会信用代码",
                prop: "socialCreditCode",
                span: 12,
                labelWidth: 130,
                disabled: false,
            },
            {
                label: "注册时间",
                prop: "registerTime",
                span: 12,
                labelWidth: 130,
                disabled: false,
                type: "date",
                format: "yyyy-MM-dd",
                valueFormat: "yyyy-MM-dd",
                rules: [{
                    required: true,
                    message: "请选择注册时间",
                    trigger: "blur",
                }, ],
            },
            {
                label: "注册资本",
                prop: "capital",
                span: 12,
                labelWidth: 130,
                disabled: false,
            },
            {
                label: "经营范围",
                prop: "businessScope",
                span: 12,
                labelWidth: 130,
                width: 110,
                // overHidden: true,
                // type: 'textarea',
                showWordLimit: true,
                disabled: false,
            },
            {
                label: "营业执照",
                prop: "trading",
                type: "upload",
                listType: "picture-img",
                span: 12,
                propsHttp: {
                    res: "data",
                },
                canvasOption: {
                    text: "",
                    ratio: 1.0,
                },
                labelWidth: 130,
                tip: "只能上传jpg/png格式图片，且不超过2Mb",
                action: "/api/blade-resource/oss/endpoint/put-files",
                disabled: false,
            },
        ],
    },
    {
        label: "分公司工商信息",
        prop: "detailInfo",
        labelWidth: "110",
        icon: "el-icon-s-order",
        column: [{
                label: "统一社会信用代码",
                prop: "creditcode",
                span: 12,
                labelWidth: 130,
                disabled: false,
            },
            {
                label: "注册时间",
                prop: "establishtime",
                span: 12,
                labelWidth: 130,
                disabled: false,
                type: "date",
                format: "yyyy-MM-dd",
                valueFormat: "yyyy-MM-dd",
                rules: [{
                    required: true,
                    message: "请选择注册时间",
                    trigger: "blur",
                }, ],
            },

            {
                label: "注册资本",
                prop: "registeredcapital",
                span: 12,
                labelWidth: 130,
                disabled: false,
            },
            {
                label: "经营范围",
                prop: "business",
                span: 12,
                labelWidth: 130,
                width: 110,
                // overHidden: true,
                // type: 'textarea',
                showWordLimit: true,
                disabled: false,
            },
            {
                label: "营业执照",
                prop: "businessLicense",
                type: "upload",
                listType: "picture-img",
                span: 12,
                propsHttp: {
                    res: "data",
                },
                canvasOption: {
                    text: "",
                    ratio: 1.0,
                },
                labelWidth: 130,
                tip: "只能上传jpg/png格式图片，且不超过2Mb",
                action: "/api/blade-resource/oss/endpoint/put-files",
                disabled: false,
            },
        ],
    },
]

export var lincenceGroupColumn = [{
        label: "名称",
        prop: "unitName",
        span: 12,
        labelWidth: 130,
        disabled: false,
        rules: [{
            required: true,
            message: "请输入名称",
            trigger: "blur",
        }, ],
    },
    {
        label: "住所",
        prop: "address",
        span: 12,
        labelWidth: 130,
        disabled: false,
        rules: [{
            required: true,
            message: "请输入住所",
            trigger: "blur",
        }, ],
    },
    {
        label: "法定代表人",
        prop: "legalPeople",
        span: 12,
        labelWidth: 130,
        disabled: false,
        rules: [{
            required: true,
            message: "请输入法定代表人",
            trigger: "blur",
        }, ],
    },
    {
        label: "批准文号",
        prop: "approvalNumber",
        span: 12,
        labelWidth: 130,
        disabled: false,
        rules: [{
            required: true,
            message: "请输入批准文号",
            trigger: "blur",
        }, ],
    },
    {
        label: "发证机关",
        prop: "licenceIssuingUnit",
        span: 12,
        labelWidth: 130,
        disabled: false,
        rules: [{
            required: true,
            message: "请输入发证机关",
            trigger: "blur",
        }, ],
    },
    {
        label: "发证时间",
        prop: "licenceIssuingTime",
        span: 12,
        labelWidth: 130,
        disabled: false,
        type: "date",
        format: "yyyy-MM-dd",
        valueFormat: "yyyy-MM-dd",
        rules: [{
            required: true,
            message: "请选择发证时间",
            trigger: "blur",
        }, ],
    },
    {
        label: "许可证编号",
        prop: "code",
        span: 12,
        labelWidth: 130,
        disabled: false,
        row: false,
        rules: [{
            required: true,
            message: "请输入许可证编号",
            trigger: "blur",
        }, ],
    },
    {
        label: "注册资本",
        prop: "registerCapital",
        span: 12,
        labelWidth: 130,
        disabled: false,
        rules: [{
            required: true,
            message: "请输入注册资本",
            trigger: "blur",
        }, ],
    },
    {
        label: "服务范围",
        prop: "content",
        type: "textarea",
        span: 24,
        labelWidth: 130,
        disabled: false,
        rules: [{
            required: true,
            message: "请输入服务范围",
            trigger: "blur",
        }, ],
    },
    {
        label: "许可证图片",
        prop: "url",
        type: "upload",
        listType: "picture-img",
        span: 12,
        propsHttp: {
            res: "data",
        },
        canvasOption: {
            text: "",
            ratio: 1.0,
        },
        labelWidth: 130,
        tip: "只能上传jpg/png格式图片，且不超过2Mb",
        action: "/api/blade-resource/oss/endpoint/put-files",
        disabled: false,
        rules: [{
            required: true,
            message: "请上传许可证图片",
            trigger: "blur",
        }, ],
    },
]
export var lincenceGroupColumns = [{
        label: "名称",
        prop: "unitNames",
        span: 12,
        labelWidth: 130,
        disabled: false,
        rules: [{
            required: true,
            message: "请输入名称",
            trigger: "blur",
        }, ],
    },
    {
        label: "住所",
        prop: "addresss",
        span: 12,
        labelWidth: 130,
        disabled: false,
        rules: [{
            required: true,
            message: "请输入住所",
            trigger: "blur",
        }, ],
    },
    {
        label: "法定代表人",
        prop: "legalPeoples",
        span: 12,
        labelWidth: 130,
        disabled: false,
        rules: [{
            required: true,
            message: "请输入法定代表人",
            trigger: "blur",
        }, ],
    },
    {
        label: "批准文号",
        prop: "approvalNumbers",
        span: 12,
        labelWidth: 130,
        disabled: false,
        rules: [{
            required: true,
            message: "请输入批准文号",
            trigger: "blur",
        }, ],
    },
    {
        label: "发证机关",
        prop: "licenceIssuingUnits",
        span: 12,
        labelWidth: 130,
        disabled: false,
        rules: [{
            required: true,
            message: "请输入发证机关",
            trigger: "blur",
        }, ],
    },
    {
        label: "发证时间",
        prop: "licenceIssuingTimes",
        span: 12,
        labelWidth: 130,
        disabled: false,
        type: "date",
        format: "yyyy-MM-dd",
        valueFormat: "yyyy-MM-dd",
        rules: [{
            required: true,
            message: "请选择发证时间",
            trigger: "blur",
        }, ],
    },
    {
        label: "许可证编号",
        prop: "codes",
        span: 12,
        labelWidth: 130,
        disabled: false,
        row: false,
        rules: [{
            required: true,
            message: "请输入许可证编号",
            trigger: "blur",
        }, ],
    },
    {
        label: "注册资本",
        prop: "registerCapitals",
        span: 12,
        labelWidth: 130,
        disabled: false,
        rules: [{
            required: true,
            message: "请输入注册资本",
            trigger: "blur",
        }, ],
    },
    {
        label: "服务范围",
        prop: "contents",
        type: "textarea",
        span: 24,
        labelWidth: 130,
        disabled: false,
        rules: [{
            required: true,
            message: "请输入服务范围",
            trigger: "blur",
        }, ],
    },
    {
        label: "许可证图片",
        prop: "urls",
        type: "upload",
        listType: "picture-img",
        span: 12,
        propsHttp: {
            res: "data",
        },
        canvasOption: {
            text: "",
            ratio: 1.0,
        },
        labelWidth: 130,
        tip: "只能上传jpg/png格式图片，且不超过2Mb",
        action: "/api/blade-resource/oss/endpoint/put-files",
        disabled: false,
        rules: [{
            required: true,
            message: "请上传许可证图片",
            trigger: "blur",
        }, ],
    },
]

export var lincenceColumn = [{
        label: "",
        labelWidth: 20,
        type: "title",
        prop: "title",
        span: 24,
        styles: {
            fontSize: "24px",
        },
    },
    {
        label: "名称",
        prop: "unitName",
        span: 12,
        labelWidth: 130,
        disabled: false,
        rules: [{
            required: true,
            message: "请输入名称",
            trigger: "blur",
        }, ],
    },
    {
        label: "住所",
        prop: "address",
        span: 12,
        labelWidth: 130,
        disabled: false,
        rules: [{
            required: true,
            message: "请输入住所",
            trigger: "blur",
        }, ],
    },
    {
        label: "法定代表人",
        prop: "legalPeople",
        span: 12,
        labelWidth: 130,
        disabled: false,
        rules: [{
            required: true,
            message: "请输入法定代表人",
            trigger: "blur",
        }, ],
    },
    {
        label: "批准文号",
        prop: "approvalNumber",
        span: 12,
        labelWidth: 130,
        disabled: false,
        rules: [{
            required: true,
            message: "请输入批准文号",
            trigger: "blur",
        }, ],
    },
    {
        label: "发证机关",
        prop: "licenceIssuingUnit",
        span: 12,
        labelWidth: 130,
        disabled: false,
        rules: [{
            required: true,
            message: "请输入发证机关",
            trigger: "blur",
        }, ],
    },
    {
        label: "发证时间",
        prop: "licenceIssuingTime",
        span: 12,
        labelWidth: 130,
        disabled: false,
        type: "date",
        format: "yyyy-MM-dd",
        valueFormat: "yyyy-MM-dd",
        rules: [{
            required: true,
            message: "请选择发证时间",
            trigger: "blur",
        }, ],
    },
    {
        label: "许可证编号",
        prop: "code",
        span: 12,
        labelWidth: 130,
        disabled: false,
        row: false,
        rules: [{
            required: true,
            message: "请输入许可证编号",
            trigger: "blur",
        }, ],
    },
    {
        label: "注册资本",
        prop: "registerCapital",
        span: 12,
        labelWidth: 130,
        disabled: false,
        rules: [{
            required: true,
            message: "请输入注册资本",
            trigger: "blur",
        }, ],
    },
    {
        label: "服务范围",
        prop: "content",
        type: "textarea",
        span: 24,
        labelWidth: 130,
        disabled: false,
        rules: [{
            required: true,
            message: "请输入服务范围",
            trigger: "blur",
        }, ],
    },
    {
        label: "许可证图片",
        prop: "url",
        type: "upload",
        listType: "picture-img",
        span: 12,
        propsHttp: {
            res: "data",
        },
        canvasOption: {
            text: "",
            ratio: 1.0,
        },
        labelWidth: 130,
        tip: "只能上传jpg/png格式图片，且不超过2Mb",
        action: "/api/blade-resource/oss/endpoint/put-files",
        disabled: false,
        rules: [{
            required: true,
            message: "请上传许可证图片",
            trigger: "blur",
        }, ],
    },
]
export var lincenceTrainColumn = [{
        label: "",
        labelWidth: 20,
        type: "title",
        prop: "title",
        span: 24,
        styles: {
            fontSize: "24px",
        },
    },
    {
        label: "名称",
        prop: "unitName",
        span: 12,
        labelWidth: 130,
        disabled: false,
        rules: [{
            required: true,
            message: "请输入名称",
            trigger: "blur",
        }, ],
    },
    {
        label: "住所",
        prop: "address",
        span: 12,
        labelWidth: 130,
        disabled: false,
        rules: [{
            required: true,
            message: "请输入住所",
            trigger: "blur",
        }, ],
    },
    {
        label: "法定代表人",
        prop: "legalPeople",
        span: 12,
        labelWidth: 130,
        disabled: false,
        rules: [{
            required: true,
            message: "请输入法定代表人",
            trigger: "blur",
        }, ],
    },
    {
        label: "批准文号",
        prop: "approvalNumber",
        span: 12,
        labelWidth: 130,
        disabled: false,
        rules: [{
            required: true,
            message: "请输入批准文号",
            trigger: "blur",
        }, ],
    },
    {
        label: "发证机关",
        prop: "licenceIssuingUnit",
        span: 12,
        labelWidth: 130,
        disabled: false,
        rules: [{
            required: true,
            message: "请输入发证机关",
            trigger: "blur",
        }, ],
    },
    {
        label: "发证时间",
        prop: "licenceIssuingTime",
        span: 12,
        labelWidth: 130,
        disabled: false,
        type: "date",
        format: "yyyy-MM-dd",
        valueFormat: "yyyy-MM-dd",
        rules: [{
            required: true,
            message: "请选择发证时间",
            trigger: "blur",
        }, ],
    },
    {
        label: "许可证编号",
        prop: "code",
        span: 12,
        labelWidth: 130,
        disabled: false,
        row: false,
        rules: [{
            required: true,
            message: "请输入许可证编号",
            trigger: "blur",
        }, ],
    },
    {
        label: "培训内容",
        prop: "content",
        type: "textarea",
        span: 24,
        labelWidth: 130,
        disabled: false,
        rules: [{
            required: true,
            message: "请输入培训内容",
            trigger: "blur",
        }, ],
    },
    {
        label: "许可证图片",
        prop: "url",
        type: "upload",
        listType: "picture-img",
        span: 12,
        propsHttp: {
            res: "data",
        },
        canvasOption: {
            text: "",
            ratio: 1.0,
        },
        labelWidth: 130,
        tip: "只能上传jpg/png格式图片，且不超过2Mb",
        action: "/api/blade-resource/oss/endpoint/put-files",
        disabled: false,
        rules: [{
            required: true,
            message: "请上传许可证图片",
            trigger: "blur",
        }, ],
    },
]

export var column11 = [{
        label: "",
        labelWidth: 20,

 src/views/securityUnitChild/index.vue

@@ -44,7 +44,11 @@
      </el-tab-pane>
      <!-- 主要管理人信息 -->
      <el-tab-pane :label="managerLabel" name="tab3">
        <manager v-if="overmanager" :deptid="departmentid"></manager>
        <manager
          v-if="overmanager"
          :deptid="departmentid"
          :stats="stats"
        ></manager>
      </el-tab-pane>
      <!-- 装备管理列表 -->
      <el-tab-pane label="装备管理" name="tab4" v-if="equipmentVisiable">
@@ -77,7 +81,24 @@
      </el-tab-pane>
      <!-- 许可证  -->
      <el-tab-pane :label="licenceLabel" name="tab8" v-if="licenceVisiable">
        <licence :row="objBase" v-if="overHtp"></licence>
        <!-- <licence :row="objBase" v-if="overHtp"></licence> -->
        <basic-container>
          <avue-form
            v-if="true"
            ref="lincenceForm"
            v-model="licenceObj"
            :option="licenceOption"
            @submit="licenceSubmit"
          ></avue-form>
          <avue-form
            v-if="false"
            ref="licenceGroupForm"
            v-model="licenceGroupObj"
            :option="licenceGroupOption"
            @submit="licenceGroupSubmit"
          >
          </avue-form>
        </basic-container>
      </el-tab-pane>
      <!-- 备案证  -->
      <el-tab-pane label="备案证" name="tab12" v-if="certificdinedVisiable">
@@ -88,8 +109,26 @@
</template> 

<script>
import { column11, column } from "./data";
import { getOncedata, update,getBusinessInfo } from "@/api/securityUnit/securityUnit";
import {
  column11,
  column,
  filialeColumn,
  selfColumn,
  lincenceColumn,
  businessColumn,
  lincenceGroupColumn,
  lincenceGroupColumns,
  lincenceTrainColumn
} from "./data";
import {
  getOncedata,
  update,
  getBusinessInfo,
  submit,
  getLicenceDetail,
  licenceSubmit,
  submitGroup,
} from "@/api/securityUnit/securityUnit";
import manager from "./manager.vue";
import shareholder from "./shareholder.vue";
import equipments from "../securityEquipment/equipments.vue";
@@ -116,7 +155,7 @@
    return {
      tab2label: "出资人信息",
      managerLabel: "主要管理人信息",
      licenceLabel: "许可证",
      licenceLabel: "许可证信息",
      baseTitle: "基本信息",
      visible: false,
      certificdinedVisiable: false,
@@ -135,6 +174,8 @@
      social: false,
      overHtp: false,
      activeName: "tab1",
      stats: "",
      deptId: "",
      departmentid: "",
      //全局单位统一社会信用代码
      creditcode: "",
@@ -143,152 +184,44 @@
        // title: "我是头部标题",
      },
      formData: {},
      businessObj:{},
      businessObj: {},
      businessOption: {
        height: "auto",
        // calcHeight: 80,
        emptyBtn: false,
        // submitBtn:false,
        submitText:"保存",
        submitText: "保存",
        group: businessColumn,
      },
      licenceGroupObj: {},
      licenceGroupOption: {
        height: "auto",
        emptyBtn: false,
        submitText: "保存",
        group: [
          {
            label: "总公司工商信息",
            label: "总公司许可证信息",
            labelWidth: "110",
            prop: "baseInfo",
            icon: "el-icon-user-solid",
            column: [
              {
                label: "统一社会信用代码",
                prop: "socialCreditCode",
                span: 12,
                labelWidth: 130,
                disabled: false,
              },
              {
                label: "注册时间",
                prop: "registerTime",
                span: 12,
                labelWidth: 130,
                disabled: false,
                type: "date",
                format: "yyyy-MM-dd",
                valueFormat: "yyyy-MM-dd",
                rules: [
                  {
                    required: true,
                    message: "请选择注册时间",
                    trigger: "blur",
                  },
                ],
              },
              {
                label: "注册资本",
                prop: "capital",
                span: 12,
                labelWidth: 130,
                disabled: false,
              },
              {
                label: "经营范围",
                prop: "businessScope",
                span: 12,
                labelWidth: 130,
                width: 110,
                // overHidden: true,
                // type: 'textarea',
                showWordLimit: true,
                disabled: false,
              },
              {
                label: "营业执照",
                prop: "trading",
                type: "upload",
                listType: "picture-img",
                span: 12,
                propsHttp: {
                  res: "data",
                },
                canvasOption: {
                  text: "",
                  ratio: 1.0,
                },
                labelWidth: 130,
                tip: "只能上传jpg/png格式图片，且不超过2Mb",
                action: "/api/blade-resource/oss/endpoint/put-files",
                disabled: false,
              },
            ],
            column: lincenceGroupColumn,
          },
          {
            label: "分公司工商信息",
            label: "分公司许可证信息",
            prop: "detailInfo",
            labelWidth: "110",
            icon: "el-icon-s-order",
            column: [
              {
                label: "统一社会信用代码",
                prop: "creditcode",
                span: 12,
                labelWidth: 130,
                disabled: false,
              },
              {
                label: "注册时间",
                prop: "establishtime",
                span: 12,
                labelWidth: 130,
                disabled: false,
                type: "date",
                format: "yyyy-MM-dd",
                valueFormat: "yyyy-MM-dd",
                rules: [
                  {
                    required: true,
                    message: "请选择注册时间",
                    trigger: "blur",
                  },
                ],
              },

              {
                label: "注册资本",
                prop: "registeredcapital",
                span: 12,
                labelWidth: 130,
                disabled: false,
              },
              {
                label: "经营范围",
                prop: "business",
                span: 12,
                labelWidth: 130,
                width: 110,
                // overHidden: true,
                // type: 'textarea',
                showWordLimit: true,
                disabled: false,
              },
              {
                label: "营业执照",
                prop: "businessLicense",
                type: "upload",
                listType: "picture-img",
                span: 12,
                propsHttp: {
                  res: "data",
                },
                canvasOption: {
                  text: "",
                  ratio: 1.0,
                },
                labelWidth: 130,
                tip: "只能上传jpg/png格式图片，且不超过2Mb",
                action: "/api/blade-resource/oss/endpoint/put-files",
                disabled: false,
              },
            ],
            column: lincenceGroupColumns,
          },
        ],
      },
      licenceObj: {},
      licenceOption: {
        emptyBtn: false,
        // submitBtn: false,
        submitText: "保存",
        gutter: 30,
        column: lincenceColumn,
      },
      optionBase: {
        emptyBtn: false,
@@ -314,24 +247,93 @@
  },
  methods: {
    //分公司工商信息修改
    businessSubmit(row, done, loading){
      alert(1);
    businessSubmit(row, done, loading) {
      var that = this;
      if (
        this.userInfo.role_name == "保安公司管理员" ||
        this.userInfo.role_name == "培训公司管理员" ||
        this.userInfo.role_name == "分公司管理员"
      ) {
        row["departmentid"] = this.userInfo.dept_id;
        row["id"] = this.formData.id;
        //分公司
        var f = {
          departmentid: this.userInfo.dept_id,
          id: this.formData.id,
          businessLicense: row.businessLicense,
          establishtime: row.establishtime,
          creditcode: row.creditcode,
          registeredcapital: row.registeredcapital,
          business: row.business,
        };
        //总公司
        var z = {
          id: row.id,
          deptId: this.userInfo.dept_id,
          registerTime: row.registerTime,
          socialCreditCode: row.socialCreditCode,
          capital: row.capital,
          businessScope: row.businessScope,
          trading: row.trading,
        };
      }
      update(row).then(

      //分公司工商信息修改
      update(f).then(
        () => {
          this.$message({
            type: "success",
            message: "操作成功!",
          });
          that.formData = row;
          done();
        },
        (error) => {
          window.console.log(error);
          loading();
        }
      );
      //总公司工商信息修改
      submit(z).then(
        (res) => {
          that.businessObj = row;
          that.businessObj.id = res.data.data.id;
          done();
        },
        (error) => {
          window.console.log(error);
          loading();
        }
      );
      done();
    },
    //分公司许可证信息修改
    licenceSubmit(row, done, loading) {
      var that = this;
      if (
        this.userInfo.role_name == "保安公司管理员" ||
        this.userInfo.role_name == "培训公司管理员" ||
        this.userInfo.role_name == "分公司管理员"
      ) {
        row["deptId"] = this.userInfo.dept_id;
        row["id"] = that.licenceObj.id;
      }

      if (this.stats == "1") {
        row["type"] = 2;
      } else {
        row["type"] = 1;
      }

      if (row.id) {
        row["updateUser"] = this.userInfo.Id;
      } else {
        row["createUser"] = this.userInfo.Id;
      }
      licenceSubmit(row).then(
        () => {
          this.$message({
            type: "success",
            message: "操作成功!",
          });
          that.getLicenceInfo();
          done();
        },
        (error) => {
@@ -367,7 +369,42 @@
          loading();
        }
      );
      done();
    },
    //分公司许可信息修改
    licenceGroupSubmit(row, done, loading) {
      var that = this;
      if (
        this.userInfo.role_name == "保安公司管理员" ||
        this.userInfo.role_name == "培训公司管理员" ||
        this.userInfo.role_name == "分公司管理员"
      ) {
        row["deptId"] = this.userInfo.dept_id;
        row["id"] = that.licenceGroupObj.id;
        row["sid"] = that.licenceGroupObj.sid;
      }
      row["type"] = 1;

      if (row.id) {
        row["updateUser"] = this.userInfo.Id;
      } else {
        row["createUser"] = this.userInfo.Id;
      }
      // console.log(row);
      submitGroup(row).then(
        () => {
          this.$message({
            type: "success",
            message: "操作成功!",
          });
          that.getLicenceInfo();
          done();
        },
        (error) => {
          window.console.log(error);
          loading();
        }
      );
      done();
    },
    //从 localStorage 获取数据
@@ -389,6 +426,9 @@
        this.overmanager = true;
      } else if (tab.name == "tab9") {
        this.social = true;
      } else if (tab.name == "tab8") {
        //获取许可证信息
        this.getLicenceInfo();
      } else {
        this.social = false;
        this.overcar = false;
@@ -397,6 +437,13 @@
        this.overmanager = false;
        this.overshareholder = false;
      }
    },
    //获取许可证信息
    getLicenceInfo() {
      var that = this;
      getLicenceDetail(this.deptId).then((res) => {
        that.licenceObj = res.data.data;
      });
    },
    //tag 防重复处理
    tagTraim() {
@@ -420,13 +467,37 @@
    //编辑状态控制
    editController() {
      var that = this;
      if (this.stats == "1") {
        //培训学校
        this.licenceOption.column = lincenceTrainColumn;
      }else{
        this.licenceOption.column = lincenceColumn;
      }

      //基本信息列控制
      if (this.stats == "4") {
        //分公司
        this.optionBase.column = filialeColumn;
      }else if(this.stats == "0"){
        //自招保安单位
        this.optionBase.column = selfColumn;
      }else{
        //学校，本市保安公司
        this.optionBase.column = column;
      }

      //获取当前登录人员的角色信息
      var roleIds = this.userInfo.role_id.split(",");
      roleIds.forEach((roleId) => {
        getRoleDetail(roleId).then((res) => {
          var roleAlias = res.data.data.roleAlias;
      // var roleIds = this.userInfo.role_id.split(",");
      // roleIds.forEach((roleId) => {
      //   getRoleDetail(roleId).then((res) => {
      //     var roleAlias = res.data.data.roleAlias;
          var roleAlias = this.userInfo.role_name;
          var d = that.optionBase.column;
          var e = that.option01.column;
          var f = that.businessOption.group;
          var g = f[0].column;
          var h = f[1].column;
          var bb = that.licenceOption.column;
          //控制按钮，编辑状态
          if (
            roleAlias == "保安公司管理员" ||
@@ -436,25 +507,45 @@
            that.optionBase.submitBtn = true;
            that.businessOption.submitBtn = true;
            that.option01.submitBtn = true;
            that.licenceOption.submitBtn = true;
            for (var k in d) {
              d[k].disabled = false;
            }
            for (var n in e) {
              e[n].disabled = false;
            }
            for (var l in g) {
              g[l].disabled = false;
            }
            for (var m in h) {
              h[m].disabled = false;
            }
            for (var mm in bb) {
              bb[mm].disabled = false;
            }
          } else {
            that.optionBase.submitBtn = false;
            that.option01.submitBtn = false;
            that.businessOption.submitBtn = false;
            that.licenceOption.submitBtn = false;
            for (var a in d) {
              d[a].disabled = true;
            }
            for (var b in e) {
              e[b].disabled = true;
            }
            for (var c in g) {
              g[c].disabled = true;
            }
            for (var z in h) {
              h[z].disabled = true;
            }
            for (var zz in bb) {
              bb[zz].disabled = true;
            }
          }
        });
      });
        // });
      // });
    },
    //获取保安公司数据
    getdatas(data) {
@@ -478,48 +569,6 @@
          that.creditcode = row.creditcode;
        }
        that.overHtp = true;
        if (data.stats == "0") {
          //自招保安单位
          const industrycolumn = this.findObject(
            this.optionBase.column,
            "industry"
          );
          const representativecolumn = this.findObject(
            this.optionBase.column,
            "representative"
          );
          const representativecellcolumn = this.findObject(
            this.optionBase.column,
            "representativecell"
          );
          const fregioncolumn = this.findObject(
            this.optionBase.column,
            "fregion"
          );
          const ftimecolumn = this.findObject(this.optionBase.column, "ftime");

          //法人及电话，办公地址不可见
          industrycolumn.display = false;
          representativecolumn.display = false;
          representativecellcolumn.display = false;
          //服务区域，时间可见
          fregioncolumn.display = true;
          ftimecolumn.display = true;
        }
        if (data.stats == "4") {
          //分公司
          const representativecolumn = this.findObject(
            this.optionBase.column,
            "representative"
          );
          const representativecellcolumn = this.findObject(
            this.optionBase.column,
            "representativecell"
          );
          //法人及电话不可见
          representativecolumn.label = "分公司负责人";
          representativecellcolumn.label = "分公司负责人电话";
        }
      } else {
        that.objBase.enterprisename = "未选择查询单位";
      }
@@ -537,7 +586,7 @@
        var stats = data.stats;
        var deptId = data.departmentid;
        //初始tab控制
        this.initController(stats,deptId);
        this.initController(stats, deptId);
        //初始数据获取
        this.getdatas(data);
      } else {
@@ -550,14 +599,16 @@
          var stats = res.data.data.stats;
          var deptId = res.data.data.departmentid;
          //初始tab控制
          this.initController(stats,deptId);
          this.initController(stats, deptId);
          //初始数据获取
          this.getdatas(res.data.data);
        });
      }
    },
    //tab 初始设置
    initController(stats,deptId) {
    initController(stats, deptId) {
      this.stats = stats;
      this.deptId = deptId;
      var that = this;
      // 判断按进入的公司类型
      if (stats == "2") {
@@ -578,17 +629,20 @@
        that.baseTitle = "保安单位基本信息";
        that.certificdinedVisiable = true;
        that.businessVisiable = false;
        that.licenceLabel = "总公司许可证信息";
        //查询分公司（及总公司）工商信息
        getBusinessInfo(deptId).then((res)=>{
          console.log(res.data.data,1234546);
        getBusinessInfo(deptId).then((res) => {
          that.businessObj = res.data.data;
        })
          if (that.businessObj.id == -1) {
            that.businessObj.id = null;
          }
        });
      }
      if (stats == "1") {
        //培训学校
        that.baseTitle = "学校基本信息";
        that.managerLabel = "师资力量";
        that.licenceLabel = "培训许可证";
        that.licenceLabel = "培训许可证信息";
        that.carVisiable = false;
        that.shareholderVisiable = false;
      }

 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();

 vue.config.js

@@ -27,8 +27,8 @@
        proxy: {
            '/api': {
                // 本地服务接口地址
                // target: 'http://localhost:81',
                target: 'http://192.168.0.114:81',//钟日健W
                target: 'http://localhost:81',
                // target: 'http://192.168.0.114:81',//钟日健W
                // target: 'http://localhost:81', //原W
                // target: 'http://192.168.0.108:81',//原W
                // target: 'http://192.168.0.107:81',//唐N