|
|
@@ -365,7 +365,6 @@ export default {
|
|
|
},
|
|
|
methods: {
|
|
|
handleChange(data) {
|
|
|
- // console.log(data);
|
|
|
this.formData.selection = data;
|
|
|
},
|
|
|
change() {
|
|
|
@@ -388,7 +387,10 @@ export default {
|
|
|
const searchArray = [];
|
|
|
this.withDatePicker &&
|
|
|
searchArray.push([this.formData.beginDate, this.formData.endDate]);
|
|
|
- this.withSelect && searchArray.push(this.formData.selection);
|
|
|
+ this.withSelect &&
|
|
|
+ searchArray.push(
|
|
|
+ this.formData.selection == "全部" ? "" : this.formData.selection
|
|
|
+ );
|
|
|
this.withInput && searchArray.push(this.formData.searchText);
|
|
|
this.$emit("search", searchArray);
|
|
|
},
|
