Merge remote-tracking branch 'origin/master'

k94314517

2025-04-16 14e0babcc1bed5e899342fa5536eafc4340cd899

 admin/src/views/business/companyMember.vue

@@ -31,7 +31,9 @@
        </li>
      </ul>
      <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 prop="index" label="序号" width="55" fixed="left">
          <template slot-scope="scope">{{ scope.$index+1}}</template>
        </el-table-column>-->
        <el-table-column fixed="left" prop="name" label="姓名" min-width="80px">
          <template slot-scope="{row}">
            <span>{{ row.name }}</span>
@@ -42,7 +44,7 @@
          <template slot-scope="{row}">
            <span v-if="row.sex == '1'">男</span>
            <span v-else-if="row.sex == '2' ">女</span>
            <span v-else>女</span>
            <span v-else>-</span>
          </template>
        </el-table-column>
        <el-table-column prop="email" label="邮箱" min-width="100px"></el-table-column>
@@ -56,9 +58,15 @@
        </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 fixed="right"   v-if="containPermissions(['business:member:update'])" label="操作" min-width="100">
          <template slot-scope="{row}">
            <el-button type="text" icon="el-icon-edit" @click="$refs.OperaMemberWindow.open('编辑员工信息', row)"  v-permissions="['business:member:update']">编辑</el-button>
          </template>
        </el-table-column>
      </el-table>
      <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
      </pagination>
      <OperaMemberWindow ref="OperaMemberWindow" @success="handlePageChange" />
    </template>
  </TableLayout1>
</template>
@@ -68,12 +76,13 @@
import TableLayout1 from '@/layouts/TableLayout1'
import Pagination from '@/components/common/Pagination'
import Tree from '@/components/common/Tree'
import OperaMemberWindow from '@/components/business/OperaMemberWindow'
import { treeList } from '@/api/business/company'
import { memberSync} from '@/api/business/member'
export default {
  name: 'internalMember',
  extends: BaseTable,
  components: { TableLayout1, Pagination, Tree },
  components: { TableLayout1, Pagination, Tree,OperaMemberWindow },
  data() {
    return {
      TreeList: [],