|
@@ -111,14 +111,14 @@ export async function exportProcessReportDocs(processId,bookList) {
|
|
|
let textbookList
|
|
|
if(processId){ // 流程读取教材列表
|
|
|
let query = new Parse.Query("EduTextbook")
|
|
|
- query.include("childrens")
|
|
|
+ query.include("childrens","department")
|
|
|
query.equalTo("recommend",true);
|
|
|
query.equalTo("eduProcess",processId);
|
|
|
textbookList = await query.find();
|
|
|
}
|
|
|
if(bookList?.length){ // 直接导出教材列表
|
|
|
let query = new Parse.Query("EduTextbook")
|
|
|
- query.include("childrens")
|
|
|
+ query.include("childrens","department")
|
|
|
query.containedIn("objectId",bookList);
|
|
|
textbookList = await query.find();
|
|
|
}
|
|
@@ -380,7 +380,7 @@ function renderReportDocsByTextbook(textbook){
|
|
|
titlePad:padString(json?.title,21),
|
|
|
ISBNPad:padString(json?.ISBN,21),
|
|
|
ISBN:json?.ISBN,
|
|
|
- inviteUnit:json?.inviteUnit||"",
|
|
|
+ inviteUnit:json?.inviteUnit||json?.department?.name||"",
|
|
|
one:squareCheck[(json?.type=="单本"||json?.type=="单册")?1:0], // 单本/单册 方框
|
|
|
full:squareCheck[json?.type=="全册"?1:0], // 全册
|
|
|
oneCircle:circleCheck[(json?.type=="单本"||json?.type=="单册")?1:0], // 单本/单册 圆圈
|