Browse Source

fix:修改教材征订

zcuishan 8 months ago
parent
commit
fdf0544291

+ 4 - 3
src/services/apis/TextbookController.ts

@@ -62,9 +62,10 @@ export async function getTextbookPageConsumption(params:any,mode: ErrorMessageMo
 /** 教材管理列表(分页,教材征订用) 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});}
-/** 教材发放记录条件导出 GET /textbook/textbook/textbook-claim-export-query */
-export async function getTextbookTextbookClaimExportQuery(params:any,mode: ErrorMessageMode = 'modal'){ return defHttp.download<string>
-        ({url: '/textbook/textbook/textbook-claim-export-query',responseType:'blob',method:'POST', 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>
+        ({url: '/textbook/textbook/textbook-claim-export-query',responseType:'blob',method:'POST', data:params},{errorMessageMode:mode});}
 /** 台账条件导出 POST /textbook/textbook/textbook-standing-export-query */
 export async function postTextbookTextbookStandingExportQuery(params:API.TextbookStandingExportQuerytDto
 ,mode: ErrorMessageMode = 'modal'){ return defHttp.download<string>

+ 21 - 0
src/services/typing.d.ts

@@ -13748,6 +13748,27 @@ leaveCount?: string;
 playTruantCount?: number;
 }
 
+type TextbookClaimExportQueryDto = {
+/** 学期id */
+baseSemesterId?: string;
+/** 书名 */
+bookName?: string;
+/** 班级id */
+classId?: string;
+/** 课程id */
+courseSubjectId?: string;
+/** 规划教材 */
+isTextbookPlan?: string;
+/** 书号 */
+issn?: string;
+/** 学科id */
+subjectGroupId?: string;
+/** 教材id */
+textbookId?: string;
+/** 教材类型 */
+textbookType?: string;
+}
+
 type TextbookClaimItem = {
 /** 本次发放数量 */
 confirmNumber?: number;

+ 16 - 1
src/views/educational/textbookSubscription/components/changeTextBook.vue

@@ -3,7 +3,7 @@
   import { useTable } from '/@/components/Table';
   import BasicModal from '/@/components/Modal/src/BasicModal.vue';
   import { changeColumns, textbookColumns } from './data.config';
-  import { ref } from 'vue';
+  import { reactive, ref } from 'vue';
   import BasicTable from '/@/components/Table/src/BasicTable.vue';
   import { Modal } from 'ant-design-vue';
   import { getTextbookPage } from '/@/services/apis/TextbookController';
@@ -15,9 +15,15 @@
   const visible = ref(false);
   const changeType = ref(0);
   const changeId = ref<string>('');
+  const rawValue = reactive({
+    studentSubscriptionNumber: 0,
+    teacherSubscriptionNumber: 0,
+  });
   const [register, { closeModal, setModalProps }] = useModalInner((data) => {
     changeId.value = data.id;
     dataSource.value = [data];
+    rawValue.studentSubscriptionNumber = data.studentSubscriptionNumber;
+    rawValue.teacherSubscriptionNumber = data.teacherSubscriptionNumber;
   });
   const [selectTableRef, { getSelectRows, clearSelectedRowKeys }] = useTable({
     title: '可选课程信息',
@@ -77,7 +83,16 @@
     if (changeType.value === 0) {
       return createMessage.warning('您未进行任何变更,请选择变更课程或者变更征订数量后提交');
     }
+
     const value = dataSource.value[0];
+    if (changeType.value === 1) {
+      if (
+        rawValue.studentSubscriptionNumber === value.studentSubscriptionNumber &&
+        rawValue.teacherSubscriptionNumber === value.teacherSubscriptionNumber
+      ) {
+        return createMessage.warning('您未进行任何变更,请选择变更课程或者变更征订数量后提交');
+      }
+    }
     if (changeType.value === 2) {
       value.courseSubjectId = value.id;
     }