Merge branch 'blockingData' into dev

src/views/blockingData/missedInspectionList/index.vue

@@ -61,7 +61,7 @@
     <el-table v-loading="loading" :data="missedInspectionList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="大队" align="center" prop="brigadeName" min-width="120" />
-      <el-table-column label="航站楼" align="center" prop="areaName" min-width="120" />
+      <el-table-column label="航站楼" align="center" prop="terminalName" min-width="120" />
       <el-table-column label="被回查人" align="center" prop="reviewedUserName" min-width="120" />
       <el-table-column label="回查日期" align="center" prop="reviewDate" min-width="120" />
       <el-table-column label="漏检时间" align="center" prop="missCheckTime" min-width="180" />
@@ -311,7 +311,7 @@
     <!-- 导入对话框 -->
     <el-dialog title="导入" v-model="upload.open" width="500px" append-to-body>
       <el-upload ref="uploadRef" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" :action="upload.url"
-        :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess"
+        :data="upload.data" :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess"
         :auto-upload="false" drag>
         <el-icon class="el-icon--upload"><upload-filled /></el-icon>
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
@@ -325,7 +325,7 @@
       </el-upload>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="primary" @click="submitFileForm">确 定</el-button>
+          <el-button type="primary" @click="submitFileForm" :loading="upload.isUploading">确 定</el-button>
           <el-button @click="upload.open = false">取 消</el-button>
         </div>
       </template>
@@ -373,7 +373,8 @@ const upload = reactive({
   open: false,
   isUploading: false,
   headers: { Authorization: 'Bearer ' + getToken() },
-  url: import.meta.env.VITE_APP_BASE_API + '/blocked/missReview/importData'
+  url: import.meta.env.VITE_APP_BASE_API + '/blocked/missReview/importData',
+  data: { updateSupport: true }
 })
 
 // 查询参数
@@ -633,8 +634,8 @@ function submitForm() {
 
       // 处理航站楼ID和名称映射
       if (form.areaId) {
-
-        const area = areaOptions.value.find(item => item.id === form.areaId)
+       
+        const area = channelOptions.value.find(item => item.id === form.areaId)
         form.areaName = area ? area.name : null
       }
 
@@ -646,7 +647,8 @@ function submitForm() {
 
       // 处理上岗位置ID和名称映射
       if (form.channelId) {
-        const channel = channelOptions.value.find(item => item.id === form.channelId)
+      
+        const channel = areaOptions.value.find(item => item.id === form.channelId)
         form.channelName = channel ? channel.name : null
       }
 
@@ -658,7 +660,7 @@ function submitForm() {
 
       // 处理代管主管ID和名称映射
       if (form.actingSupervisorId) {
-
+      
         const actingSupervisor = supervisorOptions.value.find(item => item.value === form.actingSupervisorId)
         form.actingSupervisorName = actingSupervisor ? actingSupervisor.label : null
       }