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

rk

2 天以前 5841a771d4455d25adb185b8a0637c9ba498aab2

 admin/src/views/business/strandedPersonnel.vue

@@ -8,12 +8,12 @@
      <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-form-item label="用户类型" prop="type">
        <el-select v-model="searchForm.type" placeholder="请选择">
          <el-option label="访客" value="1"></el-option>
          <el-option label="劳务" value="0"></el-option>
        </el-select>
      </el-form-item>
      </el-form-item>-->
      <section>
        <el-button type="primary" @click="search">搜索</el-button>
        <el-button @click="reset">重置</el-button>
@@ -24,20 +24,21 @@
      <!--            <ul class="toolbar" v-permissions="['business:member:create', 'business:member:delete']">-->
      <!--                <li><el-button type="primary" v-permissions="['business:member:create']" @click="thaws">离场</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="name" label="姓名" min-width="80px"></el-table-column>
        <el-table-column prop="phone" label="手机号" min-width="100px"></el-table-column>
        <el-table-column prop="companyName" label="组织" min-width="100px"></el-table-column>
        <el-table-column prop="companyName" show-overflow-tooltip label="组织" min-width="200px"></el-table-column>
        <el-table-column 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>
          <span>访客</span>
          <!-- <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>-->
        </el-table-column>
        <el-table-column prop="inDate" label="在园时间" min-width="100px"></el-table-column>
        <el-table-column prop="outDate" label="授权到期时间" min-width="100px"></el-table-column>
        <el-table-column prop="inDate" label="在园时间" show-overflow-tooltip min-width="150px"></el-table-column>
        <el-table-column prop="outDate" label="授权到期时间" show-overflow-tooltip min-width="150px"></el-table-column>
        <el-table-column label="超时时长" min-width="100px">
          <template slot-scope="{ row }">
            <span v-if="row.outStatus === 1">{{ row.timeOut.toString().replace("-", "") }}分钟</span>
@@ -85,8 +86,8 @@
      searchForm: {
        companyName: '',
        name: '',
        status: 2,
        type: '1'
        status: 2
        // type: '1'
      },
      user: []
    }