Inicio Explorar Ayuda
Registro Iniciar sesión
tl
/
web
5
0
Fork 0
Archivos Incidencias 0 Pull Requests 0 Wiki
Explorar el Código

fix: change textbookSubscription

DESKTOP-USV654P\pc hace 2 meses
padre
d924c3e667
commit
d434e5f70c
Se han modificado 18 ficheros con 53 adiciones y 22 borrados
Dividir vista Mostrar estadísticas de diff
  1. 0 0
      dist/assets/app-antd-dark-theme-style.e3b0c442.css
  2. BIN
      dist/assets/app-antd-dark-theme-style.e3b0c442.css.gz
  3. 0 0
      dist/assets/app-theme-style.e3b0c442.css
  4. BIN
      dist/assets/app-theme-style.e3b0c442.css.gz
  5. 0 1
      dist/assets/editModal-78876856.css
  6. 0 0
      dist/assets/index-284303f6.css
  7. BIN
      dist/assets/index-284303f6.css.gz
  8. 0 0
      dist/assets/index-6bc81b67.css
  9. BIN
      dist/assets/index-6bc81b67.css.gz
  10. 0 1
      dist/assets/review-2820c31c.css
  11. 0 1
      dist/assets/selectModal-a4f48500.css
  12. 1 1
      dist/index.html
  13. BIN
      dist/index.html.gz
  14. 4 1
      src/services/apis/AssessmentPlanAnswerController.ts
  15. 0 3
      src/services/apis/TextbookController.ts
  16. 3 0
      src/services/apis/TextbookSubscriptionController.ts
  17. 43 12
      src/services/typing.d.ts
  18. 2 2
      src/views/ledger/teacher/listen.vue

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/app-antd-dark-theme-style.e3b0c442.css


BIN
dist/assets/app-antd-dark-theme-style.e3b0c442.css.gz
Ver fichero


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/app-theme-style.e3b0c442.css


BIN
dist/assets/app-theme-style.e3b0c442.css.gz
Ver fichero


+ 0 - 1
dist/assets/editModal-78876856.css
Ver fichero 

@@ -1 +0,0 @@
 
