Merge branch 'feature/Feature-finance' into develop

src/views/finance/components/balance_sum-detail.vue

@@ -4,6 +4,57 @@
       <el-page-header @back="goBack" content="明细"> </el-page-header>
     </div>
     <el-divider></el-divider>
+    <el-form label-width="100px" size="small" label-position="left">
+      <el-row :gutter="20">
+        <el-col :xs="24" :sm="12" :lg="12">
+          <el-radio-group v-model="category" size="">
+            <el-radio-button label="家用空调"></el-radio-button>
+            <el-radio-button label="商用空调"></el-radio-button>
+            <el-radio-button label="生活电器"></el-radio-button>
+          </el-radio-group>
+        </el-col>
+        <el-col :xs="24" :sm="12" :lg="12">
+          <el-form-item label="" class="fr">
+            <el-select class="selectStyle" placeholder="请选择">
+              <el-option> </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+
+    <h1></h1>
+    <div>
+      <el-row type="flex" class="row-bg" justify="space-around">
+        <el-col :xs="24" :sm="12" :lg="4"
+          ><div class="moneyStyle color1">
+            <span>普通钱包</span>
+            <strong>￥12.367万</strong>
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="12" :lg="4"
+          ><div class="moneyStyle color2">
+            <span>特殊钱包</span> <strong>￥12.367万</strong>
+          </div></el-col
+        >
+        <el-col :xs="24" :sm="12" :lg="4">
+          <div class="moneyStyle color3">
+            <span>折扣钱包</span> <strong>￥12.367万</strong>
+          </div></el-col
+        >
+        <el-col :xs="24" :sm="12" :lg="4">
+          <div class="moneyStyle color4">
+            <span>返利钱包</span> <strong>￥12.367万</strong>
+          </div></el-col
+        >
+      </el-row>
+    </div>
+    <el-divider></el-divider>
+    <el-radio-group v-model="bill" size="">
+      <el-radio-button label="贷款台账"></el-radio-button>
+      <el-radio-button label="返利台账"></el-radio-button>
+    </el-radio-group>
+    <h1></h1>
     <!-- 筛选条件 -->
     <div>
       <el-form
@@ -26,7 +77,7 @@
               <el-input placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :xs="24" :sm="12" :lg="12">
+          <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="日期时间" prop="">
               <el-date-picker
                 type="datetimerange"
@@ -38,7 +89,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :xs="24" :sm="24" :lg="24">
+          <el-col :xs="24" :sm="24" :lg="6">
             <el-form-item label="" class="fr">
               <el-button size="small">清空</el-button>
               <el-button size="small" type="primary">搜索</el-button>
@@ -47,42 +98,6 @@
         </el-row>
       </el-form>
     </div>
-    <el-radio-group v-model="category" size="">
-      <el-radio-button label="家用空调"></el-radio-button>
-      <el-radio-button label="商用空调"></el-radio-button>
-      <el-radio-button label="生活电器"></el-radio-button>
-    </el-radio-group>
-    <h1></h1>
-    <div>
-      <el-row type="flex" class="row-bg" justify="space-around">
-        <el-col :xs="24" :sm="12" :lg="4"
-          ><div class="moneyStyle color1">
-            <span>普通钱包</span>
-            <strong>￥12.367万</strong>
-          </div>
-        </el-col>
-        <el-col :xs="24" :sm="12" :lg="4"
-          ><div class="moneyStyle color2">
-            <span>特殊钱包</span> <strong>￥12.367万</strong>
-          </div></el-col
-        >
-        <el-col :xs="24" :sm="12" :lg="4">
-          <div class="moneyStyle color3">
-            <span>折扣钱包</span> <strong>￥12.367万</strong>
-          </div></el-col
-        >
-        <el-col :xs="24" :sm="12" :lg="4">
-          <div class="moneyStyle color4">
-            <span>返利钱包</span> <strong>￥12.367万</strong>
-          </div></el-col
-        >
-      </el-row>
-    </div>
-    <el-divider></el-divider>
-    <el-radio-group v-model="bill" size="">
-      <el-radio-button label="贷款台账"></el-radio-button>
-      <el-radio-button label="返利台账"></el-radio-button>
-    </el-radio-group>
     <div v-show="bill == '贷款台账'">
       <!-- 列表 -->
       <div class="mymain-container">

