|
@@ -62,13 +62,22 @@
|
|
|
/>
|
|
|
</el-form-item> -->
|
|
|
<el-form-item label="收款日期" prop="collectionMoneyDate">
|
|
|
- <el-date-picker
|
|
|
+ <!-- <el-date-picker
|
|
|
clearable
|
|
|
v-model="queryParams.collectionMoneyDate"
|
|
|
type="date"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
placeholder="请选择收款日期"
|
|
|
>
|
|
|
+ </el-date-picker> -->
|
|
|
+ <el-date-picker
|
|
|
+ v-model="timeRange"
|
|
|
+ type="daterange"
|
|
|
+ range-separator="至"
|
|
|
+ start-placeholder="开始日期"
|
|
|
+ end-placeholder="结束日期"
|
|
|
+ @change="timeRangeChange"
|
|
|
+ >
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
<!-- <el-form-item label="结算单位" prop="settlementUnitId">
|
|
@@ -503,6 +512,7 @@ import {
|
|
|
deleteSettlementUnit,
|
|
|
reviewApprovedPass, //收款登记审核
|
|
|
} from "@/api/system/SaleRegistrationCollection";
|
|
|
+import moment from "moment";
|
|
|
|
|
|
export default {
|
|
|
name: "SaleRegistrationCollection",
|
|
@@ -512,6 +522,7 @@ export default {
|
|
|
],
|
|
|
data() {
|
|
|
return {
|
|
|
+ timeRange: [],
|
|
|
currentRow: {},
|
|
|
approveForm: {
|
|
|
status: "4",
|
|
@@ -551,6 +562,8 @@ export default {
|
|
|
collectionMoneyDate: null,
|
|
|
settlementUnitId: null,
|
|
|
bookkeepingFlag: null,
|
|
|
+ startTime: null,
|
|
|
+ endTime: null,
|
|
|
},
|
|
|
// 表单参数
|
|
|
form: {},
|
|
@@ -572,6 +585,12 @@ export default {
|
|
|
this.initSelectData();
|
|
|
},
|
|
|
methods: {
|
|
|
+ // 日期范围改变回调
|
|
|
+ timeRangeChange(val) {
|
|
|
+ this.queryParams.startTime = moment(val[0]).format("YYYY-MM-DD");
|
|
|
+ this.queryParams.endTime = moment(val[1]).format("YYYY-MM-DD");
|
|
|
+ this.handleQuery();
|
|
|
+ },
|
|
|
// 根据字典value获取字典label
|
|
|
getDictLabel(value, dict) {
|
|
|
return (
|