Merge remote-tracking branch 'origin/master'

jiangping

2024-12-11 eb49564ab17c6695d8928d5a63a57c58b3cfd79c

 admin/src/views/business/blackmailPersonnel.vue

@@ -5,8 +5,8 @@
            <el-form-item label="姓名/手机号" prop="name">
                <el-input v-model="searchForm.name" placeholder="请输入姓名/手机号" @keypress.enter.native="search"></el-input>
            </el-form-item>
            <el-form-item label="公司名称" prop="companyName">
                <el-input v-model="searchForm.companyName" placeholder="请输入公司名称" @keypress.enter.native="search"></el-input>
            <el-form-item label="组织名称" prop="companyName">
                <el-input v-model="searchForm.companyName" placeholder="请输入组织名称" @keypress.enter.native="search"></el-input>
            </el-form-item>
            <el-form-item label="操作人员" prop="createrId">
                <el-select v-model="searchForm.createrId" placeholder="请选择">
@@ -51,9 +51,8 @@
                        <span v-if="row.type === 2">内部人员</span>
                    </template>
                </el-table-column>
                <el-table-column prop="visitCompanyName" label="公司" min-width="100px"></el-table-column>
                <el-table-column prop="optTime" label="操作时间" min-width="100px"></el-table-column>
                <el-table-column prop="creatorName" label="操作人" min-width="100px"></el-table-column>
                <el-table-column prop="visitCompanyName" label="组织" min-width="100px"></el-table-column>
                <el-table-column prop="optRemark" label="操作信息" min-width="300px"></el-table-column>
                <el-table-column
                    v-if="containPermissions(['business:member:update', 'business:member:delete'])"
                    label="操作"
@@ -80,7 +79,7 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import { findAllList } from '@/api/system/common'
import { updateRemoveStatusById } from '@/api/business/block'
import { updateRemoveBlackById } from '@/api/business/block'
export default {
  name: 'blackmailPersonnel',
  extends: BaseTable,
@@ -111,9 +110,9 @@
    thaws () {
      if (this.tableData.selectedRows.length === 0) return this.$message.warning('至少选择一项内容')
      const ids = this.tableData.selectedRows.map(item => {
        return { id: item.id }
        return item.id
      })
      updateRemoveStatusById(ids)
      updateRemoveBlackById(ids.join(','))
        .then(res => {
          this.$message.success('操作成功')
          this.search()
@@ -125,7 +124,7 @@
        cancelButtonText: '取消',
        type: 'warning'
      }).then(() => {
        updateRemoveStatusById([{ id: ids }])
        updateRemoveBlackById(ids)
          .then(res => {
            this.$message.success('操作成功')
            this.search()