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/businessStatistics.vue |   54 ++++++++++++++++++++++++++++--------------------------
 1 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/src/views/statisticalQueryManagement/businessStatistics.vue b/src/views/statisticalQueryManagement/businessStatistics.vue
index e9cdce3..ea02f46 100644
--- a/src/views/statisticalQueryManagement/businessStatistics.vue
+++ b/src/views/statisticalQueryManagement/businessStatistics.vue
@@ -110,11 +110,11 @@
         // }
       ],
       tableOption: {
-        // excelBtn: true,
+        excelBtn: true,
         delBtn: false,
         editBtn: false,
         addBtn: false,
-        selection: true,
+        selection: false,
         menu: false,
         // dateBtn: true,
         align: "center",
@@ -125,32 +125,11 @@
         searchShow: true,
         searchMenuSpan: 6,
         index: true,
+        indexLabel:'序号',
         viewBtn: true,
         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: "enterpriseName",
@@ -215,6 +194,29 @@
             label: "服务到期数量",
             prop: "dqnum",
             display: false,
+          },
+          {
+            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",
+              },
+            ],
           },
         ],
       },
@@ -361,7 +363,7 @@
         this.dialogShow = true;
       } else if (column.label == "持证人数") {
         this.dialogTitle = "业务统计明细---持证保安人员清单";
-        this.searchitem = "dq";
+        this.searchitem = "zong";
         this.paramCz = true;
         this.fwdeptId = row.departmentid;
         this.dialogShow = true;

--
Gitblit v1.9.3