缴费查询界面修改

src/dashoo.cn/frontend_web/src/pages/oilsupplier/paymentselect/index.vue

@@ -5,18 +5,14 @@
       <el-breadcrumb-item>缴费信息列表</el-breadcrumb-item>
     </el-breadcrumb>
     <el-card class="box-card" style="height: calc(100vh - 115px);">
-      <div slot="header">
-
-
-        <!--查询模块-->
-
+      <div slot="header" class="clearfix">
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
           <el-form-item label="年度">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
           <el-form-item label="公司名称">
-            <el-input v-model="searchForm.SupplierName" placeholder="请输入" style="width: 100%"></el-input>
+            <el-input v-model="searchForm.SupplierName" placeholder="请输入" size="mini" style="width: 100%"></el-input>
           </el-form-item>
           <el-form-item label="准入类型">
             <el-select size="mini" style="width:100px" v-model="searchForm.SupplierTypeCode" placeholder="准入类别">
@@ -37,93 +33,87 @@
           </el-form-item>
         </el-form>
 
+        <el-tabs v-model="activeName" @tab-click="handleClick">
+          <el-tab-pane label="缴费明细表" name="first">
+            <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
 
-      </div>
-
-      <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-        <el-tab-pane label="缴费明细表" name="first">
-          <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
-
-            <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="AccessCardNo" label="准入证号"></el-table-column>
-            <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="SupplierName" label="企业名称"></el-table-column>
-            <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="SupplierTypeName" label="准入类别"></el-table-column>
-
-            <el-table-column min-width="210" align="center" show-overflow-tooltip label="款项类别">
-              <template slot-scope="scope">
-                {{ transferStr(scope.row.PayType) }}
-              </template>
-              <el-table-column sortable min-width="70" align="center" show-overflow-tooltip prop="Access" label="新准入">
-                <template slot-scope="scope">
-                  {{ scope.row.Access <= 0 ? "" : scope.row.Access}}
-                </template>
-              </el-table-column>
+              <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="AccessCardNo" label="准入证号"></el-table-column>
+              <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="SupplierName" label="企业名称"></el-table-column>
+              <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="SupplierTypeName" label="准入类别"></el-table-column>
 
-              <el-table-column sortable min-width="70" align="center" show-overflow-tooltip prop="Annual" label="年审">
+              <el-table-column min-width="210" align="center" show-overflow-tooltip label="款项类别">
                 <template slot-scope="scope">
-                  {{ scope.row.Annual <= 0 ? "" : scope.row.Annual}}
+                  {{ transferStr(scope.row.PayType) }}
                 </template>
+                <el-table-column sortable min-width="70" align="center" show-overflow-tooltip prop="Access" label="新准入">
+                  <template slot-scope="scope">
+                    {{ scope.row.Access <= 0 ? "" : scope.row.Access}}
+                  </template>
+                </el-table-column>
+
+                <el-table-column sortable min-width="70" align="center" show-overflow-tooltip prop="Annual" label="年审">
+                  <template slot-scope="scope">
+                    {{ scope.row.Annual <= 0 ? "" : scope.row.Annual}}
+                  </template>
+                </el-table-column>
+
+                <el-table-column sortable min-width="70" align="center" show-overflow-tooltip prop="Addition" label="增项">
+                  <template slot-scope="scope">
+                    {{ scope.row.Addition <= 0 ? "" : scope.row.Addition}}
+                  </template>
+                </el-table-column>
               </el-table-column>
 
-              <el-table-column sortable min-width="70" align="center" show-overflow-tooltip prop="Addition" label="增项">
+              <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="Sums" label="金额合计"></el-table-column>
+              <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="PayDate" label="缴费日期">
                 <template slot-scope="scope">
-                  {{ scope.row.Addition <= 0 ? "" : scope.row.Addition}}
+                  {{ jstimehandle(scope.row.PayDate+'') }}
                 </template>
               </el-table-column>
-            </el-table-column>
-
-            <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="Sums" label="金额合计"></el-table-column>
-            <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="PayDate" label="缴费日期">
-              <template slot-scope="scope">
-                {{ jstimehandle(scope.row.PayDate+'') }}
-              </template>
-            </el-table-column>
-            <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="Remarks" label="备注"></el-table-column>
-          </el-table>
+              <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="Remarks" label="备注"></el-table-column>
+            </el-table>
 
-          <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                         :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
-                         :total="currentItemCount">
-          </el-pagination>
-        </el-tab-pane>
+            <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+                           :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
+                           :total="currentItemCount">
+            </el-pagination>
+          </el-tab-pane>
 
 
-        <el-tab-pane label="缴费汇总表" name="second">
-          <el-table :data="entitySumList" border show-summary height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
+          <el-tab-pane label="缴费汇总表" name="second">
+            <el-table :data="entitySumList" border show-summary height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
 
-            <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="SupplierTypeName" label="准入类别"></el-table-column>
+              <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="SupplierTypeName" label="准入类别"></el-table-column>
 
-            <el-table-column min-width="210" align="center" show-overflow-tooltip label="款项类别">
-              <template slot-scope="scope">
-                {{ transferStr(scope.row.PayType) }}
-              </template>
-              <el-table-column sortable min-width="70" align="center" show-overflow-tooltip prop="Access" label="新准入">
+              <el-table-column min-width="210" align="center" show-overflow-tooltip label="款项类别">
                 <template slot-scope="scope">
-                  {{ scope.row.Access <= 0 ? "" : scope.row.Access}}
+                  {{ transferStr(scope.row.PayType) }}
                 </template>
+                <el-table-column sortable min-width="70" align="center" show-overflow-tooltip prop="Access" label="新准入">
+                  <template slot-scope="scope">
+                    {{ scope.row.Access <= 0 ? "" : scope.row.Access}}
+                  </template>
+                </el-table-column>
+
+                <el-table-column sortable min-width="70" align="center" show-overflow-tooltip prop="Annual" label="年审">
+                  <template slot-scope="scope">
+                    {{ scope.row.Annual <= 0 ? "" : scope.row.Annual}}
+                  </template>
+                </el-table-column>
+
+                <el-table-column sortable min-width="70" align="center" show-overflow-tooltip prop="Addition" label="增项">
+                  <template slot-scope="scope">
+                    {{ scope.row.Addition <= 0 ? "" : scope.row.Addition}}
+                  </template>
+                </el-table-column>
               </el-table-column>
 
-              <el-table-column sortable min-width="70" align="center" show-overflow-tooltip prop="Annual" label="年审">
-                <template slot-scope="scope">
-                  {{ scope.row.Annual <= 0 ? "" : scope.row.Annual}}
-                </template>
-              </el-table-column>
-
-              <el-table-column sortable min-width="70" align="center" show-overflow-tooltip prop="Addition" label="增项">
-                <template slot-scope="scope">
-                  {{ scope.row.Addition <= 0 ? "" : scope.row.Addition}}
-                </template>
-              </el-table-column>
-            </el-table-column>
-
-            <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="Sums" label="金额合计"></el-table-column>
-          </el-table>
-        </el-tab-pane>
-
-      </el-tabs>
-
-
-
+              <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="Sums" label="金额合计"></el-table-column>
+            </el-table>
+          </el-tab-pane>
 
+        </el-tabs>
+      </div>
       </el-card>
 
   </div>
@@ -307,5 +297,12 @@
 </script>
 
 <style lang="scss">
-
+  .clearfix:before,
+  .clearfix:after {
+    display: table;
+    content: "";
+  }
+  .clearfix:after {
+    clear: both
+  }
 </style>