|
@@ -10,7 +10,7 @@ import { MatButtonModule } from '@angular/material/button';
|
|
|
import { NzRadioModule } from 'ng-zorro-antd/radio';
|
|
|
import { DatePipe } from '@angular/common';
|
|
|
import { NzEmptyModule } from 'ng-zorro-antd/empty';
|
|
|
-import * as major from '../../services/majors.map';
|
|
|
+import * as major from '../../services/majors4.map';
|
|
|
import { NzPopoverModule } from 'ng-zorro-antd/popover';
|
|
|
interface filter {
|
|
|
lang: any;
|
|
@@ -193,7 +193,7 @@ export class TextbookComponent implements OnInit {
|
|
|
//筛选条件
|
|
|
filters: filter | any = {
|
|
|
lang: { type: 'EduTextbookVolume', value: [] },
|
|
|
- majorPoniter: { type: 'EduTextbookVolume', value: [] },
|
|
|
+ majorPoniter: { type: 'EduTextbook', value: [] },
|
|
|
editionUnit: { type: 'EduTextbookVolume', value: [] },
|
|
|
approval: { type: 'EduTextbook', value: [] },
|
|
|
carrierShape: { type: 'EduTextbookVolume', value: [] },
|
|
@@ -253,7 +253,7 @@ export class TextbookComponent implements OnInit {
|
|
|
if (this.filterObj.showMore) {
|
|
|
this.listOfColumns.majorPoniter.listOfFilter = major.majors.options.map(
|
|
|
(item) => {
|
|
|
- return { text: item.name, value: item.name };
|
|
|
+ return { text: item.name, value: item };
|
|
|
}
|
|
|
);
|
|
|
this.listOfColumns.editionUnit.listOfFilter =
|
|
@@ -318,7 +318,7 @@ export class TextbookComponent implements OnInit {
|
|
|
$in: element.value,
|
|
|
};
|
|
|
}
|
|
|
- } else if (element.value?.length > 0 && element.type == 'EduTextbook') {
|
|
|
+ }else if (element.value?.length > 0 && element.type == 'EduTextbook') {
|
|
|
queryParams2['where'][key] = { $in: element.value };
|
|
|
}
|
|
|
}
|