Browse Source

修改财务的部分

xiaozhen 6 years ago
parent
commit
fee3bfb2a1
40 changed files with 86 additions and 82 deletions
  1. 2 2
      dist/200.html
  2. 1 1
      dist/_nuxt/7104073e36ce21305a1d.js
  3. 0 1
      dist/_nuxt/93a2d1a943999745808a.js
  4. 1 0
      dist/_nuxt/eacb488d18bd87c88f61.js
  5. 2 2
      dist/index.html
  6. 2 2
      dist/login/index.html
  7. 2 2
      dist/main/404/index.html
  8. 2 2
      dist/main/artificial_order/index.html
  9. 2 2
      dist/main/artificial_orders/index.html
  10. 2 2
      dist/main/balance_change/index.html
  11. 2 2
      dist/main/cats copy/index.html
  12. 2 2
      dist/main/cats/index.html
  13. 2 2
      dist/main/cert_check/index.html
  14. 2 2
      dist/main/cert_edit/index.html
  15. 2 2
      dist/main/cert_pro/index.html
  16. 2 2
      dist/main/cloud_balance/index.html
  17. 2 2
      dist/main/cloud_developer/index.html
  18. 2 2
      dist/main/cloud_job/index.html
  19. 2 2
      dist/main/cloud_order copy/index.html
  20. 2 2
      dist/main/dev_check/index.html
  21. 2 2
      dist/main/dev_check_detail/index.html
  22. 2 2
      dist/main/dev_show/index.html
  23. 2 2
      dist/main/gongmall/index.html
  24. 2 2
      dist/main/group_list/index.html
  25. 2 2
      dist/main/index.html
  26. 2 2
      dist/main/orders/index.html
  27. 2 2
      dist/main/orders_detail/index.html
  28. 2 2
      dist/main/orders_frozen/index.html
  29. 2 2
      dist/main/outsource_bill/index.html
  30. 2 2
      dist/main/publish_present/index.html
  31. 2 2
      dist/main/user_bills/index.html
  32. 2 2
      dist/main/vip_manager/index.html
  33. 2 2
      dist/main/vip_order/index.html
  34. 2 2
      dist/main/vip_setting/index.html
  35. 2 2
      dist/main/wage_details/index.html
  36. 2 2
      dist/main/wage_settlement/index.html
  37. 2 2
      dist/main/wait_expend/index.html
  38. 2 2
      dist/main/withdraw/index.html
  39. 2 2
      dist/main/work_bill/index.html
  40. 12 8
      pages/main/index/orders.vue

File diff suppressed because it is too large
+ 2 - 2
dist/200.html


File diff suppressed because it is too large
+ 1 - 1
dist/_nuxt/7104073e36ce21305a1d.js


File diff suppressed because it is too large
+ 0 - 1
dist/_nuxt/93a2d1a943999745808a.js


File diff suppressed because it is too large
+ 1 - 0
dist/_nuxt/eacb488d18bd87c88f61.js


File diff suppressed because it is too large
+ 2 - 2
dist/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/login/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/404/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/artificial_order/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/artificial_orders/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/balance_change/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/cats copy/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/cats/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/cert_check/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/cert_edit/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/cert_pro/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/cloud_balance/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/cloud_developer/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/cloud_job/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/cloud_order copy/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/dev_check/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/dev_check_detail/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/dev_show/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/gongmall/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/group_list/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/orders/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/orders_detail/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/orders_frozen/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/outsource_bill/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/publish_present/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/user_bills/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/vip_manager/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/vip_order/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/vip_setting/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/wage_details/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/wage_settlement/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/wait_expend/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/withdraw/index.html


File diff suppressed because it is too large
+ 2 - 2
dist/main/work_bill/index.html


+ 12 - 8
pages/main/index/orders.vue

@@ -24,7 +24,7 @@
         </div>
         <div class="type-boxes">
           <div class="inlineb">
-            <span class>时间范围:</span>
+            <span class="vsub" >时间范围:</span>
             <el-date-picker style="width: 260px;"
               v-model="timeRange"
               type="daterange"
@@ -37,7 +37,7 @@
             ></el-date-picker>
           </div>
           <div class="inlineb">
-            <span class>时间类型:</span>
+            <span class="vsub" >时间类型:</span>
             <el-select v-model="timeType" placeholder="请选择" style="width: 120px;">
               <el-option
                 v-for="item in timeOptions"
@@ -48,7 +48,7 @@
             </el-select>
           </div>
           <div class="inlineb">
-            <span class>状态:</span>
+            <span class="vsub" >状态:</span>
             <div class="inlineb">
               <el-select v-model="orderState" clearable placeholder style="width: 140px;">
                 <el-option
@@ -61,7 +61,7 @@
             </div>
           </div>
           <div class="inlineb">
-            <span>交易类型:</span>
+            <span class="vsub">交易类型:</span>
             <el-select v-model="orderTypes" placeholder="交易类型" style="width: 100px;">
               <el-option
                 v-for="item of orderTypesOption"
@@ -75,26 +75,26 @@
         </div>
         <div class="type-boxes">
           <div class="inlineb">
-            <span class>编号:</span>
+            <span class="vsub" >编号:</span>
             <div class="inlineb">
               <el-input style="width: 230px;" v-model="searchId" placeholder="订单编号/订单名称/支付编号"></el-input>
             </div>
           </div>
           <div class="inlineb">
-            <span class>用户:</span>
+            <span class="vsub" >用户:</span>
             <div class="inlineb">
               <el-input style="width: 180px;" v-model="checkUser" placeholder="uid/昵称/姓名"></el-input>
             </div>
           </div>
           <div class="inlineb">
-            <span class>项目:</span>
+            <span class="vsub" >项目:</span>
             <div class="inlineb">
               <el-input style="width: 100px;" type="number" v-model="productId" placeholder="项目ID"></el-input>
             </div>
           </div>
 
           <el-button type="primary" @click="getFinanceList">筛选</el-button>
-          <el-button @click="downFinanceList">导出报表</el-button>
+          <el-button @click="downFinanceList" class="export-excel" type="primary">导出报表</el-button>
         </div>
         <div class="type-boxes">
             <el-tabs v-model="activeName"  type="border-card" @tab-click="changeTab">
@@ -901,6 +901,7 @@ export default {
 }
 .vsub {
   vertical-align: sub;
+  font-size: 14px;
 }
 .type-boxes {
   margin-bottom: 10px;
@@ -959,4 +960,7 @@ export default {
     font-size: 12px;
     color: #5a5e66;
   }
+  .export-excel{
+    float: right;
+  }
 </style>