From 19e0b728e8cd41f9ddcd62eea6c15ebf769d9977 Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Wed, 16 Feb 2022 18:04:10 +0800
Subject: [PATCH] +解决和冲突合并，加上适应1366*768分辨率
---
src/views/statisticalQueryManagement/securityGuardDetail.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/statisticalQueryManagement/securityGuardDetail.vue b/src/views/statisticalQueryManagement/securityGuardDetail.vue
index 490f22a..e488957 100644
--- a/src/views/statisticalQueryManagement/securityGuardDetail.vue
+++ b/src/views/statisticalQueryManagement/securityGuardDetail.vue
@@ -121,7 +121,7 @@
display: false
},
{
- label: "保安公司",
+ label: "企业名称",
prop: "deptName",
width: 300,
// search: true,
@@ -220,7 +220,7 @@
label: "是否持证",
prop: "hold",
type: "select",
- search: true,
+ search: !this.paramCz,
searchSpan: 4,
dicData: [
{
--
Gitblit v1.9.3