fix: change appraisePlan

Makefile

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

src/views/canteenEvaluation/plan/components/data.config.ts

@@ -209,8 +209,8 @@ export const formSchema: FormSchema[] = [
     component: 'Switch',
     colProps: { span: 24 },
     componentProps: {
-      checkedValue: true,
-      unCheckedValue: false,
+      checkedValue: 1,
+      unCheckedValue: 0,
     },
   },
 ];

src/views/educational/textbookSubscription/components/textBookPop.vue

@@ -5,10 +5,7 @@
   import { useTable } from '/@/components/Table';
   import classImportVue from './classImport.vue';
   import { textbookColumns } from '/@/views/educational/textbookSubscription/components/data.config';
-  import {
-    postWfTextbookSubscriptionInstockroom,
-    postWfTextbookSubscriptionTextbookSubscriptionExportQuery,
-  } from '/@/services/apis/WfTextbookSubscriptionController';
+  import { postWfTextbookSubscriptionTextbookSubscriptionExportQuery } from '/@/services/apis/WfTextbookSubscriptionController';
   import { ref } from 'vue';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { downloadByData } from '/@/utils/file/download';
@@ -44,16 +41,20 @@
         title: '征订总数量',
         dataIndex: 'subscriptionNumber',
         width: 120,
+        customRender: ({ record }) => {
+          return record.studentSubscriptionNumber + record.teacherSubscriptionNumber;
+        },
       },
       {
         title: '已入库数量',
-        dataIndex: 'inStockroomNum',
+        dataIndex: 'inStockNum',
         width: 120,
       },
     ],
     afterFetch: (data) => {
       data.forEach((item) => {
         item.sourcePrice = item.price;
+        item.price = item.actualPrice;
       });
       return data;
     },
@@ -107,7 +108,7 @@
   >
     <BasicTable @register="tableReg">
       <template #toolbar>
-        <a-button @click="handleDownLoad" type="primary">导出</a-button>
+        <!-- <a-button @click="handleDownLoad" type="primary">导出</a-button> -->
         <a-button type="primary" @click="handleExport">导入</a-button>
       </template>
       <template #action="{ record }">

src/views/educational/textbookSubscription/components/view.vue

@@ -6,22 +6,23 @@
   import changeHistoryVue from './changeHistory.vue';
   import changeTextBookVue from './changeTextBook.vue';
   import { ClassColumns, historySchema, historyTableColumns } from './data.config';
-  import {
-    getWfTextbookSubscriptionInfo,
-    postWfTextbookSubscriptionTextbookSubscriptionExportQuery,
-  } from '/@/services/apis/WfTextbookSubscriptionController';
+  import { postWfTextbookSubscriptionTextbookSubscriptionExportQuery } from '/@/services/apis/WfTextbookSubscriptionController';
   import { nextTick, ref } from 'vue';
   import { Modal } from 'ant-design-vue';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { downloadByData } from '/@/utils/file/download';
   import { formatToDate } from '/@/utils/dateUtil';
-  import { getTextbookSubscriptionBaseclassPage } from '/@/services/apis/TextbookSubscriptionController';
+  import {
+    getTextbookSubscriptionBaseclassPage,
+    getTextbookSubscriptionDetail,
+    getTextbookSubscriptionItemPage,
+  } from '/@/services/apis/TextbookSubscriptionController';
   const visible = ref(false);
   const dataInfo = ref<any>({});
   const itemId = ref<any>(null);
   const status = ref<any>(null);
   const [viewReg] = useModalInner(async (data) => {
-    dataInfo.value = await getWfTextbookSubscriptionInfo({ id: data.id });
+    dataInfo.value = await getTextbookSubscriptionDetail({ id: data.id });
     itemId.value = data.id;
     status.value = data.status;
     console.log(data);
@@ -44,12 +45,10 @@
     pagination: false,
     resizeHeightOffset: 100,
     api: async (params) => {
-      return (
-        await getWfTextbookSubscriptionInfo({
-          id: itemId.value,
-          ...params,
-        })
-      ).wfTextbookSubscriptionItemList;
+      return await getTextbookSubscriptionItemPage({
+        textbookSubscriptionId: itemId.value,
+        ...params,
+      });
     },
   });
   const [viewTableReg, { reload }] = useTable({
@@ -58,7 +57,7 @@
     beforeFetch: (params) => {
       return {
         ...params,
-        classIds: dataInfo.value.classIds,
+        id: itemId.value,
       };
     },
     immediate: false,
@@ -76,7 +75,7 @@
   const handleExport = async () => {
     try {
       const data: any = await postWfTextbookSubscriptionTextbookSubscriptionExportQuery({
-        wfTextbookSubscriptionId: itemId.value,
+        textbookSubscriptionId: itemId.value,
       });
       downloadByData(
         data.data,
@@ -102,11 +101,11 @@
       <div class="flex flex-row justify-between">
         <div class="flex flex-col justify-center">
           <span>学生用书征订数量</span>
-          <span class="mt-[6px] font-bold">{{ dataInfo?.studentSubscriptionNumberSum }}</span>
+          <span class="mt-[6px] font-bold">{{ dataInfo?.studentTatolNum }}</span>
         </div>
         <div class="flex flex-col justify-center">
           <span>教师用书征订数量</span>
-          <span class="mt-[6px] font-bold"> {{ dataInfo?.teacherSubscriptionNumberSum }}</span>
+          <span class="mt-[6px] font-bold"> {{ dataInfo?.teacherTatolNum }}</span>
         </div>
         <div class="flex flex-col justify-center">
           <span>总征订数量</span>
@@ -122,15 +121,16 @@
       <BasicTable @register="tableReg">
         <template #toolbar>
           <a-button type="primary" @click="openChangeHistory(true, itemId)">变更记录</a-button>
-          <a-button type="primary" @click="handleExport">导出</a-button>
+          <!-- <a-button type="primary" @click="handleExport">导出</a-button> -->
         </template>
         <template #action="{ record }">
           <a-button
             type="link"
             @click="openModal(true, record)"
             :disabled="record.inStockroomNum || status === 4"
-            >变更</a-button
           >
+            变更
+          </a-button>
         </template>
       </BasicTable>
       <Modal width="1000px" v-model:visible="visible" title="查看">