Merge remote-tracking branch 'origin/master'

k94314517

2025-03-26 12769ff64ea1f52d6a0a45f53b6acd336fe234fc

 admin/src/views/business/relativeMember.vue

@@ -1,50 +1,51 @@
<template>
  <TableLayout1 :permissions="['business:member:query']">
    <!-- 搜索表单 -->
    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
      <el-form-item label="" prop="keyword">
        <el-input v-model="searchForm.keyword" placeholder="请输入姓名/手机号/工号" @keypress.enter.native="search"></el-input>
      </el-form-item>

      <el-form-item label="" prop="positionId" >
        <el-select v-model="searchForm.positionId" clearable filterable placeholder="岗位">
          <el-option v-for="item in positionList" :key="item.id" :label="item.name" :value="item.id">
          </el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="" prop="hasFace">
        <el-select v-model="searchForm.hasFace" @keypress.enter.native="search" placeholder="是否有人脸">
          <el-option label="无" value="0"></el-option>
          <el-option label="有" value="1"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="" prop="canVisit">
        <el-select v-model="searchForm.canVisit" @keypress.enter.native="search" placeholder="可拜访">
          <el-option label="是" value="1"></el-option>
          <el-option label="否" value="0"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="" prop="workStatus">
        <el-select v-model="searchForm.workStatus" @keypress.enter.native="search" clearable placeholder="在职状态">
          <el-option label="在职" value="0"></el-option>
          <el-option label="离职" value="1"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="" prop="hkStatus">
        <el-select v-model="searchForm.hkStatus" @keypress.enter.native="search" placeholder="海康同步状态">
          <el-option label="待同步" value="0"></el-option>
          <el-option label="同步成功" value="1"></el-option>
          <el-option label="同步失败" value="2"></el-option>
        </el-select>
      </el-form-item>
<!--      <el-form-item label="">
    <div ref="QueryFormRef" slot="search-form">
      <el-form ref="searchForm" :model="searchForm" label-width="100px" inline>
        <el-form-item label="" prop="keyword">
          <el-input v-model="searchForm.keyword" placeholder="请输入姓名/手机号/工号" @keypress.enter.native="search"></el-input>
        </el-form-item>
        <el-form-item label="" prop="positionId">
          <el-select v-model="searchForm.positionId" clearable filterable placeholder="岗位">
            <el-option v-for="item in positionList" :key="item.id" :label="item.name" :value="item.id">
            </el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="" prop="hasFace">
          <el-select v-model="searchForm.hasFace" @keypress.enter.native="search" placeholder="是否有人脸">
            <el-option label="无" value="0"></el-option>
            <el-option label="有" value="1"></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="" prop="canVisit">
          <el-select v-model="searchForm.canVisit" @keypress.enter.native="search" placeholder="可拜访">
            <el-option label="是" value="1"></el-option>
            <el-option label="否" value="0"></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="" prop="workStatus">
          <el-select v-model="searchForm.workStatus" @keypress.enter.native="search" clearable placeholder="在职状态">
            <el-option label="在职" value="0"></el-option>
            <el-option label="离职" value="1"></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="" prop="hkStatus">
          <el-select v-model="searchForm.hkStatus" @keypress.enter.native="search" placeholder="海康同步状态">
            <el-option label="待同步" value="0"></el-option>
            <el-option label="同步成功" value="1"></el-option>
            <el-option label="同步失败" value="2"></el-option>
          </el-select>
        </el-form-item>
        <!--      <el-form-item label="">
        <el-checkbox style="font-size: 12px" label="1" v-model="searchForm.includeChild" key="1">是否包含下级组织</el-checkbox>
      </el-form-item>-->
      <section>
        <el-button type="primary" @click="search">搜索</el-button>
        <el-button @click="reset">重置</el-button>
      </section>
    </el-form>
        <section>
          <el-button type="primary" @click="search">搜索</el-button>
          <el-button @click="reset">重置</el-button>
        </section>
      </el-form>
    </div>
    <template v-slot:menu>
      <div
        style="width: 100%; height: 50px; background: rgba(242, 242, 242, 1); line-height: 50px; text-align: center; font-size: 14px;">
@@ -59,8 +60,8 @@
      <ul class="toolbar"
        v-permissions="['business:member:delete', 'business:member:create,business:empower:create', 'business:traintime:create']">
        <!--
                <li><el-button type="primary" v-permissions="['business:member:sync']" :loading="loading" @click="synchronous()">同步</el-button></li>
