提交

jiangping

2024-07-11 933ba1fabe9ea645fe3cb884d10574cff0db3133

提交

 admin/src/views/business/shop.vue

@@ -20,11 +20,9 @@
      </el-form-item>
      <el-form-item label="一级组织类型" prop="type">
        <el-select v-model="searchForm.type" @change="search" clearable placeholder="一级组织类型">
          <el-option label="一体商" value="1"></el-option>
          <el-option label="HR" value="1"></el-option>
          <el-option label="加盟商" value="2"></el-option>
          <el-option label="店面" value="3"></el-option>
          <el-option label="部门(HR/加)" value="4"></el-option>
          <el-option label="虚拟店面(加/虚)" value="5"></el-option>
          <el-option label="虚拟组织" value="3"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="二级组织类型" prop="type">

 admin/src/views/business/shopUsers.vue

@@ -2,19 +2,26 @@
  <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 label="" prop="queryKeyword">
        <el-input v-model="searchForm.queryKeyword" placeholder="请输入姓名/手机号/工号" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="" prop="hasFace">
        <el-select v-model="searchForm.hasFace" @keypress.enter.native="search" clearable placeholder="是否有人脸">
          <el-option label="无" value="0"></el-option>
          <el-option label="有" value="1"></el-option>
      <el-form-item label="" prop="iamUsername">
        <el-input v-model="searchForm.iamUsername" placeholder="请输入登录账号" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="" prop="shopType">
        <el-select v-model="searchForm.shopType" @change="search" clearable placeholder="一级组织类型">
          <el-option label="HR" value="1"></el-option>
          <el-option label="加盟商" value="2"></el-option>
          <el-option label="虚拟组织" value="3"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="" prop="canVisit">
        <el-select v-model="searchForm.canVisit" clearable @keypress.enter.native="search" placeholder="可拜访">
          <el-option label="是" value="1"></el-option>
          <el-option label="否" value="0"></el-option>
      <el-form-item label="" prop="shopSecType">
        <el-select v-model="searchForm.shopSecType" @change="search" clearable placeholder="二级组织类型">
          <el-option label="S" value="1"></el-option>
          <el-option label="F" value="2"></el-option>
          <el-option label="店面" value="3"></el-option>
          <el-option label="部门" value="4"></el-option>
          <el-option label="虚拟店面" value="5"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="" prop="status">
@@ -22,13 +29,6 @@
          <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="" prop="hkStatus">
        <el-select v-model="searchForm.hkStatus" @keypress.enter.native="search" clearable 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>
      <section>
@@ -53,12 +53,13 @@
    </template>
    <!-- 表格和分页 -->
    <template v-slot:table-wrap>
      <ul class="toolbar" v-permissions="['business:member:delete','business:member:create,business:empower:create']">
        <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>
      <ul class="toolbar"  style="height: 26px">
<!--        <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>
        <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>
        <li style="float: right">
          <el-checkbox style="font-size: 12px"  label="1" v-model="searchForm.includeChild" key="1"  @change="search" >是否包含下级组织</el-checkbox>
     -->
        <li style="float: right;">
         <el-checkbox style="font-size: 12px"  label="1" v-model="searchForm.includeChild" key="1"  @change="search" >是否包含下级组织</el-checkbox>
        </li>
      </ul>
      <el-table
