Merge branch 'blockingData' into dev

src/views/blockingData/blockingDataScreen/index.vue

@@ -37,7 +37,7 @@
         <div class="filter-item">
           <span class="filter-label">漏检物品：</span>
           <el-tree-select v-model="filterParams.missCheckItem" :data="missedItemOptions"
-            :props="{ value: 'id', label: 'name', children: 'children', disabled: data => data.children && data.children.length > 0 }"
+            :props="{ value: 'name', label: 'name', children: 'children', disabled: data => data.children && data.children.length > 0 }"
             value-key="id" placeholder="请选择漏检物品" check-strictly style="width: 200px" clearable @change="missCheckItemChange"/>
         </div>
 
@@ -214,7 +214,7 @@ function getBrigadeOptions() {
 }
 const setDefaultDateRange = () => {
   const now = new Date()
-  const startOfMonth = new Date(now.getFullYear(), now.getMonth(), 1)
+  const startOfYear = new Date(now.getFullYear(), 0, 1, 0, 0, 0)
   const endOfToday = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 23, 59, 59)
 
   // 格式化日期为 YYYY-MM-DD HH:mm:ss 格式
@@ -228,7 +228,7 @@ const setDefaultDateRange = () => {
     return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
   }
 
-  filterParams.dateRange = [formatDate(startOfMonth), formatDate(endOfToday)]
+  filterParams.dateRange = [formatDate(startOfYear), formatDate(endOfToday)]
 }
 
 // 处理筛选
@@ -301,6 +301,7 @@ onMounted(() => {
   align-items: center;
   gap: 20px;
   margin-bottom: 15px;
+  flex-wrap: wrap;
 
   &:last-child {
     margin-bottom: 0;

src/views/blockingData/missedInspectionList/index.vue

@@ -112,8 +112,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="航站楼" prop="areaId">
-              <el-select v-model="form.areaId" placeholder="请选择航站楼" filterable style="width: 100%">
+            <el-form-item label="航站楼" prop="terminalId">
+              <el-select v-model="form.terminalId" placeholder="请选择航站楼" filterable style="width: 100%">
                 <el-option v-for="item in channelOptions" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -395,7 +395,7 @@ const form = reactive({})
 // 表单校验
 const rules = {
   brigadeId: [{ required: true, message: '大队不能为空', trigger: 'change' }],
-  areaId: [{ required: true, message: '航站楼不能为空', trigger: 'change' }],
+  terminalId: [{ required: true, message: '航站楼不能为空', trigger: 'change' }],
   reviewedUserId: [{ required: true, message: '被回查人不能为空', trigger: 'change' }],
   reviewDate: [{ required: true, message: '回查日期不能为空', trigger: 'change' }],
   missCheckTime: [{ required: true, message: '漏检时间不能为空', trigger: 'change' }],
@@ -553,8 +553,8 @@ function reset() {
   Object.assign(form, {
     id: null,
     brigadeId: null,
-    areaId: null,
-    areaName: null,
+    terminalId: null,
+    terminalName: null,
     reviewedUserId: null,
     reviewDate: null,
     missCheckTime: null,
@@ -633,10 +633,10 @@ function submitForm() {
       }
 
       // 处理航站楼ID和名称映射
-      if (form.areaId) {
-       
-        const area = channelOptions.value.find(item => item.id === form.areaId)
-        form.areaName = area ? area.name : null
+      if (form.terminalId) {
+      
+        const area = channelOptions.value.find(item => item.id === form.terminalId)
+        form.terminalName = area ? area.name : null
       }
 
       // 处理被回查人ID和名称映射