From ed1cc56b6bca56689d8cd46c0c5de0cf197cb07d Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 24 Nov 2021 09:54:49 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_regulatory
---
src/views/statisticalQueryManagement/businessStatisticsFwdq.vue | 6 +++---
src/views/statisticalQueryManagement/securityGuardDetail.vue | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/views/statisticalQueryManagement/businessStatisticsFwdq.vue b/src/views/statisticalQueryManagement/businessStatisticsFwdq.vue
index 025de21..aa9f880 100644
--- a/src/views/statisticalQueryManagement/businessStatisticsFwdq.vue
+++ b/src/views/statisticalQueryManagement/businessStatisticsFwdq.vue
@@ -92,7 +92,7 @@
},
{
label: "所属保安公司",
- prop: "tenantName",
+ prop: "deptName",
width: 300,
display: false
},
@@ -107,8 +107,8 @@
display: false
},
{
- label: "保安员姓名",
- prop: "realName",
+ label: "保安员数量",
+ prop: "num",
display: false
},
{
diff --git a/src/views/statisticalQueryManagement/securityGuardDetail.vue b/src/views/statisticalQueryManagement/securityGuardDetail.vue
index 490f22a..f83a833 100644
--- a/src/views/statisticalQueryManagement/securityGuardDetail.vue
+++ b/src/views/statisticalQueryManagement/securityGuardDetail.vue
@@ -220,7 +220,7 @@
label: "是否持证",
prop: "hold",
type: "select",
- search: true,
+ search: !this.paramCz,
searchSpan: 4,
dicData: [
{
--
Gitblit v1.9.3