Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

2025-09-26 dd4cd96c69061da3ff80cbfb87237b16cda8abc3

 admin/src/views/business/internalMember.vue

@@ -43,13 +43,15 @@
            <el-option label="同步失败" value="2"></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="" prop="idcardNo">
          <el-input v-model="searchForm.idcardNo" placeholder="身份证号" @keypress.enter.native="search"></el-input>
        </el-form-item>
        <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;">
@@ -64,13 +66,15 @@
      <ul class="toolbar" v-permissions="['business:member:delete', 'business:member:create,business:empower:create']">
        <li><el-button type="primary" v-permissions="['business:member:sync']" :loading="loading"
            @click="synchronous()">同步</el-button></li>
        <li><el-button type="primary"
        <li><el-button type="primary" v-permissions="['business:member:create']" :loading="loading"
            @click="synchronousDingding()">同步钉钉</el-button></li>
<!--        <li><el-button type="primary"
            @click="add" icon="el-icon-plus"
            v-permissions="['business:member:create']">新建员工</el-button></li>
        <li><el-button type="primary" @click="$refs.OperaMemberImportWindow.open('人员导入', searchForm.companyType)"
            icon="el-icon-plus" v-permissions="['business:member:create']">人员导入</el-button></li>
        <li><el-button type="danger" @click="deleteByIdInBatch" icon="el-icon-delete"
            v-permissions="['business:member:delete']">批量删除</el-button></li>
            v-permissions="['business:member:delete']">批量删除</el-button></li>-->
        <li><el-button type="primary" v-permissions="['business:empower:create']"
            @click="startEmpowerBatch()">下发授权</el-button></li>
        <li style="float: right">
@@ -103,14 +107,14 @@
        </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 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>
@@ -181,8 +185,7 @@
          v-if="containPermissions(['business:member:update', 'business:member:delete', 'business:empower:create'])"
          label="操作" min-width="280">
          <template slot-scope="{row}">
            <el-button type="text" icon="el-icon-edit" @click="edit(row)"
              v-permissions="['business:member:update']">编辑</el-button>
           <el-button type="text" icon="el-icon-edit" @click="edit(row)"  v-permissions="['business:member:update']">编辑</el-button>
            <el-button type="text" icon="el-icon-plus" @click="empower(row.id)"
              v-permissions="['business:empower:create']">重新授权</el-button>
            <el-button type="text" :loading="heading" style="color: red" icon="el-icon-delete"
@@ -190,8 +193,8 @@
              v-permissions="['business:member:head']">取消主管</el-button>
            <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>
<!--            <el-button type="text" icon="el-icon-delete" @click="deleteById(row)" style="color: red"
              v-permissions="['business:member:delete']">删除</el-button>-->
          </template>
        </el-table-column>
      </el-table>
@@ -217,12 +220,12 @@
import OperaMemberImportWindow from '@/components/business/OperaMemberImportWindow'
import { fetchList } from '@/api/business/company'
import { allList } from '@/api/business/position'
import { memberSync, roleAuth, updateCanVisit, updateHead, updateWorkStatus } from '@/api/business/member'
import { memberSync,memberSyncDingding, roleAuth, updateCanVisit, updateHead, updateWorkStatus } from '@/api/business/member'
export default {
  name: 'internalMember',
  extends: BaseTable,
  components: { TableLayout1, Pagination, Tree, cardOpeningRecord, OperaMemberWindow, OperaMemberRoleWindow, OperaMemberImportWindow },
  data() {
  data () {
    return {
      TreeList: [],
      // 搜索
@@ -240,7 +243,8 @@
        positionId: '',
        companyId: '',
        hasFace: '',
        authStatus: ''
        authStatus: '',
        idcardNo: ''
      },
      loading: false,
      heading: false,
@@ -366,6 +370,25 @@
        })
        .catch(() => { })
    },
    // 同步信息
    async synchronousDingding() {
      this.$dialog.actionConfirm('该操作降触发全员信息更新和重新下发！请谨慎操作', '您确认全量同步内部人员信息吗？')
        .then(() => {
          this.loading = true
          memberSyncDingding({})
            .then(res => {
              this.$tip.apiSuccess(res || '同步成功')
              this.search()
            })
            .catch(e => {
              this.$tip.apiFailed(e)
            })
            .finally(() => {
              this.loading = false
            })
        })
        .catch(() => { })
    },
    async updateHead(row, type) {
      this.$dialog.actionConfirm('您确认进行当前操作吗？', '部门主管设置操作提示')
        .then(() => {