src/views/finance/wallet.vue

@@ -1,6 +1,43 @@
 <template>
   <div class="app-container">
     <div v-if="showRebate">
+      <el-radio-group v-model="category" size="">
+        <el-radio-button label="家用空调"></el-radio-button>
+        <el-radio-button label="商用空调"></el-radio-button>
+        <el-radio-button label="生活电器"></el-radio-button>
+      </el-radio-group>
+      <h1></h1>
+      <div>
+        <el-row type="flex" class="row-bg" justify="space-around">
+          <el-col :xs="24" :sm="12" :lg="4"
+            ><div class="moneyStyle color1">
+              <span>普通钱包</span>
+              <strong>￥12.367万</strong>
+            </div>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="4"
+            ><div class="moneyStyle color2">
+              <span>特殊钱包</span> <strong>￥12.367万</strong>
+            </div></el-col
+          >
+          <el-col :xs="24" :sm="12" :lg="4">
+            <div class="moneyStyle color3">
+              <span>折扣钱包</span> <strong>￥12.367万</strong>
+            </div></el-col
+          >
+          <el-col :xs="24" :sm="12" :lg="4">
+            <div @click="rebateFn" class="moneyStyle color4">
+              <span>返利钱包</span> <strong>￥12.367万</strong>
+            </div></el-col
+          >
+        </el-row>
+      </div>
+      <el-divider></el-divider>
+      <el-radio-group v-model="bill" size="">
+        <el-radio-button label="贷款台账"></el-radio-button>
+        <el-radio-button label="返利台账"></el-radio-button>
+      </el-radio-group>
+      <h2></h2>
       <!-- 筛选条件 -->
       <div>
         <el-form
@@ -23,7 +60,7 @@
                 <el-input placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="12">
+            <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="日期时间" prop="">
                 <el-date-picker
                   type="datetimerange"
@@ -34,7 +71,7 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="24" :lg="24">
+            <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="" class="fr">
                 <el-button size="small">清空</el-button>
                 <el-button size="small" type="primary">搜索</el-button>
@@ -44,42 +81,6 @@
         </el-form>
       </div>
 
-      <el-radio-group v-model="category" size="">
-        <el-radio-button label="家用空调"></el-radio-button>
-        <el-radio-button label="商用空调"></el-radio-button>
-        <el-radio-button label="生活电器"></el-radio-button>
-      </el-radio-group>
-      <h1></h1>
-      <div>
-        <el-row type="flex" class="row-bg" justify="space-around">
-          <el-col :xs="24" :sm="12" :lg="4"
-            ><div class="moneyStyle color1">
-              <span>普通钱包</span>
-              <strong>￥12.367万</strong>
-            </div>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="4"
-            ><div class="moneyStyle color2">
-              <span>特殊钱包</span> <strong>￥12.367万</strong>
-            </div></el-col
-          >
-          <el-col :xs="24" :sm="12" :lg="4">
-            <div class="moneyStyle color3">
-              <span>折扣钱包</span> <strong>￥12.367万</strong>
-            </div></el-col
-          >
-          <el-col :xs="24" :sm="12" :lg="4">
-            <div @click="rebateFn" class="moneyStyle color4">
-              <span>返利钱包</span> <strong>￥12.367万</strong>
-            </div></el-col
-          >
-        </el-row>
-      </div>
-      <el-divider></el-divider>
-      <el-radio-group v-model="bill" size="">
-        <el-radio-button label="贷款台账"></el-radio-button>
-        <el-radio-button label="返利台账"></el-radio-button>
-      </el-radio-group>
       <div v-show="bill == '贷款台账'">
         <!-- 列表 -->
         <div class="mymain-container">