Merge branch 'feature/finance' into 'release/3.0'

对账日期修改



See merge request !21

@@ -17,7 +17,7 @@
             </filter-item>
             </filter-item>
             <filter-item :label="filters.createTime.label">
             <filter-item :label="filters.createTime.label">
                 <Date-picker v-model="filters.createTime.model"
                 <Date-picker v-model="filters.createTime.model"
-                             type="datetimerange" format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期和时间">
+                             type="daterange" format="yyyy-MM-dd" placeholder="选择日期">
                 </Date-picker>
                 </Date-picker>
             </filter-item>
             </filter-item>
             <filter-item>
             <filter-item>

@@ -15,8 +15,7 @@
             <filter-item>
             <filter-item>
                 <Button @click="returnPage">返回结算单列表</Button>
                 <Button @click="returnPage">返回结算单列表</Button>
                 <Button type="primary" @click="search">筛选</Button>
                 <Button type="primary" @click="search">筛选</Button>
-                <Button @click="reset">清空条件</Button>
-                                
+                <Button @click="reset">清空条件</Button>        
             </filter-item>
             </filter-item>
         </layout-filter>
         </layout-filter>
         <layout-list>
         <layout-list>

@@ -10,7 +10,7 @@
             </filter-item>
             </filter-item>
             <filter-item :label="filters.createTime.label">
             <filter-item :label="filters.createTime.label">
                 <Date-picker v-model="filters.createTime.model"
                 <Date-picker v-model="filters.createTime.model"
-                             type="datetimerange" format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期和时间">
+                             type="daterange" format="yyyy-MM-dd" placeholder="选择日期">
                 </Date-picker>
                 </Date-picker>
             </filter-item>
             </filter-item>
             <filter-item>
             <filter-item>

+let date = new Date();
+let agoMonthFirstDay = new Date(date.getFullYear(),date.getMonth()-1,1);
+let agoMonthLastDay = new Date(date.getFullYear(),date.getMonth()-1,30);
+
 export default {
 export default {
     filters: {
     filters: {
         balanceId: {
         balanceId: {
@@ -11,13 +15,13 @@ export default {
             label: '品牌',
             label: '品牌',
             labelSpan: 6,
             labelSpan: 6,
             model: '',
             model: '',
-            holder: '1111',
+            holder: '',
             fieldSpan: 18
             fieldSpan: 18
         },
         },
         createTime: {
         createTime: {
             label: '创建时间',
             label: '创建时间',
             labelSpan: 6,
             labelSpan: 6,
-            model: '',
+            model: [agoMonthFirstDay, agoMonthLastDay],
             holder: '',
             holder: '',
             fieldSpan: 18
             fieldSpan: 18
         }
         }