|
@@ -150,6 +150,8 @@
|
|
|
start-placeholder="开始日期"
|
|
|
end-placeholder="结束日期"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
+ :picker-options="pickerOptions"
|
|
|
+ unlink-panels
|
|
|
>
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
@@ -299,6 +301,33 @@ export default {
|
|
|
components: {draggable},
|
|
|
data() {
|
|
|
return {
|
|
|
+ pickerOptions: {
|
|
|
+ shortcuts: [{
|
|
|
+ text: '最近一周',
|
|
|
+ onClick(picker) {
|
|
|
+ const end = new Date();
|
|
|
+ const start = new Date();
|
|
|
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
|
|
|
+ picker.$emit('pick', [start, end]);
|
|
|
+ }
|
|
|
+ }, {
|
|
|
+ text: '最近一个月',
|
|
|
+ onClick(picker) {
|
|
|
+ const end = new Date();
|
|
|
+ const start = new Date();
|
|
|
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
|
|
|
+ picker.$emit('pick', [start, end]);
|
|
|
+ }
|
|
|
+ }, {
|
|
|
+ text: '最近三个月',
|
|
|
+ onClick(picker) {
|
|
|
+ const end = new Date();
|
|
|
+ const start = new Date();
|
|
|
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
|
|
|
+ picker.$emit('pick', [start, end]);
|
|
|
+ }
|
|
|
+ }]
|
|
|
+ },
|
|
|
tableHeight: '0',
|
|
|
//费用名称
|
|
|
fWbuOptions:[],
|
|
@@ -423,19 +452,19 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
created() {
|
|
|
- let date = new Date();
|
|
|
- let year = parseInt(date.getFullYear())
|
|
|
- let month = parseInt(date.getMonth() + 1)
|
|
|
- let currentMonth = date.getMonth()
|
|
|
- let nextMonth = ++currentMonth
|
|
|
- let nextMonthFirstDay = new Date(date.getFullYear(), nextMonth, 1) // 下个月的第一天
|
|
|
- let oneDay = 1000*60*60*24
|
|
|
- let lastTime = new Date(nextMonthFirstDay - oneDay) // 下个月的第一天减去一天,就是上个月的最后一天
|
|
|
- let day = lastTime.getDate()
|
|
|
- if (day < 10) {
|
|
|
- day = '0' + day
|
|
|
- }
|
|
|
- this.queryParams.timeExamine = [year + '-' + month + '-' + '01 00:00:00', year + '-' + month + '-' + day + ' 23:59:59']
|
|
|
+ // let date = new Date();
|
|
|
+ // let year = parseInt(date.getFullYear())
|
|
|
+ // let month = parseInt(date.getMonth() + 1)
|
|
|
+ // let currentMonth = date.getMonth()
|
|
|
+ // let nextMonth = ++currentMonth
|
|
|
+ // let nextMonthFirstDay = new Date(date.getFullYear(), nextMonth, 1) // 下个月的第一天
|
|
|
+ // let oneDay = 1000*60*60*24
|
|
|
+ // let lastTime = new Date(nextMonthFirstDay - oneDay) // 下个月的第一天减去一天,就是上个月的最后一天
|
|
|
+ // let day = lastTime.getDate()
|
|
|
+ // if (day < 10) {
|
|
|
+ // day = '0' + day
|
|
|
+ // }
|
|
|
+ // this.queryParams.timeExamine = [year + '-' + month + '-' + '01 00:00:00', year + '-' + month + '-' + day + ' 23:59:59']
|
|
|
|
|
|
this.setRowList = this.tableDate;
|
|
|
this.getRowList = this.tableDate;
|
|
@@ -689,10 +718,27 @@ export default {
|
|
|
createTime: null,
|
|
|
updateBy: null,
|
|
|
updateTime: null,
|
|
|
- remark: null
|
|
|
+ remark: null,
|
|
|
}
|
|
|
this.resetForm('form')
|
|
|
},
|
|
|
+ // 搜索重置
|
|
|
+ resetQueryParams() {
|
|
|
+ this.queryParams = {
|
|
|
+ pageNum: 1,
|
|
|
+ pageSize: 50,
|
|
|
+ fCorpid: null,
|
|
|
+ fMblno: null,
|
|
|
+ timeExamine: null,
|
|
|
+ fToCorpid: null,
|
|
|
+ fProductName: null,
|
|
|
+ fMarks: null,
|
|
|
+ fReconciliation: null,
|
|
|
+ fBillstatus: null,
|
|
|
+ fBusinessType:null,
|
|
|
+ fFeeid:null
|
|
|
+ }
|
|
|
+ },
|
|
|
/** 搜索按钮操作 */
|
|
|
handleQuery() {
|
|
|
this.queryParams.pageNum = 1
|
|
@@ -700,7 +746,8 @@ export default {
|
|
|
},
|
|
|
/** 重置按钮操作 */
|
|
|
resetQuery() {
|
|
|
- this.resetForm('queryForm')
|
|
|
+ // this.resetForm('queryForm')
|
|
|
+ this.resetQueryParams()
|
|
|
this.handleQuery()
|
|
|
},
|
|
|
/** 新增按钮操作 */
|