-->
           <li><el-button type="primary" v-permissions="['business:member:sync']" :loading="loading" @click="synchronous()">同步</el-button></li>
        -->
        <li><el-button type="primary"
            @click="$refs.OperaMemberWindow.open('新建员工', null, department, searchForm.companyType)" icon="el-icon-plus"
            v-permissions="['business:member:create']">新建员工</el-button></li>
@@ -71,18 +72,21 @@
            icon="el-icon-plus" v-permissions="['business:traintime:create']">培训期导入</el-button></li>
        <li><el-button type="danger" @click="deleteByIdInBatch" icon="el-icon-delete"
            v-permissions="['business:member:delete']">批量删除</el-button></li>
        <li><el-button type="primary" v-permissions="['business:empower:create']" @click="startEmpowerBatch()">下发授权</el-button>
        <li><el-button type="primary" v-permissions="['business:empower:create']"
            @click="startEmpowerBatch()">下发授权</el-button></li>
        <li style="float: right">
          <el-checkbox style="font-size: 12px" label="1" v-model="searchForm.includeChild" key="1"
                       @change="search">是否包含下级组织</el-checkbox>
            @change="search">是否包含下级组织</el-checkbox>
        </li>
<!--
        <li><el-button type="primary" v-permissions="['business:empower:exportExcel']" @click="exportExcel">导出</el-button></li>
-->

        <li><el-button type="primary" v-permissions="['business:empower:exportExcel']"
            @click="exportExcel">导出</el-button></li>

      </ul>
      <el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
      <el-table :height="tableHeightNew" v-loading="isWorking.search" :data="tableData.list" stripe
        @selection-change="handleSelectionChange">
        <el-table-column type="selection" width="55"></el-table-column>
        <el-table-column fixed="left"  prop="name" label="姓名" min-width="110px">
        <el-table-column fixed="left" prop="name" label="姓名" min-width="80px">
          <template slot-scope="{row}">
            <span>{{ row.name }}</span>
            <span class="zhuguan" v-if="row.headStatus == 1">主管</span>
@@ -91,7 +95,7 @@
        <el-table-column label="人脸信息" min-width="100px">
          <template slot-scope="{row}">
            <el-image v-if="row.faceImgFull" style="width: 60px; height: 60px" :src="row.faceImgFull"
                      :preview-src-list="[row.faceImgFull]">
              :preview-src-list="[row.faceImgFull]">
            </el-image>
          </template>
        </el-table-column>
@@ -105,20 +109,21 @@
        </el-table-column>
        <el-table-column prop="companyName" label="所属部门" min-width="100px"></el-table-column>
        <el-table-column prop="positionName" label="岗位" min-width="100px"></el-table-column>
        <el-table-column prop="isDangyuan" label="是否党员" min-width="100px">
        <!--        <el-table-column prop="isDangyuan" label="是否党员" min-width="100px">
          <template slot-scope="{row}">
            <span v-if="row.isDangyuan ==1 " style="color: green">党员</span>
            <span v-if="row.isDangyuan ==0">非党员</span>
          </template>
        </el-table-column>
        <el-table-column prop="jobDate" label="入职日期" min-width="100px">  </el-table-column>
<!--        <el-table-column prop="status" label="状态" min-width="100px">
        </el-table-column>-->
        <el-table-column prop="jobDate" label="入职日期" min-width="100px"> </el-table-column>
        <!--        <el-table-column prop="status" label="状态" min-width="100px">
          <template slot-scope="{row}">
            <span v-if="row.status == 0" style="color: green">正常</span>
            <span v-if="row.status == 1" style="color: red">禁用</span>
            <span v-if="row.status == 2" style="color: red">拉黑/冻结</span>
          </template>
        </el-table-column>-->
        <el-table-column prop="trainEndTime" label="培训有效期" min-width="100px"> </el-table-column>
        <el-table-column label="部门类型" min-width="100px">
          <template slot-scope="{row}">
            <span v-if="row.companyType == 0">相关方组织</span>
@@ -170,20 +175,20 @@
            <div v-else>-</div>
          </template>
        </el-table-column>
        <el-table-column prop="code" label="工号" min-width="100px"></el-table-column>
