Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web

@@ -287,15 +287,20 @@ table td {
   background-size: 100% 100%;
   background-size: 100% 100%;
   padding-top: 13px;
   padding-top: 13px;
   padding-bottom: 13px;
   padding-bottom: 13px;
-  table{
+  border: none;
+  margin-top: 5px !important;
+
+  table {
     background: url("~@/image/rqjx.png") no-repeat;
     background: url("~@/image/rqjx.png") no-repeat;
     background-size: 100% 100%;
     background-size: 100% 100%;
     padding: 8px;
     padding: 8px;
   }
   }
+
   table td {
   table td {
     box-sizing: border-box;
     box-sizing: border-box;
-    border-bottom: 0px solid #074487!important;
+    border-bottom: 0px solid #074487 !important;
   }
   }
+
   .el-input__inner {
   .el-input__inner {
     background-color: #031a46;
     background-color: #031a46;
   }
   }
@@ -311,9 +316,11 @@ table td {
   .el-date-table td.disabled div {
   .el-date-table td.disabled div {
     background-color: #074487;
     background-color: #074487;
   }
   }
-  .el-date-picker__header{
+
+  .el-date-picker__header {
     margin-bottom: 0px;
     margin-bottom: 0px;
   }
   }
+
   .el-date-picker__header-label {
   .el-date-picker__header-label {
     color: #A6CFD6;
     color: #A6CFD6;
   }
   }
@@ -321,12 +328,13 @@ table td {
   .el-picker-panel__content {
   .el-picker-panel__content {
     padding-top: 0px;
     padding-top: 0px;
     margin-top: 0px;
     margin-top: 0px;
+
     .disabled {
     .disabled {
       background-color: #074487;
       background-color: #074487;
-      div{
-        span{
-          color:rgba(172, 239, 250,.5)
 
 
+      div {
+        span {
+          color: rgba(172, 239, 250, .5)
         }
         }
       }
       }
 
 
@@ -438,7 +446,7 @@ table td {
 
 
   [class^="el-icon-"],
   [class^="el-icon-"],
   [class*=" el-icon-"] {
   [class*=" el-icon-"] {
-    display: none;
+    // display: none;
   }
   }
 
 
   .el-range-separator {
   .el-range-separator {
@@ -479,4 +487,4 @@ table td {
 .el-select-dropdown__item.hover,
 .el-select-dropdown__item.hover,
 .el-select-dropdown__item:hover {
 .el-select-dropdown__item:hover {
   background-color: transparent !important;
   background-color: transparent !important;
-}
+}
\ No newline at end of file

@@ -18,20 +18,22 @@
           </el-col>
           </el-col>
           <el-col :span="6">
           <el-col :span="6">
             <el-form-item label="汇交时间" prop="exchangeStartTime">
             <el-form-item label="汇交时间" prop="exchangeStartTime">
-              <el-date-picker type="date" class="width100" placeholder="开始日期" :picker-options="pickerOptionsStart"
-                clearable v-model="form.exchangeStartTime" value-format="yyyy-MM-dd"></el-date-picker>
+              <el-date-picker type="date" class="width100" placeholder="开始日期" clearable
+                :picker-options="pickerOptionsStart" v-model="form.exchangeStartTime"
+                value-format="yyyy-MM-dd"></el-date-picker>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="6">
           <el-col :span="6">
             <el-form-item label="至" prop="exchangeStartTime" label-width="35px">
             <el-form-item label="至" prop="exchangeStartTime" label-width="35px">
-              <el-date-picker type="date" class="width100" placeholder="结束日期" :picker-options="pickerOptionsEnd"
-                clearable v-model="form.exchangeEndTime" value-format="yyyy-MM-dd"></el-date-picker>
+              <el-date-picker type="date" class="width100" placeholder="结束日期" clearable
+                :picker-options="pickerOptionsEnd" v-model="form.exchangeEndTime"
+                value-format="yyyy-MM-dd"></el-date-picker>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="6">
           <el-col :span="6">
             <el-form-item label="汇交状态" prop="state">
             <el-form-item label="汇交状态" prop="state">
               <el-select v-model="form.state" class="width100" clearable placeholder="汇交状态">
               <el-select v-model="form.state" class="width100" clearable placeholder="汇交状态">
-                 <el-option v-for="item in dicData['sbhjzt']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
+                <el-option v-for="item in dicData['sbhjzt']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
                 </el-option>
               </el-select>
               </el-select>
             </el-form-item>
             </el-form-item>