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

doum

14 小时以前 cb6aca0642ac8dd5de877ade168066d85acb589c

 admin/src/views/business/retention.vue

@@ -1,150 +1,106 @@
<template>
  <TableLayout :permissions="['business:retention:query']">
    <!-- 搜索表单 -->
    <el-form
      ref="searchForm"
      slot="search-form"
      :model="searchForm"
      label-width="100px"
      inline
    >
      <el-form-item label="姓名/手机号" prop="keyWords">
        <el-input
          v-model="searchForm.keyWords"
          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>
      <el-form-item label="人员类型" prop="type">
        <el-select v-model="searchForm.type" 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>
      <el-form-item label="起始时间" prop="startTime">
        <el-date-picker
          @change="seleTime"
          v-model="time"
          type="datetimerange"
          format="yyyy-MM-dd HH:mm:ss"
          value-format="yyyy-MM-dd HH:mm:ss"
          range-separator="至"
          start-placeholder="开始日期"
          end-placeholder="结束日期"
        >
        </el-date-picker>
      </el-form-item>
      <el-radio-group
        v-model="searchForm.radio"
        size="small"
        @input="changeRadio"
      >
        <el-radio-button label="0">当天</el-radio-button>
        <el-radio-button label="1">近7天</el-radio-button>
        <el-radio-button label="2">近30天</el-radio-button>
      </el-radio-group>
      <section>
        <el-button type="primary" @click="search">搜索</el-button>
        <el-button @click="reset">重置</el-button>
      </section>
    </el-form>
    <div ref="QueryFormRef" slot="search-form">
      <el-form ref="searchForm" :model="searchForm" label-width="100px" inline>
        <el-form-item label="姓名/手机号" prop="keyWords">
          <el-input v-model="searchForm.keyWords" 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>
        <el-form-item label="人员类型" prop="queryUserType">
          <el-select v-model="searchForm.type" placeholder="请选择">
            <el-option label="访客" value="1"></el-option>
            <el-option label="相长期关方" value="4"></el-option>
            <el-option label="内部员工" value="2"></el-option>
            <el-option label="货运司机" value="5"></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="起止时间" prop="startTime">
          <!-- <el-date-picker @change="seleTime" v-model="time" type="datetimerange" format="yyyy-MM-dd HH:mm:ss"
            value-format="yyyy-MM-dd HH:mm:ss" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间">
          </el-date-picker> -->
          <el-date-picker type="datetime" v-model="searchForm.startTime" value-format="yyyy-MM-dd HH:mm:ss"
            placeholder="请选择开始时间" @change="changeRadio" />
          <el-date-picker type="datetime" v-model="searchForm.endTime" value-format="yyyy-MM-dd HH:mm:ss"
            placeholder="请选择结束时间" @change="changeRadio" />
        </el-form-item>
        <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
          <el-radio-button label="0">当天</el-radio-button>
          <el-radio-button label="1">近7天</el-radio-button>
          <el-radio-button label="2">近30天</el-radio-button>
        </el-radio-group>
        <section>
          <el-button type="primary" @click="search">搜索</el-button>
          <el-button @click="reset">重置</el-button>
        </section>
      </el-form>
    </div>

    <!-- 表格和分页 -->
    <template v-slot:table-wrap>
      <ul class="toolbar" v-permissions="['business:retention:exportExcel']">
        <li>
          <el-button
            type="primary"
            :loading="isWorking.export"
            v-permissions="['business:retention:exportExcel']"
            @click="exportExcel"
            >导出</el-button
          >
          <el-button type="primary" :loading="isWorking.export" v-permissions="['business:retention:exportExcel']"
            @click="exportExcel">导出</el-button>
        </li>
      </ul>
      <el-table
        v-loading="isWorking.search"
        :data="tableData.list"
        stripe
        @selection-change="handleSelectionChange"
      >
      <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="name" label="姓名" min-width="100px"></el-table-column>
        <el-table-column prop="phone" label="手机号" min-width="100px"></el-table-column>
        <el-table-column prop="idcardDecode" label="身份证号" min-width="130px"></el-table-column>
        <el-table-column prop="companyName" label="组织" min-width="100px">
          <template slot-scope="{ row }">
            <span v-if="row.type === 2 || row.type === 0">{{
            <span v-if="row.type === 2 || row.type === 4 || row.type === 0">{{
              row.companyName
            }}</span>
              }}</span>
            <span v-else>{{ row.visitCompanyName }}</span>
          </template>
        </el-table-column>
        <el-table-column prop="type" label="人员类型" min-width="100px">
          <template slot-scope="{ row }">
            <span v-if="row.type === 0">劳务访客</span>
            <span v-if="row.type === 1">普通访客</span>
            <span v-if="row.type === 2">内部员工</span>
          <template slot-scope="{row}">
            <span  v-if="row.type ==1">访客</span>
            <span  v-else-if="row.type ==2">内部人员</span>
            <span  v-else-if="row.type ==4">相关方人员</span>
            <span  v-else-if="row.type ==5">货运司机</span>
            <span  v-else ></span>
          </template>
        </el-table-column>
        <el-table-column
          prop="name"
          label="姓名"
          min-width="100px"
        ></el-table-column>
        <el-table-column
          prop="phone"
          label="手机号"
          min-width="100px"
        ></el-table-column>
        <el-table-column
          prop="idcardDecode"
          label="身份证号"
          min-width="130px"
        ></el-table-column>
        <el-table-column label="进场门禁" min-width="100px">
