From 478947a847fb71c054ddb4cf1e2cf3ee83aeee77 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Mon, 30 Aug 2021 11:51:22 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_regulatory

---
 src/views/statisticalQueryManagement/companyDetails.vue |   35 ++++++++++++++++++++++-------------
 1 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/views/statisticalQueryManagement/companyDetails.vue b/src/views/statisticalQueryManagement/companyDetails.vue
index 36724c4..fb8c354 100644
--- a/src/views/statisticalQueryManagement/companyDetails.vue
+++ b/src/views/statisticalQueryManagement/companyDetails.vue
@@ -81,43 +81,52 @@
         // dateBtn: true,
         align: "center",
         height: "auto",
-        calcHeight: 90,
+        calcHeight: 30,
         tip: false,
         searchShowBtn: false,
         searchShow: true,
-        searchMenuSpan: 6,
+        searchMenuSpan: 3,
         index: true,
         viewBtn: true,
         dialogClickModal: false,
         column: [
           {
             label: "保安姓名",
-            searchLabelWidth: 110,
+            // searchLabelWidth: 90,
             prop: "real_name",
             search: true,
-            searchSpan: 4,
+            searchSpan: 3,
+            display: false
+          },
+          {
+            label: "所属保安公司",
+            prop: "enterpriseName",
+            width: 300,
             display: false
           },
 
           {
             label: "保安证编号",
             prop: "securitynumber",
+            width: 180,
             display: false
           },
           {
             label: "身份证号",
             prop: "cardid",
+            width: 180,
             display: false
           },
           {
             label: "联系方式",
             prop: "phone",
+            width: 180,
             display: false
           },
           {
             label: "是否持证",
             prop: "hold",
-            searchSpan: 4,
+            searchSpan: 3,
             type: "select",
             props: {
               label: "label",
@@ -151,7 +160,7 @@
           {
             label: "是否缴纳社保",
             //  labelWidth: 120,
-            searchLabelWidth: 110,
+            searchLabelWidth: 100,
             prop: "soil",
             searchSpan: 4,
             type: "select",
@@ -210,7 +219,7 @@
           },
           {
             label: "资格审查情况",
-            searchLabelWidth: 110,
+            searchLabelWidth: 100,
             prop: "examination_type",
             searchSpan: 4,
             type: "select",
@@ -269,7 +278,7 @@
           {
             label: "是否派遣",
             prop: "dispatch",
-            searchSpan: 4,
+            searchSpan: 3,
             type: "select",
             props: {
               label: "label",
@@ -298,7 +307,7 @@
       },
       companyName: "",
       loading: true,
-      deptid:''
+      deptid: ""
     };
   },
   computed: {
@@ -369,7 +378,7 @@
         this.loading = false;
       });
     },
-   
+
     getLocationParams() {
       let url = window.location.href;
       let urlArr = url.split("?")[1].split("&");
@@ -390,7 +399,7 @@
 };
 </script>
 <style lang="scss" scoped>
-/deep/ .avue-crud__menu {
-  height: 130px !important;
-}
+// /deep/ .avue-crud__menu {
+//   height: 130px !important;
+// }
 </style>

--
Gitblit v1.9.3