刘洋 7 months ago
parent
commit
85b65d3371
3 changed files with 17 additions and 9 deletions
  1. 14 6
      src/views/order/my-task/index.vue
  2. 2 2
      src/views/order/reservation-set/index.vue
  3. 1 1
      tsconfig.json

+ 14 - 6
src/views/order/my-task/index.vue

@@ -59,10 +59,14 @@
         >
       </template>
     </a-table>
+    <a-modal v-model:visible="showSummary">
+      <template #title> 系统提示 </template>
+      <div v-html="summary"></div>
+    </a-modal>
   </div>
 </template>
 
-<script setup lang="ts">
+<script setup lang="tsx">
   import { reactive, ref, computed, onMounted, watch } from 'vue';
   import { Message, TableColumnData, Modal } from '@arco-design/web-vue';
   import { getMyTasks, getTaskTypes } from '@/api/order';
@@ -154,10 +158,14 @@
     downloadByCrossUrl(record.exportFilePath, `${Date.now()}`);
   };
 
-  const view = (summary: string) => {
-    Modal.info({
-      title: '系统提示',
-      content: summary,
-    });
+  const summary = ref('');
+  const showSummary = ref(false);
+  const view = (s: string) => {
+    // Modal.info({
+    //   title: '系统提示',
+    //   content: summary,
+    // });
+    summary.value = s.replaceAll('\n', '<br />');
+    showSummary.value = true;
   };
 </script>

+ 2 - 2
src/views/order/reservation-set/index.vue

@@ -191,7 +191,7 @@
     getDateAndTimeList({ examSiteId: searchModel.examSiteId || null })
       .then((res: any) => {
         tableData.value = (res || []).map((item: any) => {
-          item.batchStatus = item.timePeriodList.every((v: any) => v.enable);
+          item.batchStatus = item.timePeriodList.some((v: any) => v.enable);
           return item;
         });
         tableKey.value = `${Date.now()}`;
@@ -214,7 +214,7 @@
     ).enable = bool;
     tableData.value[rowIndex].batchStatus = tableData.value[
       rowIndex
-    ].timePeriodList.every((v: any) => v.enable);
+    ].timePeriodList.some((v: any) => v.enable);
     tableKey.value = `${Date.now()}`;
   };
 

+ 1 - 1
tsconfig.json

@@ -15,7 +15,7 @@
       ]
     },
     "lib": [
-      "es2020",
+      "ESNext",
       "dom"
     ],
     "skipLibCheck": true,