@@ -69,63 +70,58 @@
      >
        <el-table-column type="selection" width="55"></el-table-column>
        <el-table-column prop="name" label="姓名" min-width="100px"></el-table-column>
        <el-table-column prop="iamUsername" label="登录账号" min-width="100px"></el-table-column>
        <el-table-column prop="phone" label="手机号" min-width="100px"></el-table-column>
        <el-table-column label="性别" min-width="100px">
          <template slot-scope="{row}">
            <span v-if="row.sex == 1">男</span>
            <span v-if="row.sex == 2">女</span>
            <span v-if="row.sex == 0">男</span>
            <span v-if="row.sex == 1">女</span>
          </template>
        </el-table-column>
        <el-table-column prop="shopName" 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>
            <span v-if="row.status == 0" style="color: red">停用</span>
            <span v-if="row.status == 1" style="color:green">启用</span>
          </template>
        </el-table-column>
        <el-table-column label="部门类型" min-width="100px">
          <template slot-scope="{row}">
            <span v-if="row.companyType == 0">相关方组织</span>
            <span v-if="row.companyType == 1">内部组织</span>
          </template>
        </el-table-column>
        <el-table-column label="在职状态">
          <template slot-scope="{row}">
            <el-switch
                @change="changeWorkStatus($event, row)"
                v-model="row.workStatus"
                active-color="#13ce66"
                inactive-color="#ff4949"
                :active-value="0"
                :inactive-value="1">
            </el-switch>
        <el-table-column prop="shopType" label="组织类型" min-width="80px">
          <template scope="{row}">
            <span v-if="row.shopType == 1">HR</span>
            <span v-if="row.shopType == 2">加盟商</span>
            <span v-if="row.shopType == 3">虚拟组织</span>
            <span v-if="row.shopSecType == 1">-S</span>
            <span v-if="row.shopSecType == 2">-F</span>
            <span v-if="row.shopSecType == 3">-店面</span>
            <span v-if="row.shopSecType == 4">-部门</span>
            <span v-if="row.shopSecType == 5">-虚拟店面</span>
          </template>
        </el-table-column>
        <el-table-column prop="code" label="工号" min-width="100px"></el-table-column>
        <el-table-column prop="roleNames" label="人员角色" min-width="100px"></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" label="人脸信息" min-width="100px">
        <el-table-column fixed="right" label="头像" align="center" min-width="100px">
          <template slot-scope="{row}">
            <el-image
                v-if="row.faceImgFull"
                v-if="row.imgurlFull"
                style="width: 60px; height: 60px"
                :src="row.faceImgFull"
                :preview-src-list="[row.faceImgFull]">
                :src="row.imgurlFull"
                :preview-src-list="[row.imgurlFull]">
            </el-image>
          </template>
        </el-table-column>
        <el-table-column
            v-if="containPermissions(['business:member:update', 'business:member:delete','business:empower:create'])"
            label="操作"
            min-width="280"
            fixed="right"
        >
        <!--      <el-table-column
               v-if="containPermissions(['business:member:update', 'business:member:delete','business:empower:create'])"
               label="操作"
               min-width="280"
               fixed="right"
           >
          <template slot-scope="{row}">
            <el-button type="text" icon="el-icon-edit" @click="$refs.OperaMemberWindow.open('编辑员工信息',row,department)" v-permissions="['business:empower:update']">编辑</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-button type="text" icon="el-icon-edit" @click="$refs.OperaMemberWindow.open('编辑员工信息',row,department)" v-permissions="['business:empower:update']">编辑</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>
      <pagination
          @size-change="handleSizeChange"
@@ -144,7 +140,6 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout1 from '@/layouts/TableLayout1'
import Pagination from '@/components/common/Pagination'
import Tree from '@/components/common/Tree'
import OperaMemberWindow from '@/components/business/OperaMemberWindow'
import OperaMemberImportWindow from '@/components/business/OperaMemberImportWindow'
import { fetchListByParent } from '@/api/business/shop'
@@ -157,22 +152,15 @@
      TreeList: [],
      // 搜索
      searchForm: {
        name: '',
        queryKeyword: '',
        status: '',
        hkStatus: '',
        includeChild: false,
        canVisit: '',
        keyword: '',
        type: 2,
        companyType: 1,
        erpOrgId: '',
        companyId: '',
        hasFace: ''
        iamOrgId: '',
        shopName: '',
        shopType: null,
        shopSecType: null,
        includeChild: false
      },
      loading: false,
      heading: false,
      working: false,
      canvisiting: false,
      companyTree: [],
      department: []
    }
@@ -184,7 +172,7 @@
      'field.id': 'id',
      'field.main': 'id'
    })
    // this.search()
    this.search()
    // this.loadShopTree()
  },
  methods: {
@@ -211,8 +199,7 @@
    },
    callback (row) {
      console.log(row)
      this.searchForm.erpOrgId = row.erpId
      this.searchForm.companyId = row.id
      this.searchForm.iamOrgId = row.orgId
      this.search()
    }
  }