<!--        <el-table-column prop="code" label="工号" min-width="100px"></el-table-column>
        <el-table-column label="卡片" min-width="80px">
          <template slot-scope="{row}">
            <el-button @click="$refs.cardOpeningRecord.open('开卡记录', row.id)" type="text">{{ row.memberCardCount ||
              '0' }}</el-button>
          </template>
        </el-table-column>
        </el-table-column>-->
        <el-table-column prop="editorName" label="操作人" min-width="100px"></el-table-column>
        <el-table-column prop="editDate" label="最后操作时间" min-width="150px"></el-table-column>
        <el-table-column
          v-if="containPermissions(['business:member:update', 'business:member:delete', 'business:empower:create'])"
          label="操作" min-width="280" fixed="right">
          label="操作" min-width="280">
          <template slot-scope="{row}">
            <el-button type="text" icon="el-icon-edit" @click="$refs.OperaMemberWindow.open('编辑员工信息', row, department)"
            <el-button type="text" icon="el-icon-edit" @click="$refs.OperaMemberWindow.open('编辑员工信息', row, department,searchForm.companyType)"
              v-permissions="['business:empower:update']">编辑</el-button>
            <el-button type="text" icon="el-icon-plus" @click="empower(row.id)"
              v-permissions="['business:empower:create']">重新授权</el-button>
@@ -193,7 +198,7 @@
            <el-button type="text" :loading="heading" icon="el-icon-edit" @click="updateHead(row, 1)"
              v-if="row.headStatus == 0" v-permissions="['business:member:head']">设为主管</el-button>
            <el-button type="text" icon="el-icon-delete" @click="deleteById(row)" style="color: red"
                       v-permissions="['business:member:delete']">删除</el-button>
              v-permissions="['business:member:delete']">删除</el-button>
          </template>
        </el-table-column>
      </el-table>
@@ -226,7 +231,7 @@
  name: 'internalMember',
  extends: BaseTable,
  components: { TableLayout1, Pagination, Tree, cardOpeningRecord, OperaMemberWindow, OperaMemberRoleWindow, OperaMemberImportWindow, OperaTrainTimeImportWindow },
  data () {
  data() {
    return {
      TreeList: [],
      // 搜索
@@ -254,7 +259,7 @@
      department: []
    }
  },
  created () {
  created() {
    this.config({
      module: '人员信息表',
      api: '/business/member',
@@ -265,8 +270,13 @@
    this.getfindCompanyTreePage()
    this.getPositionList()
  },
  mounted() {
 /*   this.$nextTick(() => {
      this.tableHeight = document.body.scrollHeight - this.$refs.QueryFormRef.offsetHeight - 276
    })*/
  },
  methods: {
    startEmpowerBatch () {
    startEmpowerBatch() {
      if (this.tableData.selectedRows.length === 0) {
        this.$tip.warning('请至少选择一条数据')
        return
@@ -279,13 +289,13 @@
      })
      this.$refs.OperaMemberRoleWindow.open('内部员工下发权限', ids, names, this.searchForm.companyType)
    },
    getPositionList () {
    getPositionList() {
      positionList({})
        .then(res => {
          this.positionList = res
        })
    },
    empower (id) {
    empower(id) {
      var that = this
      this.$confirm('确定重新授权吗?', '提示', {
        confirmButtonText: '确定',
@@ -302,7 +312,7 @@
      })
    },
    // 获取组织树
    getfindCompanyTreePage () {
    getfindCompanyTreePage() {
      fetchList()
        .then(res => {
          if (res && res.length > 0) {
@@ -314,7 +324,7 @@
          }
        })
    },
    getDepartmentTree (tree) {
    getDepartmentTree(tree) {
      if (tree == null) {
        return []
      }
@@ -337,7 +347,7 @@
      })
    },
    // 同步信息
    async synchronous () {
    async synchronous() {
      this.$dialog.actionConfirm('该操作降触发全员信息更新和重新下发！请谨慎操作', '您确认全量同步内部人员信息吗？')
        .then(() => {
          this.loading = true
@@ -355,7 +365,7 @@
        })
        .catch(() => { })
    },
    async updateHead (row, type) {
    async updateHead(row, type) {
      this.$dialog.actionConfirm('您确认进行当前操作吗？', '部门主管设置操作提示')
        .then(() => {
          this.heading = true
@@ -373,7 +383,7 @@
            .catch(() => { })
        })
    },
    changeWorkStatus (e, row) {
    changeWorkStatus(e, row) {
      this.working = true
      updateWorkStatus({ id: row.id, workStatus: e })
        .then(res => {
@@ -388,7 +398,7 @@
        })
        .catch(() => { })
    },
    changeCanvisit (e, row) {
    changeCanvisit(e, row) {
      this.canvisiting = true
      updateCanVisit({ id: row.id, canVisit: e })
        .then(res => {
@@ -403,7 +413,7 @@
        })
        .catch(() => { })
    },
    callback (row) {
    callback(row) {
      this.searchForm.erpOrgId = row.erpId
      this.searchForm.companyId = row.id
      this.search()