<!--        <el-table-column prop="type" label="人员类型" min-width="100px">
          <template slot-scope="{ row }">
            <span v-if="row.type === 1">-</span>
            <span v-else>{{ row.deviceName }}</span>
            <span v-if="row.companyType == 0">相关方组织</span>
            <span v-else-if="row.companyType == 1">内部员工</span>
            <span v-else>访客</span>
          </template>
        </el-table-column>-->
        <el-table-column label="进场门禁" min-width="150px">
          <template slot-scope="{ row }">
            <!-- <span v-if="row.type === 1">-</span> -->
            <span>{{ row.deviceName || '-' }}</span>
          </template>
        </el-table-column>
        <el-table-column
          prop="eventDate"
          label="进场时间"
          min-width="100px"
        ></el-table-column>
        <el-table-column prop="eventDate" label="最后进场时间" min-width="140px"></el-table-column>
        <el-table-column label="备注" prop="remark"  min-width="100px"></el-table-column>
        <el-table-column label="人脸照片" min-width="100px">
          <template slot-scope="{ row }">
            <el-image
              v-if="row.faceImgFull != null"
              style="width: 80px; height: 80px"
              :src="row.faceImgFull"
              :preview-src-list="[row.faceImgFull]"
            >
            <el-image v-if="row.faceImgFull != null" style="width: 80px; height: 80px" :src="row.faceImgFull"
              :preview-src-list="[row.faceImgFull]">
            </el-image>
          </template>
        </el-table-column>

        <el-table-column label="操作" min-width="120" fixed="right">
          <template slot-scope="{ row }">
            <el-button
              type="text"
              @click="deleteById(row)"
              icon="el-icon-delete"
              v-permissions="['business:retention:delete']"
              >标记离场</el-button
            >
            <el-button type="text" @click="deleteById(row)" icon="el-icon-delete"
              v-permissions="['business:retention:delete']">标记离场</el-button>
          </template>
        </el-table-column>

      </el-table>
      <pagination
        @size-change="handleSizeChange"
        @current-change="handlePageChange"
        :pagination="tableData.pagination"
      >
      <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
      </pagination>
    </template>
  </TableLayout>
@@ -159,7 +115,7 @@
  name: 'Retention',
  extends: BaseTable,
  components: { TableLayout, Pagination },
  data () {
  data() {
    return {
      // 搜索
      searchForm: {
@@ -173,7 +129,7 @@
      time: []
    }
  },
  created () {
  created() {
    this.config({
      module: '在园人员信息 表（滞留）',
      api: '/business/retention',
@@ -182,32 +138,41 @@
    })
    this.changeRadio('0')
  },
  mounted() {
    this.$nextTick(() => {
      this.tableHeight = document.body.scrollHeight - this.$refs.QueryFormRef.offsetHeight - 300
    })
  },
  methods: {
    changeRadio (e) {
    changeRadio(e) {
      if (e === '0') {
        this.searchForm.startTime = timeForMat(0)[0]
        this.searchForm.endTime = timeForMat(0)[1]
        this.time = timeForMat(0)
      } else if (e === '1') {
        this.searchForm.startTime = timeForMat(6)[0]
        this.searchForm.endTime = timeForMat(6)[1]
        this.time = timeForMat(6)
      } else if (e === '2') {
        this.searchForm.startTime = timeForMat(29)[0]
        this.searchForm.endTime = timeForMat(29)[1]
        this.time = timeForMat(29)
      } else {
        this.searchForm.radio = ''
      }
      if (this.searchForm.startTime && this.searchForm.endTime && new Date(this.searchForm.startTime).getTime() > new Date(this.searchForm.endTime).getTime()) {
        this.$message.error('开始时间不能大于结束时间')
        this.searchForm.startTime = ''
        return
      }
      this.search()
    },
    reset () {
    reset() {
      this.$refs.searchForm.resetFields()
      this.searchForm.startTime = ''
      this.searchForm.radio = '0'
      this.searchForm.radio = ''
      this.searchForm.endTime = ''
      this.time = []
      this.search()
    },
    seleTime (e) {
    seleTime(e) {
      this.searchForm.startTime = e[0]
      this.searchForm.endTime = e[1]
      this.searchForm.radio = null