From 48d34b0def9f848d1b7f9ddd2cd0861341fb208d Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Sat, 04 Dec 2021 17:15:30 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_regulatory_ys
---
src/views/securityGuardManagement/register.vue | 111 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 97 insertions(+), 14 deletions(-)
diff --git a/src/views/securityGuardManagement/register.vue b/src/views/securityGuardManagement/register.vue
index 2cbb7d8..0b125f4 100644
--- a/src/views/securityGuardManagement/register.vue
+++ b/src/views/securityGuardManagement/register.vue
@@ -2,7 +2,7 @@
* @Author: Morpheus
* @Date: 2021-07-05 16:31:54
* @Last Modified by: liu
- * @Last Modified time: 2021-11-30 15:01:25
+ * @Last Modified time: 2021-12-04 16:26:48
* menu-name 保安员注册查询
*/
<template>
@@ -77,7 +77,7 @@
>{{ row.$deptId }}</el-tag
>
</template>
- <template slot-scope="{ type, size, row }" slot="menu">
+ <!-- <template slot-scope="{ type, size, row }" slot="menu">
<el-button
:size="size"
:type="type"
@@ -97,7 +97,7 @@
:size="size"
:type="type"
@click.stop="trackRecord(row)"
- >现实表现
+ >保安员现实表现
</el-button>
<el-button
:size="size"
@@ -120,6 +120,75 @@
:title="row.hold == 2 ? '暂无证件' : ''"
:disabled="row.hold == 2"
>证件吊销</el-button
+ >
+
+ <el-button
+ icon="icon-zhengjian"
+ :size="size"
+ :type="type"
+ class="zhengJian-icon"
+ v-if="row.hold == 3"
+ @click.stop="handleCredentialssee(row)"
+ >吊销原因</el-button
+ >
+ </template> -->
+ <template slot-scope="{ type, size, row }" slot="menu">
+ <el-button
+ :size="size"
+ :type="type"
+ class="zhengJian-icon"
+ @click.stop="handleRowClick(row)"
+ >详情</el-button
+ >
+ <el-button
+ icon="el-icon-finished"
+ :size="size"
+ :type="type"
+ @click.stop="trackRecord(row)"
+ >保安员现实表现
+ </el-button>
+ <el-button
+ :size="size"
+ :type="type"
+ class="zhengJian-icon"
+ @click.stop="honor(row)"
+ >保安员荣誉录入</el-button
+ >
+ <!-- <el-button
+ :size="size"
+ :type="type"
+ class="zhengJian-icon"
+ @click.stop="paiqian(row)"
+ >保安员派遣记录</el-button
+ > -->
+ <!-- <el-button
+ :size="size"
+ :type="type"
+ class="zhengJian-icon"
+ @click.stop="bmpxcx(row)"
+ >报名培训查询</el-button
+ > -->
+ <el-button
+ :size="size"
+ :type="type"
+ class="zhengJian-icon"
+ v-if="row.hold == 1"
+ :disabled="row.hold != 1"
+ :title="row.hold != 1 ? '暂无证件或已吊销' : ''"
+ @click.stop="handleViewCredentials(row)"
+ >保安员证打印</el-button
+ >
+
+ <el-button
+ icon="icon-zhengjian"
+ :size="size"
+ :type="type"
+ class="zhengJian-icon"
+ v-if="row.hold != 3 && row.hold != 2"
+ @click.stop="handleCredentials(row)"
+ :title="row.hold == 2 ? '暂无证件' : ''"
+ :disabled="row.hold == 2"
+ >保安员证件吊销</el-button
>
<el-button
@@ -579,6 +648,30 @@
display: false,
},
{
+ label: "保安证编号",
+ prop: "securitynumber",
+ search: true,
+ searchLabelWidth: 90,
+ minWidth: 105,
+ searchSpan: 4,
+ addDisplay: false,
+ editDisplay: false,
+ // hide: true,
+ },
+ {
+ label: "学历",
+ prop: "education",
+ type: "select",
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
+ props: {
+ label: "dictValue",
+ value: "dictKey",
+ },
+ dataType: "number",
+ // slot: true,
+ disabled: true,
+ },
+ {
label: "身份证号码",
prop: "cardid",
search: true,
@@ -674,17 +767,7 @@
hide: true,
display: false,
},
- {
- label: "保安证编号",
- prop: "securitynumber",
- search: true,
- searchLabelWidth: 90,
- minWidth: 105,
- searchSpan: 4,
- addDisplay: false,
- editDisplay: false,
- // hide: true,
- },
+
{
label: "入职时间",
prop: "rtime",
--
Gitblit v1.9.3