Explorar el Código

Merge branch 'cc-dev' into 'dev'

物资盘点初始化调取盘点接口

See merge request product-group-fe/sfy-safety-group/sfy-safety!152
陈昶 hace 9 meses
padre
commit
ace923ef38
Se han modificado 1 ficheros con 4 adiciones y 13 borrados
  1. 4 13
      src/views/emergency/emergency-supplies/PageInventoryCheck.vue

+ 4 - 13
src/views/emergency/emergency-supplies/PageInventoryCheck.vue

@@ -46,9 +46,7 @@
           </BasicSearch>
           <div class="date-time-container" v-if="endTime">
             <span>任务期限:{{ endTime }}</span>
-            <el-button type="primary" @click="handleConfirm" v-if="isInventory"
-              >盘点确认</el-button
-            >
+            <el-button type="primary" @click="handleConfirm" v-if="isInventory">盘点确认</el-button>
           </div>
         </header>
         <BasicTable
@@ -198,15 +196,6 @@
   // 定时器引用
   const pollTimer = ref<number | null>(null);
 
-  // const isTaskExpired = computed(() => {
-  //   if (!endTime.value) return true;
-
-  //   const currentTime = new Date();
-  //   const taskEndTime = new Date(endTime.value);
-
-  //   return currentTime > taskEndTime;
-  // });
-
   const handleSearch = () => {
     inventoryCheckListQuery.queryParam = {};
     if (searchData.taskId) {
@@ -247,11 +236,13 @@
     getTableData();
   };
 
-  const getFirstTaskInfo = () => {
+  const getFirstTaskInfo = async () => {
     const firstTask = inventoryTaskOptions.value[0];
     if (!firstTask) return;
     searchData.taskId = firstTask.id;
     endTime.value = firstTask.endTime;
+    await checkTaskStatus();
+    startPolling();
   };
 
   const getInventoryTaskOptions = async () => {