fix: change teachingManager textbookPopManager

Makefile

@@ -12,7 +12,7 @@ build:
 
 commit:
 	git add . && \
-	git commit --no-verify -m "fix: change teachingManager textbookPushManager"
+	git commit --no-verify -m "fix: change teachingManager textbookPopManager"
 
 checkPre:
 	git checkout pre

src/services/apis/TextbookIssueRecordController.ts

@@ -22,13 +22,14 @@ export async function putTextbookTextbookIssueRecord(params:API.UpdateTextbookIs
 /** 删除教材出库记录 DELETE /textbook/textbookIssueRecord */
 export async function deleteTextbookTextbookIssueRecord(params:string[],mode: ErrorMessageMode = 'modal'){ return defHttp.delete<any>
         ({url: '/textbook/textbookIssueRecord', data:params},{errorMessageMode:mode});}
+/** 教材发放记录条件导出 POST /textbook/textbookIssueRecord/claim-record-export-query */
+export async function postTextbookIssueRecordClaimRecordExportQuery(params:API.TextbookClaimRecordExportDto
+,mode: ErrorMessageMode = 'modal'){ return defHttp.download<string>
+        ({url: '/textbook/textbookIssueRecord/claim-record-export-query',responseType:'blob',method:'POST', data:params},{errorMessageMode:mode});}
 /** 教材发放页面已发放申领的出库记录列表 GET /textbook/textbookIssueRecord/distribute-record-page */
 export async function getTextbookIssueRecordDistributeRecordPage(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.get<API.DistributeRecordPageVo[]>
         ({url: '/textbook/textbookIssueRecord/distribute-record-page', params:params},{errorMessageMode:mode});}
-/** 导出 GET /textbook/textbookIssueRecord/export */
-export async function getTextbookIssueRecordExport(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.download<any>
-        ({url: '/textbook/textbookIssueRecord/export',responseType:'blob', params:params},{errorMessageMode:mode});}
-/** 指定导出 POST /textbook/textbookIssueRecord/export-query */
+/** 教材出库记录条件导出 POST /textbook/textbookIssueRecord/export-query */
 export async function postTextbookIssueRecordExportQuery(params:API.TextbookIssueRecordExportDto
 ,mode: ErrorMessageMode = 'modal'){ return defHttp.download<string>
         ({url: '/textbook/textbookIssueRecord/export-query',responseType:'blob',method:'POST', data:params},{errorMessageMode:mode});}

src/services/apis/TextbookStudentClaimController.ts

@@ -23,7 +23,8 @@ export async function putTextbookTextbookStudentClaim(params:API.UpdateTextbookS
 export async function deleteTextbookTextbookStudentClaim(params:string[],mode: ErrorMessageMode = 'modal'){ return defHttp.delete<any>
         ({url: '/textbook/textbookStudentClaim', data:params},{errorMessageMode:mode});}
 /** 学生自己确认已经领取 PUT /textbook/textbookStudentClaim/confirm */
-export async function putTextbookStudentClaimConfirm(params:string[],mode: ErrorMessageMode = 'modal'){ return defHttp.put<any>
+export async function putTextbookStudentClaimConfirm(params:API.StudentConfirmDto
+,mode: ErrorMessageMode = 'modal'){ return defHttp.put<any>
         ({url: '/textbook/textbookStudentClaim/confirm', data:params},{errorMessageMode:mode});}
 /** 班主任查看班级教材页面 GET /textbook/textbookStudentClaim/head-tea-look-class-book */
 export async function getTextbookStudentClaimHeadTeaLookClassBook(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.get<API.HeadTeaLookClassBookVo>
@@ -34,19 +35,19 @@ export async function getTextbookStudentClaimHeadTeaLookClassBookSemester(params
 /** 根据id查询学生教材认领记录信息 GET /textbook/textbookStudentClaim/info */
 export async function getTextbookStudentClaimInfo(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.get<API.TextbookStudentClaimVo>
         ({url: '/textbook/textbookStudentClaim/info', params:params},{errorMessageMode:mode});}
-/** 学生教材认领记录列表(分页) GET /textbook/textbookStudentClaim/page */
+/** 学生确认教材领取记录列表(分页) GET /textbook/textbookStudentClaim/page */
 export async function getTextbookStudentClaimPage(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.get<API.PageOutput<API.TextbookStudentClaimPageVo>>
         ({url: '/textbook/textbookStudentClaim/page', params:params},{errorMessageMode:mode});}
-/** 学生教材领取确定页面 GET /textbook/textbookStudentClaim/student-confirm-list */
+/** 学生确定教材领取页面 GET /textbook/textbookStudentClaim/student-confirm-list */
 export async function getTextbookStudentClaimStudentConfirmList(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.get<API.TextbookClaimStudentConfirmVo>
         ({url: '/textbook/textbookStudentClaim/student-confirm-list', params:params},{errorMessageMode:mode});}
-/** 学生教材领取学期页面 GET /textbook/textbookStudentClaim/student-semester-list */
+/** 学生确定教材领取学期页面 GET /textbook/textbookStudentClaim/student-semester-list */
 export async function getTextbookStudentClaimStudentSemesterList(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.get<API.TextbookStudentSemesterVo[]>
         ({url: '/textbook/textbookStudentClaim/student-semester-list', params:params},{errorMessageMode:mode});}
-/** 教师教材领取按班级查看页面 GET /textbook/textbookStudentClaim/teacher-check-byClass-list */
+/** 班主任确认教材领取按班级查看页面 GET /textbook/textbookStudentClaim/teacher-check-byClass-list */
 export async function getTextbookStudentClaimTeacherCheckByClassList(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.get<API.PageOutput<API.TeacherCheckByclassVo>>
         ({url: '/textbook/textbookStudentClaim/teacher-check-byClass-list', params:params},{errorMessageMode:mode});}
-/** 教师教材领取按学生查看页面 GET /textbook/textbookStudentClaim/teacher-check-byStu-list */
+/** 班主任确认教材领取按学生查看页面 GET /textbook/textbookStudentClaim/teacher-check-byStu-list */
 export async function getTextbookStudentClaimTeacherCheckByStuList(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.get<API.PageOutput<API.TeacherCheckByStuVo>>
         ({url: '/textbook/textbookStudentClaim/teacher-check-byStu-list', params:params},{errorMessageMode:mode});}
 /** 教师查看一本教材的学生领取情况页面 GET /textbook/textbookStudentClaim/teacher-check-stu-claim-list */
@@ -56,6 +57,13 @@ export async function getTextbookStudentClaimTeacherCheckStuClaimList(params:any
 export async function putTextbookStudentClaimTeacherConfirm(params:API.TeacherConfirmDto[]
 ,mode: ErrorMessageMode = 'modal'){ return defHttp.put<any>
         ({url: '/textbook/textbookStudentClaim/teacher-confirm', data:params},{errorMessageMode:mode});}
+/** 教师根据教材帮助学生批量确认已经领取 PUT /textbook/textbookStudentClaim/teacher-confirm-batch-by-textbook */
+export async function putTextbookStudentClaimTeacherConfirmBatchByTextbook(params:API.TeacherConfirmBatchByTextbookDto
+,mode: ErrorMessageMode = 'modal'){ return defHttp.put<any>
+        ({url: '/textbook/textbookStudentClaim/teacher-confirm-batch-by-textbook', data:params},{errorMessageMode:mode});}
+/** 教师根据教材帮助学生批量确认已经领取教材列表 GET /textbook/textbookStudentClaim/teacher-confirm-batch-textbook-list */
+export async function getTextbookStudentClaimTeacherConfirmBatchTextbookList(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.get<API.TeacherConfirmBatchTextbookListVo[]>
+        ({url: '/textbook/textbookStudentClaim/teacher-confirm-batch-textbook-list', params:params},{errorMessageMode:mode});}
 /** 班主任获取班上某个学生没有认领的教材记录 GET /textbook/textbookStudentClaim/teacher-get-stu-noClaim-list */
 export async function getTextbookStudentClaimTeacherGetStuNoClaimList(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.get<API.TextbookClaimVO[]>
         ({url: '/textbook/textbookStudentClaim/teacher-get-stu-noClaim-list', params:params},{errorMessageMode:mode});}

src/services/apis/TextbookSubscriptionController.ts

@@ -55,7 +55,7 @@ export async function getTextbookSubscriptionInfo(params:any,mode: ErrorMessageM
 export async function postTextbookSubscriptionInstockroom(params:API.TextbookInstockroomDto[]
 ,mode: ErrorMessageMode = 'modal'){ return defHttp.post<any>
         ({url: '/textbook/textbookSubscription/instockroom', data:params},{errorMessageMode:mode});}
-/** 导入入库 POST /textbook/textbookSubscription/instockroom-excel-import */
+/** 征订页面教材入库导入入库 POST /textbook/textbookSubscription/instockroom-excel-import */
 export async function postTextbookSubscriptionInstockroomExcelImport(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.post<any>
         ({url: '/textbook/textbookSubscription/instockroom-excel-import',headers:{'Content-Type':'multipart/form-data'}, data:params},{errorMessageMode:mode});}
 /** 教材教辅征订入库用页面 GET /textbook/textbookSubscription/instockroom-list */
@@ -76,8 +76,8 @@ export async function getTextbookSubscriptionList(params:any,mode: ErrorMessageM
 /** 教材教辅征订记录列表(分页) GET /textbook/textbookSubscription/page */
 export async function getTextbookSubscriptionPage(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.get<API.PageOutput<API.TextbookSubscriptionPageVo>>
         ({url: '/textbook/textbookSubscription/page', params:params},{errorMessageMode:mode});}
-/** 教材征订条件导出 POST /textbook/textbookSubscription/textbook-subscription-export-query */
-export async function postTextbookSubscriptionTextbookSubscriptionExportQuery(params:API.TextbookSubscriptionExportQueryListDto
+/** 教材征订教材入库模板条件导出 POST /textbook/textbookSubscription/subscription-instockroom-export-query */
+export async function postTextbookSubscriptionSubscriptionInstockroomExportQuery(params:API.TextbookSubscriptionExportQueryListDto
 ,mode: ErrorMessageMode = 'modal'){ return defHttp.download<string>
-        ({url: '/textbook/textbookSubscription/textbook-subscription-export-query',responseType:'blob',method:'POST', data:params},{errorMessageMode:mode});}
+        ({url: '/textbook/textbookSubscription/subscription-instockroom-export-query',responseType:'blob',method:'POST', data:params},{errorMessageMode:mode});}
             

src/services/apis/TextbookWarehouseRecordController.ts

@@ -21,10 +21,9 @@ export async function deleteTextbookTextbookWarehouseRecord(params:string[],mode
 /** 导出 GET /textbook/textbookWarehouseRecord/export */
 export async function getTextbookWarehouseRecordExport(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.download<any>
         ({url: '/textbook/textbookWarehouseRecord/export',responseType:'blob', params:params},{errorMessageMode:mode});}
-/** 指定导出 POST /textbook/textbookWarehouseRecord/export-query */
-export async function postTextbookWarehouseRecordExportQuery(params:API.TextbookWarehouseRecordExportDto
-,mode: ErrorMessageMode = 'modal'){ return defHttp.download<string>
-        ({url: '/textbook/textbookWarehouseRecord/export-query',responseType:'blob',method:'POST', data:params},{errorMessageMode:mode});}
+/** 教材入库记录条件导出 GET /textbook/textbookWarehouseRecord/export-query */
+export async function getTextbookWarehouseRecordExportQuery(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.download<string>
+        ({url: '/textbook/textbookWarehouseRecord/export-query',responseType:'blob',method:'POST', params:params},{errorMessageMode:mode});}
 /** 根据id查询教材入库信息 GET /textbook/textbookWarehouseRecord/info */
 export async function getTextbookWarehouseRecordInfo(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.get<API.TextbookWarehouseRecordVo>
         ({url: '/textbook/textbookWarehouseRecord/info', params:params},{errorMessageMode:mode});}

src/services/typing.d.ts

@@ -10951,8 +10951,18 @@ bookName?: string;
 claimNum?: number;
 /** 申领时间 */
 claimTime?: string;
+/** 申领类型 */
+claimType?: string;
+/** 申领类型 */
+claimTypeCn?: string;
+/** 是否已经领取 */
+isClaim?: number;
 /** 价格 */
 price?: number;
+/** 书名 */
+textbookId?: string;
+/** 书名 */
+textbookStudentClaimId?: string;
 /** 教材分类(xjr_dictionary_item[textbook_type]) */
 textbookType?: string;
 /** 教材分类(xjr_dictionary_item[textbook_type]) */
@@ -17191,6 +17201,24 @@ operateMode?: number;
 userId?: string;
 }
 
+type StudentConfirmDetailDto = {
+/** 教材主键编号 */
+textbookId?: string;
+/** 学生教材领取主键 */
+textbookStudentClaimId?: string;
+}
+
+type StudentConfirmDto = {
+/** 学期主键编号 */
+baseSemesterId?: string;
+/** 是否领取（1:已领取 0:未领取） */
+isClaim?: number;
+/** 备注 */
+remark?: string;
+/** 教材主键编号 */
+studentConfirmDetail?: StudentConfirmDetailDto[];
+}
+
 type StudentConsumeDatePageVo = {
 /** 班级id */
 classId?: string;
@@ -18060,6 +18088,8 @@ userName?: string;
 }
 
 type TeacherCheckByStuVo = {
+/** 班级主键编号 */
+classId?: string;
 /** 学号 */
 studentId?: string;
 /** 学生用户编号 */
@@ -18083,6 +18113,8 @@ baseSemesterIdCN?: string;
 bookName?: string;
 /** 班级id */
 classId?: string;
+/** 班级id */
+classIdCn?: string;
 /** 班级人数 */
 classStudentNum?: number;
 /** 教材主键编号 */
@@ -18106,7 +18138,33 @@ textbookId?: string;
 textbookStudentClaimId?: string;
 }
 
+type TeacherConfirmBatchByTextbookDto = {
+/** 学期主键编号 */
+baseSemesterId?: string;
+/** 班级主键编号 */
+classId?: string;
+/** 是否领取（1:已领取 0:未领取） */
+isClaim?: number;
+/** 教材主键编号 */
+textbookIds?: string[];
+/** 学生主键编号 */
+userIds?: string[];
+}
+
+type TeacherConfirmBatchTextbookListVo = {
+/** 教材名称 */
+bookName?: string;
+/** 教材主键编号 */
+textbookId?: string;
+}
+
 type TeacherConfirmDto = {
+/** 学期主键编号 */
+baseSemesterId?: string;
+/** 班级主键编号 */
+classId?: string;
+/** 是否领取（1:已领取 0:未领取） */
+isClaim?: number;
 /** 备注 */
 remark?: string;
 /** 学生id */
@@ -18317,17 +18375,28 @@ textbookIdCn?: string;
 textbookWarehouseRecords?: TextbookWarehouseRecords[];
 }
 
+type TextbookClaimRecordExportDto = {
+/** 学期 */
+baseSemesterId?: string;
+/** 班级 */
+classId?: string;
+}
+
 type TextbookClaimStudentConfirmVo = {
 /** 学期 */
 baseSemesterCN?: string;
+/** 教材教辅详细列表 */
+categoryVos?: HeadTeaLookClassBookCategoryVo[];
 /** 班级 */
 classCN?: string;
+/** 班级 */
+classId?: string;
 /** 学号 */
 studentId?: string;
 /** 学生姓名 */
 studentName?: string;
-/** 学生教材认领记录集合 */
-textbookClaimVoList?: TextbookClaimVO[];
+/** 教材教辅合计总价 */
+totalPrice?: number;
 }
 
 type TextbookClaimVO = {
@@ -18599,10 +18668,18 @@ remark?: string;
 }
 
 type TextbookIssueRecordPageVo = {
+/** 实际出库数量 */
+actualIssueNumber?: number;
+/** 实际出库总金额 */
+actualTotalPrice?: number;
+/** 学期 */
+baseSemesterId?: string;
 /** 学期 */
 baseSemesterIdCn?: string;
 /** 书名 */
 bookName?: string;
+/** 领取类型 */
+claimTypeCn?: string;
 /** 领取人员 */
 claimUser?: string;
 /** 班级主键 */
@@ -18611,34 +18688,40 @@ classIdCn?: string;
 courseName?: string;
 /** 出库时间 */
 createDate?: string;
-/** 出库时间 */
-createDateStr?: string;
 /** 作者（主编） */
 editorInChief?: string;
 /** 年级主键 */
 gradeIdCn?: string;
 /** 学科组 */
 groupName?: string;
-/** 主键编号 */
+/** 主键 */
 id?: string;
+/** 是否为规划教材 */
+isTextbookPlan?: number;
 /** 书号 */
 issn?: string;
 /** 出库方式 */
 issueModeCn?: string;
 /** 出库数量 */
 issueNumber?: number;
+/** 出库用户编号 */
+issueUserIdCn?: string;
 /** 出库单号 */
 orderNumber?: string;
 /** 定价(元) */
 price?: number;
 /** 出版社 */
 publishingHouse?: string;
-/** 规格型号 */
-specificationsModels?: string;
+/** 领取后退书数量 */
+recedeNumber?: number;
+/** 领取用户编号 */
+receiveUserIdCn?: string;
 /** 实际价格（元） */
 subtotal?: number;
 /** 类型 */
 textbookTypeCn?: string;
+/** 使用类型(单位：学期) */
+useType?: number;
 /** 入库单号 */
 warehouseOrderNumber?: string;
 }
@@ -19197,11 +19280,6 @@ warehouseMode?: string;
 warehouseNumber?: number;
 }
 
-type TextbookWarehouseRecordExportDto = {
-/** 主键编号 */
-ids?: string[];
-}
-
 type TextbookWarehouseRecordListVo = {
 /** 来源 */
 source?: string;

src/views/teachingManager/textbookPopManager/index.vue

@@ -8,7 +8,6 @@
   import { useMessage } from '/@/hooks/web/useMessage';
   import { searchFormSchema } from './components/data.config';
   import {
-    getTextbookIssueRecordExport,
     getTextbookIssueRecordPage,
     postTextbookIssueRecordExportQuery,
   } from '/@/services/apis/TextbookIssueRecordController';
@@ -42,7 +41,7 @@
 
   const handleExport = async () => {
     const formData = getForm().getFieldsValue();
-    const data = await getTextbookIssueRecordExport(formData);
+    const data = await postTextbookIssueRecordExportQuery(formData);
     downloadByData(data.data, `教材出库导出${formatToDate(new Date())}.xlsx`);
     createMessage.success('导出成功');
   };