wesley 6 years ago
parent
commit
df20cd429e
2 changed files with 6 additions and 5 deletions
  1. 1 1
      app/Imports/CompanyInfoImport.php
  2. 5 4
      public/base/css/style.css

+ 1 - 1
app/Imports/CompanyInfoImport.php

xqd
@@ -16,7 +16,7 @@ class CompanyInfoImport implements ToCollection
     {
         foreach ($collection as $key => $row){
             if ($key == 0 ) continue;
-            if(strpos($row[0],'国税局')){
+            if(strpos($row[0],'国税局') || strpos($row[0],'税务')){
                 $isExisted = CompanyInfoModel::where('companyName',$row[3])->first();
 
                 if($isExisted){

+ 5 - 4
public/base/css/style.css

xqd xqd xqd xqd
@@ -10017,12 +10017,13 @@ body.mini-navbar .branding {
   background:#293846;
   color:#fff
 }
+.pagination li.active{color: #00a0e9}
 
 @media (min-width:1366px)
 {
   .edui-notadd .edui-for-insertimage .edui-dialog-content {
     width: 1200px !important;
-    height: 600px !important;
+    height: 500px !important;
   }
 }
 
@@ -10030,7 +10031,7 @@ body.mini-navbar .branding {
 {
   .edui-notadd .edui-for-insertimage .edui-dialog-content {
     width: 900px !important;
-    height: 600px !important;
+    height: 500px !important;
   }
 }
 
@@ -10038,7 +10039,7 @@ body.mini-navbar .branding {
 {
   .edui-notadd .edui-for-insertimage .edui-dialog-content {
     width: 700px !important;
-    height: 400px !important;
+    height: 300px !important;
   }
 }
 
@@ -10046,6 +10047,6 @@ body.mini-navbar .branding {
 {
   .edui-notadd .edui-for-insertimage .edui-dialog-content {
     width: 500px !important;
-    height: 400px !important;
+    height: 300px !important;
   }
 }