Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

liukangdong

2024-12-30 a6f9e7d4faf7c1c536111e0db7f3317cbda9ddb1

 admin/src/views/business/internalMember.vue

@@ -93,13 +93,13 @@
          </template>
        </el-table-column>
        <el-table-column prop="companyName" label="所属部门" min-width="100px"></el-table-column>
        <el-table-column prop="postionName" label="岗位" min-width="100px"></el-table-column>
        <el-table-column prop="isDangyuan" label="是否党员" min-width="100px">
        <el-table-column prop="positionName" label="岗位" min-width="100px"></el-table-column>
<!--        <el-table-column prop="isDangyuan" label="是否党员" min-width="100px">
          <template slot-scope="{row}">
          <span v-if="row.isDangyuan == 0" style="color: green">是</span>
          <span v-else >否</span>
          <span v-if="row.isDangyuan ==1" style="color: green">党员</span>
          <span v-if="row.isDangyuan ==0">非党员</span>
          </template>
        </el-table-column>
        </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}">
@@ -207,7 +207,7 @@
import OperaMemberRoleWindow from '@/components/business/OperaMemberRoleWindow'
import OperaMemberImportWindow from '@/components/business/OperaMemberImportWindow'
import { fetchList } from '@/api/business/company'
import { fetchList as alllist } from '@/api/business/position'
import { allList } from '@/api/business/position'
import { memberSync, roleAuth, updateCanVisit, updateHead, updateWorkStatus } from '@/api/business/member'
export default {
  name: 'internalMember',
@@ -267,7 +267,7 @@
      this.$refs.OperaMemberRoleWindow.open('内部员工下发权限', ids, names, this.searchForm.companyType)
    },
    getPositionList () {
      alllist({})
      allList({})
        .then(res => {
          this.positionList = res
        })