|
@@ -268,24 +268,21 @@
|
|
|
|
|
|
|
|
search() {
|
|
search() {
|
|
|
let valueAr = this.seekList.filter((item) => item.valueAr);
|
|
let valueAr = this.seekList.filter((item) => item.valueAr);
|
|
|
- console.log(valueAr);
|
|
|
|
|
|
|
+ let where = JSON.parse(JSON.stringify(this.defaultWhere));
|
|
|
|
|
|
|
|
valueAr.forEach((item) => {
|
|
valueAr.forEach((item) => {
|
|
|
- let data = this.defaultWhere[item.value];
|
|
|
|
|
|
|
+ let data = where[item.value];
|
|
|
if (data) {
|
|
if (data) {
|
|
|
- this.defaultWhere[item.valueAr[0]] = data[0];
|
|
|
|
|
- this.defaultWhere[item.valueAr[1]] = data[1];
|
|
|
|
|
|
|
+ where[item.valueAr[0]] = data[0];
|
|
|
|
|
+ where[item.valueAr[1]] = data[1];
|
|
|
|
|
+ } else {
|
|
|
|
|
+ where[item.valueAr[0]] = '';
|
|
|
|
|
+ where[item.valueAr[1]] = '';
|
|
|
}
|
|
}
|
|
|
- if (!data) {
|
|
|
|
|
- this.defaultWhere[item.valueAr[0]] = '';
|
|
|
|
|
- this.defaultWhere[item.valueAr[1]] = '';
|
|
|
|
|
- }
|
|
|
|
|
- delete this.defaultWhere[item.value];
|
|
|
|
|
|
|
+ delete where[item.value];
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
- console.log(this.defaultWhere);
|
|
|
|
|
-
|
|
|
|
|
- this.$emit('search', this.defaultWhere);
|
|
|
|
|
|
|
+ this.$emit('search', where);
|
|
|
},
|
|
},
|
|
|
// 重置
|
|
// 重置
|
|
|
reset() {
|
|
reset() {
|