Merge remote-tracking branch 'origin/master'

value

2024-06-13 fd9deb7e45ff86f3570a3048a459b29f0ebbd628

 src/components/view/person-manage.vue

@@ -199,9 +199,9 @@
      </span>
    </el-dialog>
    <el-dialog title="获取人事系统人员信息" :visible.sync="addthirdParty" width="70%">
      <div class="body">
      <div class="body" v-loading="thirdPartyLoading">
        <el-row>
          <el-col :span="8" style="height: 70vh;overflow: hidden;">
          <el-col :span="8" style="height: 70vh;overflow: hidden;" v-if="companiesList.length!=1">
            <el-input placeholder="输入关键字搜索" v-model="search2" size="small" style="width: 90%;padding: 0 5% 10px 5%;"
              clearable @clear="searchFilter2" @keyup.enter.native="searchFilter2()">
            </el-input>
@@ -210,7 +210,7 @@
              highlight-current>
            </el-tree>
          </el-col>
          <el-col :span="16" style="height: 70vh;padding-left: 8px;">
          <el-col :span="companiesList.length==1?24:16" style="height: 70vh;padding-left: 8px;">
            <div class="search_thing" style="width: 100%;margin-bottom: 10px;justify-content: right;">
              <div class="search_label" style="width: 200px;">员工号/员工姓名：</div>
              <div class="search_input" style="width: 250px;">
@@ -289,7 +289,7 @@
            type: 'text',
            method: 'doDiy',
            field: ['roleName', '角色=roleId', '密码=password',
              '姓名EN=nameEn', '年龄=age', '邮箱=email', '单位=company', '签名=pictureUrl', '个人照片=signatureUrl'
              '姓名EN=nameEn', '年龄=age', '邮箱=email', '单位=company', '签名=signatureUrl', '个人照片=pictureUrl'
            ]
          }],
          tagField: {
@@ -354,7 +354,8 @@
        companiesList: [],
        currentCompaniesList: [],
        userSearch2: '',
        searchEmployeeID: null
        searchEmployeeID: null,
        thirdPartyLoading:false
      }
    },
    // watch: {
@@ -370,8 +371,21 @@
    methods: {
      openthirdParty() {
        this.addthirdParty = true;
        this.thirdPartyLoading = true;
        this.$axios.get(this.$api.companies.selectCompaniesList).then(res => {
          this.companiesList = this.HaveJson(res.data);
          if(this.companiesList.length ==1){
            this.$axios.post(this.$api.companies.selectSimpleList, {
              companyId: this.companiesList[0].companyId
            }).then(res => {
              this.thirdPartyLoading = false;
              this.personListCopy = JSON.parse(JSON.stringify(res.data))
              this.personList = res.data
              this.$refs.personTable.doLayout()
            })
          }else{
            this.thirdPartyLoading = false;
          }
          this.datathirdParty = this.tranListToTreeData(res.data, "ROOT");
        })
        if(this.componentData.entity.roleId > 10000)this.$message.warning('由于未选中具体角色，新增用户将成为默认角色')