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

MrShi

2025-05-21 f5ab83dfad01c87828232af8cd18c676e69fd917

 admin/src/views/business/retention.vue

@@ -54,26 +54,36 @@
        <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 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 ==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="type" label="人员类型" min-width="100px">
          <template slot-scope="{ row }">
            <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="100px">
        </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="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"
@@ -81,12 +91,14 @@
            </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>
          </template>
        </el-table-column>

      </el-table>
      <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
      </pagination>