-.selectListGroup[data-v-92e90fe2]{display:flex;cursor:pointer;flex-direction:row;flex-wrap:wrap;padding:4px 6px}.selectListGroup-list[data-v-92e90fe2]{white-space:nowrap;margin:4px;padding:0 8px;border-radius:4px;background-color:#f2f2f6}.itemBox[data-v-92e90fe2]{display:flex;flex-direction:row;justify-content:space-between;align-items:center;max-height:300px;background:white;min-height:34px;overflow-y:auto;border:1px solid #ccc}

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-284303f6.css


BIN
dist/assets/index-284303f6.css.gz
Ver fichero


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/assets/index-6bc81b67.css


BIN
dist/assets/index-6bc81b67.css.gz
Ver fichero


+ 0 - 1
dist/assets/review-2820c31c.css
Ver fichero 

@@ -1 +0,0 @@
 
-.box[data-v-ab959698]{display:flex}.box div[data-v-ab959698]{padding:12px;display:flex;flex-direction:column}.box div span[data-v-ab959698]{margin-top:12px}.box div span[data-v-ab959698]:last-child{font-size:16px;font-weight:700}

+ 0 - 1
dist/assets/selectModal-a4f48500.css
Ver fichero 

@@ -1 +0,0 @@
 
-.leftbox div[data-v-3ec5b52a]{padding:8px;margin:4px}.rightbox[data-v-3ec5b52a]{display:flex;flex-direction:column;flex-wrap:wrap}.selectList[data-v-3ec5b52a]{display:flex;flex-direction:row}.selectList div[data-v-3ec5b52a]{padding:2px 6px}.selectList-Item[data-v-3ec5b52a]{display:flex;flex-direction:row;font-size:12px;justify-content:space-between;align-items:center;background-color:#f8f8f8;border-radius:4px;margin:4px;padding:4px}.title[data-v-3ec5b52a]{width:70px;overflow:hidden;color:#000;text-overflow:ellipsis;white-space:nowrap;cursor:pointer}.itembox[data-v-3ec5b52a]{display:flex;flex-direction:column;background:white;min-height:50vh;overflow-y:auto;border:1px solid #ccc}

+ 1 - 1
dist/index.html
Ver fichero 

@@ -1,4 +1,4 @@
 
-<!doctype html><html lang="en" id="htmlRoot"><head><script src="/_app.config.js?v=1.0.1-1733908547822"></script><meta charset="UTF-8"/><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/><meta name="renderer" content="webkit"/><meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=0"/><title>铜梁职业教育中心</title><link rel="icon" href="/favicon.ico"/><script type="module" crossorigin src="/assets/index-99c6e45a.js"></script><link rel="stylesheet" href="/assets/index-982ebce2.css"><link disabled="disabled" id="__VITE_VUE_PLUGIN_THEME-ANTD_DARK_THEME_LINK__" rel="alternate stylesheet" href="/assets/app-antd-dark-theme-style.e3b0c442.css"></head><body><script src="/iconfont.js"></script><script src="/desktopIconfont.js"></script><script src="/print/designer.js?v=202112311138"></script><script src="/print/printer.js?v=202112311138"></script><script>(() => {
 
+<!doctype html><html lang="en" id="htmlRoot"><head><script src="/_app.config.js?v=1.0.1-1734600059308"></script><meta charset="UTF-8"/><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/><meta name="renderer" content="webkit"/><meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=0"/><title>铜梁职业教育中心</title><link rel="icon" href="/favicon.ico"/><script type="module" crossorigin src="/assets/index-c5d60bb4.js"></script><link rel="stylesheet" href="/assets/index-982ebce2.css"><link disabled="disabled" id="__VITE_VUE_PLUGIN_THEME-ANTD_DARK_THEME_LINK__" rel="alternate stylesheet" href="/assets/app-antd-dark-theme-style.e3b0c442.css"></head><body><script src="/iconfont.js"></script><script src="/desktopIconfont.js"></script><script src="/print/designer.js?v=202112311138"></script><script src="/print/printer.js?v=202112311138"></script><script>(() => {
 
         var htmlRoot = document.getElementById('htmlRoot');
 
         var theme = window.localStorage.getItem('__APP__DARK__MODE__');
 
         if (htmlRoot && theme) {

BIN
dist/index.html.gz
Ver fichero


+ 4 - 1
src/services/apis/AssessmentPlanAnswerController.ts
Ver fichero 

@@ -16,8 +16,11 @@ export async function getAssessmentTemplateAnswerAllClassPage(params:any,mode: E
 
         ({url: '/assessment/assessmentTemplateAnswer/all-class-page', params:params},{errorMessageMode:mode});}
 
 /** 考核计划答题列表-学生答题情况导出 POST /assessment/assessmentTemplateAnswer/answer-export-query */
 
 export async function postAssessmentTemplateAnswerAnswerExportQuery(params:API.PageInput
 
-,mode: ErrorMessageMode = 'modal'){ return defHttp.download<API.AssessmentPlanAnswerStudentVo[]>
 
+,mode: ErrorMessageMode = 'modal'){ return defHttp.download<string>
 
         ({url: '/assessment/assessmentTemplateAnswer/answer-export-query',responseType:'blob',method:'POST', data:params},{errorMessageMode:mode});}
 
+/** 考核计划答题列表-学生答题情况 GET /assessment/assessmentTemplateAnswer/answer-student-list */
 
+export async function getAssessmentTemplateAnswerAnswerStudentList(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.get<API.AssessmentPlanAnswerStudentVo[]>
 
+        ({url: '/assessment/assessmentTemplateAnswer/answer-student-list', params:params},{errorMessageMode:mode});}
 
 /** 考核计划答题列表-学生答题情况(分页) GET /assessment/assessmentTemplateAnswer/answer-student-page */
 
 export async function getAssessmentTemplateAnswerAnswerStudentPage(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.get<API.PageOutput<API.AssessmentPlanAnswerStudentVo>>
 
         ({url: '/assessment/assessmentTemplateAnswer/answer-student-page', params:params},{errorMessageMode:mode});}

+ 0 - 3
src/services/apis/TextbookController.ts
Ver fichero 

@@ -49,9 +49,6 @@ export async function getTextbookPage(params:any,mode: ErrorMessageMode = 'modal
 
 /** 学生确认领取教材列表(分页，学生收费用) GET /textbook/textbook/page-consumption */
 
 export async function getTextbookPageConsumption(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.get<API.PageOutput<API.TextbookConsumptionPageVo>>
 
         ({url: '/textbook/textbook/page-consumption', params:params},{errorMessageMode:mode});}
 
-/** 教材管理列表(分页，教材征订用) GET /textbook/textbook/page-subscription */
 
-export async function getTextbookPageSubscription(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.get<API.PageOutput<API.TextbookSubscriptionListVo>>
 
-        ({url: '/textbook/textbook/page-subscription', params:params},{errorMessageMode:mode});}
 
 /** 教材发放记录条件导出 POST /textbook/textbook/textbook-claim-export-query */
 
 export async function postTextbookTextbookClaimExportQuery(params:API.TextbookClaimExportQueryDto
 
 ,mode: ErrorMessageMode = 'modal'){ return defHttp.download<string>

+ 3 - 0
src/services/apis/TextbookSubscriptionController.ts
Ver fichero 

@@ -54,6 +54,9 @@ export async function postTextbookSubscriptionInstockroomExcelImport(params:any,
 
 /** 教材教辅征订入库用页面 GET /textbook/textbookSubscription/instockroom-list */
 
 export async function getTextbookSubscriptionInstockroomList(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.get<API.TextbookInstockroomListVo[]>
 
         ({url: '/textbook/textbookSubscription/instockroom-list', params:params},{errorMessageMode:mode});}
 
+/** 确认教材页面使用教材征订明细(不分页) GET /textbook/textbookSubscription/item-list-confirm-distribute */
 
+export async function getTextbookSubscriptionItemListConfirmDistribute(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.get<API.SubscriptionItemListDistributeVo[]>
 
+        ({url: '/textbook/textbookSubscription/item-list-confirm-distribute', params:params},{errorMessageMode:mode});}
 
 /** 教材教辅征订明细列表(分页) GET /textbook/textbookSubscription/item-page */
 
 export async function getTextbookSubscriptionItemPage(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.get<API.PageOutput<API.TextbookSubscriptionItemPageVo>>
 
         ({url: '/textbook/textbookSubscription/item-page', params:params},{errorMessageMode:mode});}

+ 43 - 12
src/services/typing.d.ts
Ver fichero 

@@ -14096,14 +14096,6 @@ total?: number;
 
 totalPage?: number;
 
 }
 
 
-type PageOutput<TextbookSubscriptionListVo> = {
 
-currentPage?: number;
 
-list?: TextbookSubscriptionListVo[];
 
-pageSize?: number;
 
-total?: number;
 
-totalPage?: number;
 
-}
 
-
 
 type PageOutput<TextbookSubscriptionPageVo> = {
 
 currentPage?: number;
 
 list?: TextbookSubscriptionPageVo[];
 
@@ -17065,6 +17057,19 @@ sortCode?: number;
 
 subjectGroupCourseList?: SubjectGroupCoursePageVo[];
 
 }
 
 
+type SubscriptionItemListDistributeVo = {
 
+/** 实际价格(元) */
 
+actulPrice?: number;
 
+/** 实际折扣 */
 
+discount?: number;
 
+/** 主键编号 */
 
+id?: string;
 
+/** 当前征订任务征订项入库数量 */
 
+inStockNum?: number;
 
+/** 当前征订任务征订项出库数量 */
 
+outStockNum?: number;
 
+}
 
+
 
 type SubscriptionStatisticsDetailVo = {
 
 /** 通过次数 */
 
 adoptCount?: number;
 
@@ -17569,6 +17574,8 @@ type TextbookClaimItem = {
 
 confirmNumber?: number;
 
 /** 教材申领项主键编号 */
 
 textbookClaimItemId?: string;
 
+/** 教材征订项主键编号 */
 
+textbookSubscriptionItemId?: string;
 
 }
 
 
 type TextbookClaimStudentConfirmVo = {
 
@@ -17671,8 +17678,12 @@ sortCode?: number;
 
 }
 
 
 type TextbookInstockroomDto = {
 
+/** 实际折扣 */
 
+discount?: number;
 
 /** 本次入库数量 */
 
 inNum?: number;
 
+/** 实际价格(元) */
 
+price?: number;
 
 /** 教材教辅征订编号 */
 
 textbookSubscriptionId?: string;
 
 /** 教材教辅征订项编号 */
 
@@ -17718,6 +17729,8 @@ textbookType?: string;
 
 textbookTypeCn?: string;
 
 /** 使用类型(单位：学期) */
 
 useType?: number;
 
+/** 版本 */
 
+version?: string;
 
 }
 
 
 type TextbookInstockroomOnceListVo = {
 
@@ -17765,6 +17778,8 @@ textbookType?: string;
 
 textbookTypeCn?: string;
 
 /** 使用类型(单位：学期) */
 
 useType?: number;
 
+/** 版本 */
 
+version?: string;
 
 }
 
 
 type TextbookIssueRecordExportDto = {
 
@@ -18015,8 +18030,14 @@ teacherSubscriptionNumber?: number;
 
 }
 
 
 type TextbookSubscriptionItemPageVo = {
 
+/** 实际价格(元) */
 
+actulPrice?: number;
 
 /** 变更类型（0：未变更，1：变更征订数量，2：变更课程） */
 
 alterationType?: number;
 
+/** 学期id(base_semester) */
 
+baseSemesterId?: string;
 
+/** 学期id(base_semester) */
 
+baseSemesterIdCn?: string;
 
 /** 书名 */
 
 bookName?: string;
 
 /** 课程编号(base_course_subject) */
 
@@ -18035,7 +18056,7 @@ inStockNum?: number;
 
 issn?: string;
 
 /** 当前征订任务征订项出库数量 */
 
 outStockNum?: number;
 
-/** 实际价格(元) */
 
+/** 定价 */
 
 price?: number;
 
 /** 出版社 */
 
 publishingHouse?: string;
 
@@ -18074,8 +18095,10 @@ inStockNum?: number;
 
 issn?: string;
 
 /** 当前征订任务征订项出库数量 */
 
 outStockNum?: number;
 
-/** 实际价格(元) */
 
+/** 定价(元) */
 
 price?: number;
 
+/** 实际价格(元) */
 
+pricing?: number;
 
 /** 出版社 */
 
 publishingHouse?: string;
 
 /** 序号 */
 
@@ -18088,10 +18111,14 @@ teacherNum?: number;
 
 textbookId?: string;
 
 /** 教材教辅增订记录表主键(textbook_subscription) */
 
 textbookSubscriptionId?: string;
 
-/** 教材分类(xjr_dictionary_item[textbook_type]) */
 
+/** 教材类型(xjr_dictionary_item[textbook_type]) */
 
 textbookType?: string;
 
-/** 教材分类(xjr_dictionary_item[textbook_type]) */
 
+/** 教材类型(xjr_dictionary_item[textbook_type]) */
 
 textbookTypeCn?: string;
 
+/** 使用类型(单位：学期) */
 
+useType?: number;
 
+/** 版本 */
 
+version?: string;
 
 }
 
 
 type TextbookSubscriptionListVo = {
 
@@ -18103,12 +18130,16 @@ classIds?: string;
 
 courseName?: string;
 
 /** 课程编号(base_course_subject) */
 
 courseSubjectId?: string;
 
+/** 预估折扣 */
 
+discount?: number;
 
 /** 主编 */
 
 editorInChief?: string;
 
 /** 班级课程主键编号 */
 
 id?: string;
 
 /** 国际标准刊号 */
 
 issn?: string;
 
+/** 定价(元) */
 
+price?: number;
 
 /** 出版社 */
 
 publishingHouse?: string;
 
 /** 学生用书征订数量 */

+ 2 - 2
src/views/ledger/teacher/listen.vue
Ver fichero 

@@ -15,7 +15,7 @@
 
   import { formatToDateTime } from '/@/utils/dateUtil';
 
 
   import {
 
-    getLedgerStatisticsTeacherListenExportQuery,
 
+    postLedgerStatisticsTeacherOvertimeExportQuery,
 
     getLedgerStatisticsTeacherListenPage,
 
   } from '/@/services/apis/LedgerStatisticsController';
 
 
@@ -92,7 +92,7 @@
 
 
   const handelExport = async () => {
 
     const postData = getForm().getFieldsValue();
 
-    const data = await getLedgerStatisticsTeacherListenExportQuery(postData);
 
+    const data = await postLedgerStatisticsTeacherOvertimeExportQuery(postData);
 
     downloadByData(data.data, `教师听课统计${formatToDateTime(new Date(), 'YYYYMMDDHHmmss')}.xlsx`);
 
   };
 
 </script>

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio