From ef46e4b78e81418a831d4f7f21eb24d2fd4d35e1 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sat, 25 Dec 2021 15:08:54 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises
---
src/views/accreditationRecords/accreditationRecordsPaper.vue | 112 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 99 insertions(+), 13 deletions(-)
diff --git a/src/views/accreditationRecords/accreditationRecordsPaper.vue b/src/views/accreditationRecords/accreditationRecordsPaper.vue
index 3a28218..2e7e35c 100644
--- a/src/views/accreditationRecords/accreditationRecordsPaper.vue
+++ b/src/views/accreditationRecords/accreditationRecordsPaper.vue
@@ -27,6 +27,20 @@
@refresh-change="refreshChange"
@on-load="onLoad"
>
+ <template slot-scope="{ row }" slot="auditStatus">
+ <el-tag class="dtype">
+ {{
+ row.auditStatus == 1
+ ? "待审核"
+ : row.auditStatus == 2
+ ? "审核通过"
+ : "审核不通过"
+ }}
+ <i class="zc" v-if="row.auditStatus == 2"></i>
+ <i class="yj" v-if="row.auditStatus == 3"></i>
+ <i class="gz" v-if="row.auditStatus == 1"></i>
+ </el-tag>
+ </template>
<template slot="menuLeft">
<el-button
style="display: none"
@@ -65,13 +79,17 @@
@click="handleSecurityAudit"
>批量审批
</el-button>
+ <!--图例 components-->
+ <span>
+ <Legend :datas="datalistLIU"></Legend>
+ </span>
</template>
<template slot-scope="{ row }" slot="category">
<el-tag>{{ row.categoryName }}</el-tag>
</template>
- <template slot-scope="{ row }" slot="userType">
+ <!-- <template slot-scope="{ row }" slot="userType">
{{ row.userType == 6 ? "已制证" : row.userType == 7 ? "未制证" : "" }}
- </template>
+ </template> -->
<template slot-scope="{ type, size, row }" slot="menu">
<el-button
style="display: none"
@@ -205,7 +223,11 @@
import { mapState } from "vuex";
import Qs from "qs";
import { getToken } from "@/util/auth";
+import Legend from "@/components/liu-legend/Legend";
export default {
+ components: {
+ Legend,
+ },
data() {
return {
check: false,
@@ -218,7 +240,20 @@
idCardNo: "",
registered: "",
},
-
+ datalistLIU: [
+ {
+ color: "#29C093",
+ text: "审核通过",
+ },
+ {
+ color: "#F34A4A",
+ text: "审核不通过",
+ },
+ {
+ color: "#F48F57",
+ text: "待审核",
+ },
+ ],
Audit: {},
dialogFormVisible: false,
dialogBatchAudit: false,
@@ -377,6 +412,7 @@
searchMenuSpan: 6,
selection: true,
reserveSelection: true,
+ align: "center",
tip: true,
border: true,
index: true,
@@ -442,9 +478,7 @@
// },
{
label: "企业名称",
- searchLabelWidth: "110",
prop: "deptName",
- searchLabelWidth: 80,
// type: "tree",
// dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
// props: {
@@ -482,6 +516,7 @@
prop: "avatar",
type: "upload",
listType: "picture-img",
+ width:60,
},
{
label: "保安证编号",
@@ -510,7 +545,7 @@
prop: "applyUnit",
search: true,
searchLabelWidth: 120,
- minWidth: 105,
+ minWidth: 160,
searchSpan: 5,
addDisplay: false,
editDisplay: false,
@@ -533,7 +568,7 @@
type: "select",
search: true,
searchLabelWidth: 90,
- width: 90,
+ width: 110,
searchSpan: 4,
addDisplay: false,
editDisplay: false,
@@ -565,7 +600,7 @@
},
{
label: "是否制证",
- prop: "userType",
+ prop: "status",
type: "select",
slot: true,
search: true,
@@ -575,12 +610,16 @@
width: 69,
dicData: [
{
+ label: "全部",
+ value: 3,
+ },
+ {
label: "已制证",
- value: 6,
+ value: 2,
},
{
label: "未制证",
- value: 7,
+ value: 1,
},
],
},
@@ -648,7 +687,7 @@
},
created() {
if (this.userInfo.role_name == "办证管理员") {
- this.questionBankSearch["userType"] = 7;
+ this.questionBankSearch["status"] = 1;
this.questionBankSearch["auditStatus"] = 2;
}
if (this.userInfo.role_name == "公安管理员") {
@@ -1023,7 +1062,7 @@
}
var data = {
type: 2,
- userType: this.questionBankSearch.userType,
+ status: this.questionBankSearch.status,
applyUnit: this.questionBankSearch.applyUnit,
auditStatus: this.questionBankSearch.auditStatus,
deptName: this.questionBankSearch.deptName,
@@ -1072,7 +1111,7 @@
}
var data = {
type: 2,
- userType: this.questionBankSearch.userType,
+ status: this.questionBankSearch.status,
applyUnit: this.questionBankSearch.applyUnit,
auditStatus: this.questionBankSearch.auditStatus,
deptName: this.questionBankSearch.deptName,
@@ -1316,4 +1355,51 @@
line-height: 40px;
letter-spacing: 2px;
}
+
+
+.dtype {
+ width: 100%;
+ padding-left: 0px;
+}
+
+.dx {
+ position: absolute;
+ top: 50%;
+ margin-top: -5px;
+ margin-left: 6px;
+ width: 10px;
+ height: 10px;
+ border-radius: 30%;
+ background: #dfdfdf;
+}
+.zc {
+ position: absolute;
+ top: 50%;
+ margin-top: -5px;
+ margin-left: 4px;
+ width: 10px;
+ height: 10px;
+ border-radius: 30%;
+ background: #29c093;
+}
+.yj {
+ position: absolute;
+ top: 50%;
+ margin-top: -5px;
+ margin-left: 4px;
+ width: 10px;
+ height: 10px;
+ border-radius: 30%;
+ background: #f34a4a;
+}
+.gz {
+ position: absolute;
+ top: 50%;
+ margin-top: -5px;
+ margin-left: 4px;
+ width: 10px;
+ height: 10px;
+ border-radius: 30%;
+ background: #f48f57;
+}
</style>
--
Gitblit v1.9.3