From 0855c8cef2f2f414cf9a84285421fdcdd5bc6310 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 19 Nov 2021 08:50:29 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_regulatory
---
src/views/statisticalQueryManagement/securityGuardStatistics.vue | 51 ++++++++++++++++++++++++++-------------------------
1 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/src/views/statisticalQueryManagement/securityGuardStatistics.vue b/src/views/statisticalQueryManagement/securityGuardStatistics.vue
index ba1be6e..b6c3499 100644
--- a/src/views/statisticalQueryManagement/securityGuardStatistics.vue
+++ b/src/views/statisticalQueryManagement/securityGuardStatistics.vue
@@ -106,7 +106,7 @@
tableOption: {
align: "center",
viewBtn: true,
- // excelBtn: true,
+ excelBtn: true,
delBtn: false,
editBtn: false,
addBtn: false,
@@ -121,31 +121,9 @@
searchShow: true,
searchMenuSpan: 6,
index: true,
+ indexLabel:'序号',
dialogClickModal: false,
column: [
- {
- label: "单位注册时间",
- prop: "releaseTimeRange",
- type: "date",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- searchRange: true,
- searchSpan: 6,
- searchLabelWidth: 120,
- labelWidth:160,
- hide: true,
- addDisplay: false,
- editDisplay: false,
- viewDisplay: false,
- search: true,
- rules: [
- {
- required: true,
- message: "请选择单位注册时间",
- trigger: "blur",
- },
- ],
- },
{
label: "公司名称",
prop: "deptname",
@@ -208,6 +186,29 @@
trigger: "blur"
}
]
+ },
+ {
+ label: "单位注册时间",
+ prop: "releaseTimeRange",
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ searchRange: true,
+ searchSpan: 6,
+ searchLabelWidth: 120,
+ labelWidth:160,
+ hide: true,
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ search: true,
+ rules: [
+ {
+ required: true,
+ message: "请选择单位注册时间",
+ trigger: "blur",
+ },
+ ],
},
{
label: "保安员总数",
@@ -368,7 +369,7 @@
handleRowClick(row, column, cell, event) {
if (column.label == "保安员总数") {
this.dialogTitle = "保安员明细";
- this.fwdeptId = row.dept_id;
+ this.fwdeptId = row.departmentid;
this.dialogShow = true;
} else {
this.dialogShow = false;
--
Gitblit v1.9.3