feat(rateList): 添加下载导入模板功能

feat: 新增开机人员年限分布API和页面功能

refactor(experienceDistributionStartupPerson): 重构年限分布页面对接后端API

refactor(dailyLuggageCheckInList): 调整上传组件结构

refactor(dailyLuggageInspectionScheduleByTime): 调整上传组件结构

feat(missedInspectionList): 完善漏检列表表单字段和选项

src/api/blockingData/experienceDistributionStartupPerson.js

@@ -0,0 +1,19 @@
+import request from '@/utils/request'
+
+// 查询开机人员年限分布列表全量
+export function getTenurelistAll(query) {
+  return request({
+    url: '/blocked/tenure/listAll',
+    method: 'get',
+    params: query
+  })
+}
+
+//修改开机人员年限分布
+export function editTenure(data) {
+  return request({
+    url: '/blocked/tenure/edit',
+    method: 'post',
+    data: data
+  })
+}

src/api/blockingData/rateList.js

@@ -49,4 +49,14 @@ export function exportRate() {
     url: `/blocked/rate/export`,
     method: 'post',
   })
+}
+
+
+// 下载导入模板
+export function downloadTemplate() {
+  return request({
+    url: '/blocked/rate/importTemplate',
+    method: 'get',
+    responseType: 'blob'
+  })
 }

src/views/blockingData/dailyLuggageCheckInList/index.vue

@@ -287,12 +287,13 @@
       <el-upload ref="uploadRef" :auto-upload="false" :on-change="handleFileChange" :show-file-list="false"
         accept=".xlsx,.xls">
         <el-button type="primary">选取文件</el-button>
-        <div class="el-upload__tip">只能上传xls/xlsx文件</div>
+        
+      </el-upload>
+      <div class="el-upload__tip">只能上传xls/xlsx文件</div>
         <div class="el-upload__tip">
           <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
             @click="importTemplate">下载模板</el-link>
         </div>
-      </el-upload>
       <template #footer>
         <div class="dialog-footer">
           <el-button type="primary" @click="submitImport">确 定</el-button>

src/views/blockingData/dailyLuggageInspectionScheduleByTime/index.vue

@@ -171,12 +171,13 @@
       <el-upload ref="uploadRef" :auto-upload="false" :on-change="handleFileChange" :show-file-list="false"
         accept=".xlsx,.xls">
         <el-button type="primary">选取文件</el-button>
-        <div class="el-upload__tip">只能上传xls/xlsx文件</div>
+       
+      </el-upload>
+       <div class="el-upload__tip">只能上传xls/xlsx文件</div>
         <div class="el-upload__tip">
           <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
             @click="importTemplate">下载模板</el-link>
         </div>
-      </el-upload>
       <template #footer>
         <div class="dialog-footer">
           <el-button type="primary" @click="submitImport">确 定</el-button>

src/views/blockingData/experienceDistributionStartupPerson/index.vue

@@ -1,101 +1,60 @@
 <template>
   <div class="experience-distribution">
     <h1 class="page-title">开机人员年限分布</h1>
-    
+
     <div class="table-container">
-      <el-table 
-        :data="teams" 
-        border 
-        stripe
-        class="distribution-table"
-        :header-cell-style="{ background: '#f5f7fa', color: '#606266' }"
-      >
-        <el-table-column prop="name" label="业务大队"  align="center">
+      <el-table :data="teams" border stripe class="distribution-table"
+        :header-cell-style="{ background: '#f5f7fa', color: '#606266' }">
+        <el-table-column prop="brigadeName" label="业务大队" align="center">
           <template #default="{ row }">
-            <span class="team-name">{{ row.name }}</span>
+            <span class="team-name">{{ row.brigadeName }}</span>
           </template>
         </el-table-column>
-        
-        <el-table-column label="5年及5年以上人员数"  align="center">
+
+        <el-table-column label="5年及5年以上人员数" align="center">
           <template #default="{ row }">
-            <el-input-number
-              v-model="row.fiveYearsPlus"
-              :min="0"
-              :controls="false"
-              size="small"
-              placeholder="0"
-              class="number-input"
-            />
+            <el-input-number v-model="row.cntGe5Year" :min="0" :controls="false" size="small" placeholder="0"
+              class="number-input" />
           </template>
         </el-table-column>
-        
-        <el-table-column label="4年人员数"  align="center">
+
+        <el-table-column label="4年人员数" align="center">
           <template #default="{ row }">
-            <el-input-number
-              v-model="row.fourYears"
-              :min="0"
-              :controls="false"
-              size="small"
-              placeholder="0"
-              class="number-input"
-            />
+            <el-input-number v-model="row.cnt4Years" :min="0" :controls="false" size="small" placeholder="0"
+              class="number-input" />
           </template>
         </el-table-column>
-        
-        <el-table-column label="3年人员数"  align="center">
+
+        <el-table-column label="3年人员数" align="center">
           <template #default="{ row }">
-            <el-input-number
-              v-model="row.threeYears"
-              :min="0"
-              :controls="false"
-              size="small"
-              placeholder="0"
-              class="number-input"
-            />
+            <el-input-number v-model="row.cnt3Years" :min="0" :controls="false" size="small" placeholder="0"
+              class="number-input" />
           </template>
         </el-table-column>
-        
-        <el-table-column label="2年人员数"  align="center">
+
+        <el-table-column label="2年人员数" align="center">
           <template #default="{ row }">
-            <el-input-number
-              v-model="row.twoYears"
-              :min="0"
-              :controls="false"
-              size="small"
-              placeholder="0"
-              class="number-input"
-            />
+            <el-input-number v-model="row.cnt2Years" :min="0" :controls="false" size="small" placeholder="0"
+              class="number-input" />
           </template>
         </el-table-column>
-        
-        <el-table-column label="1年人员数"  align="center">
+
+        <el-table-column label="1年人员数" align="center">
           <template #default="{ row }">
-            <el-input-number
-              v-model="row.oneYear"
-              :min="0"
-              :controls="false"
-              size="small"
-              placeholder="0"
-              class="number-input"
-            />
+            <el-input-number v-model="row.cnt1Years" :min="0" :controls="false" size="small" placeholder="0"
+              class="number-input" />
           </template>
         </el-table-column>
-        
+
         <el-table-column label="不足1年人员数" width="130" align="center">
           <template #default="{ row }">
-            <el-input-number
-              v-model="row.lessThanOneYear"
-              :min="0"
-              :controls="false"
-              size="small"
-              placeholder="0"
-              class="number-input"
-            />
+            <el-input-number v-model="row.cntLt1Year" :min="0" :controls="false" size="small" placeholder="0"
+              class="number-input" />
           </template>
         </el-table-column>
       </el-table>
     </div>
-    
+
     <div class="button-container">
       <el-button type="primary" size="medium" @click="handleConfirm" class="confirm-button">确定</el-button>
     </div>
@@ -103,48 +62,60 @@
 </template>
 
 <script>
+import { getTenurelistAll, editTenure } from '@/api/blockingData/experienceDistributionStartupPerson'
 export default {
   name: 'ExperienceDistributionStartupPerson',
   data() {
     return {
-      teams: [
-        {
-          id: 1,
-          name: '安检一大队',
-          fiveYearsPlus: 0,
-          fourYears: 0,
-          threeYears: 0,
-          twoYears: 0,
-          oneYear: 0,
-          lessThanOneYear: 0
-        },
-        {
-          id: 2,
-          name: '安检二大队',
-          fiveYearsPlus: 0,
-          fourYears: 0,
-          threeYears: 0,
-          twoYears: 0,
-          oneYear: 0,
-          lessThanOneYear: 0
-        },
-        {
-          id: 3,
-          name: '安检三大队',
-          fiveYearsPlus: 0,
-          fourYears: 0,
-          threeYears: 0,
-          twoYears: 0,
-          oneYear: 0,
-          lessThanOneYear: 0
-        }
-      ]
+      teams: []
     }
   },
+  mounted() {
+    this.fetchData()
+  },
   methods: {
-    handleConfirm() {
-      console.log('提交数据:', this.teams)
-      this.$message.success('数据提交成功！')
+    async fetchData() {
+      try {
+        const response = await getTenurelistAll()
+        if (response.code === 200) {
+          this.teams = response.data || []
+        } else {
+          this.$message.error('获取数据失败：' + response.msg)
+        }
+      } catch (error) {
+        console.error('获取数据失败:', error)
+        this.$message.error('获取数据失败')
+      }
+    },
+    async handleConfirm() {
+      try {
+        const savePromises = this.teams.map(row => {
+          const saveData = {
+            id: row.id,
+            brigadeId: row.brigadeId,
+            brigadeName: row.brigadeName,
+            cntGe5Year: row.cntGe5Year || 0,
+            cnt4Years: row.cnt4Years || 0,
+            cnt3Years: row.cnt3Years || 0,
+            cnt2Years: row.cnt2Years || 0,
+            cnt1Years: row.cnt1Years || 0,
+            cntLt1Year: row.cntLt1Year || 0
+          }
+          return editTenure(saveData)
+        })
+        
+        const results = await Promise.all(savePromises)
+        const allSuccess = results.every(result => result.code === 200)
+        
+        if (allSuccess) {
+          this.$message.success('数据保存成功！')
+        } else {
+          this.$message.error('部分数据保存失败，请检查后重试')
+        }
+      } catch (error) {
+        console.error('保存数据失败:', error)
+        this.$message.error('保存数据失败')
+      }
     }
   }
 }

src/views/blockingData/missedInspectionList/index.vue

@@ -118,8 +118,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="区域" prop="areaName">
-              <el-input v-model="form.areaName" placeholder="请输入区域" />
+            <el-form-item label="区域" prop="areaId">
+              <el-select v-model="form.areaId" placeholder="请选择区域" style="width: 100%">
+                <el-option v-for="item in areaOptions" :key="item.code" :label="item.name" :value="item.positionId" />
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -141,25 +143,33 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="漏检时间" prop="missCheckTime">
-              <el-input v-model="form.missCheckTime" placeholder="请输入漏检时间" />
+              <el-time-picker v-model="form.missCheckTime" placeholder="请选择漏检时间" value-format="HH:mm"
+                style="width: 100%" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="漏检时间段" prop="missCheckTimePeriod">
-              <el-input v-model="form.missCheckTimePeriod" placeholder="请输入漏检时间段" />
+              <el-select v-model="form.missCheckTimePeriod" placeholder="请选择漏检时间段" style="width: 100%">
+                <el-option v-for="item in blocked_time_period" :key="item.value" :label="item.label"
+                  :value="item.value" />
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="上岗位置" prop="channelName">
-              <el-input v-model="form.channelName" placeholder="请输入上岗位置" />
+            <el-form-item label="上岗位置" prop="channelId">
+              <el-select v-model="form.channelId" placeholder="请选择上岗位置" style="width: 100%">
+                <el-option v-for="item in channelOptions" :key="item.code" :label="item.name"
+                  :value="item.positionId" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="分管主管" prop="supervisorId">
               <el-select v-model="form.supervisorId" placeholder="请选择分管主管" style="width: 100%">
-                <el-option v-for="item in supervisorOptions" :key="item.value" :label="item.label" :value="item.value" />
+                <el-option v-for="item in supervisorOptions" :key="item.value" :label="item.label"
+                  :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -168,14 +178,16 @@
           <el-col :span="12">
             <el-form-item label="代管主管" prop="actingSupervisorId">
               <el-select v-model="form.actingSupervisorId" placeholder="请选择代管主管" style="width: 100%">
-                <el-option v-for="item in supervisorOptions" :key="item.value" :label="item.label" :value="item.value" />
+                <el-option v-for="item in supervisorOptions" :key="item.value" :label="item.label"
+                  :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="分管班组长" prop="teamLeaderId">
               <el-select v-model="form.teamLeaderId" placeholder="请选择分管班组长" style="width: 100%">
-                <el-option v-for="item in teamLeaderOptions" :key="item.value" :label="item.label" :value="item.value" />
+                <el-option v-for="item in teamLeaderOptions" :key="item.value" :label="item.label"
+                  :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -183,7 +195,10 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="物品位置" prop="itemLocation">
-              <el-input v-model="form.itemLocation" placeholder="请输入物品位置" />
+              <el-select v-model="form.itemLocation" placeholder="请选择物品位置" style="width: 100%">
+                <el-option v-for="item in blocked_item_position" :key="item.value" :label="item.label"
+                  :value="item.value" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -206,7 +221,8 @@
           <el-col :span="12">
             <el-form-item label="判别类型" prop="discriminationType">
               <el-select v-model="form.discriminationType" placeholder="请选择判别类型" style="width: 100%">
-                <el-option v-for="item in discrimination_type" :key="item.value" :label="item.label" :value="item.value" />
+                <el-option v-for="item in discrimination_type" :key="item.value" :label="item.label"
+                  :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -222,18 +238,17 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="开机年限" prop="machineOperatingYears">
-              <el-input v-model="form.machineOperatingYears" placeholder="请输入开机年限" />
+              <el-select v-model="form.machineOperatingYears" placeholder="请选择开机年限" style="width: 100%">
+                <el-option v-for="item in blocked_operating_years" :key="item.value" :label="item.label"
+                  :value="item.value" />
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="证书级别" prop="certificateLevel">
-              <el-select v-model="form.certificateLevel" placeholder="请选择证书级别" style="width: 100%">
-                <el-option label="初级" value="初级" />
-                <el-option label="中级" value="中级" />
-                <el-option label="高级" value="高级" />
-              </el-select>
+              <el-input v-model="form.certificateLevel" placeholder="请输入证书级别" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -248,12 +263,18 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="漏检原因分类" prop="missCheckReasonCategory">
-              <el-input v-model="form.missCheckReasonCategory" placeholder="请输入漏检原因分类" />
+              <el-select v-model="form.missCheckReasonCategory" placeholder="请选择漏检原因分类" style="width: 100%">
+                <el-option v-for="item in blocked_miss_check_reason" :key="item.value" :label="item.label"
+                  :value="item.value" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="月考成绩" prop="monthlyAssessment">
-              <el-input v-model="form.monthlyAssessment" placeholder="请输入月考成绩" />
+              <el-select v-model="form.monthlyAssessment" placeholder="请选择月考成绩" style="width: 100%">
+                <el-option v-for="item in blocked_monthly_exam_result" :key="item.value" :label="item.label"
+                  :value="item.value" />
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -286,12 +307,13 @@
       <el-upload ref="uploadRef" :auto-upload="false" :on-change="handleFileChange" :show-file-list="false"
         accept=".xlsx,.xls">
         <el-button type="primary">选取文件</el-button>
-        <div class="el-upload__tip">只能上传xls/xlsx文件</div>
-        <div class="el-upload__tip">
-          <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
-            @click="importTemplate">下载模板</el-link>
-        </div>
+
       </el-upload>
+      <div class="el-upload__tip">只能上传xls/xlsx文件</div>
+      <div class="el-upload__tip">
+        <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
+          @click="importTemplate">下载模板</el-link>
+      </div>
       <template #footer>
         <div class="dialog-footer">
           <el-button type="primary" @click="submitImport">确 定</el-button>
@@ -304,6 +326,7 @@
 
 <script setup>
 import { ref, reactive, onMounted, getCurrentInstance } from 'vue'
+import { listPosition } from '@/api/system/position'
 import { listMissedInspection, getMissedInspection, delMissedInspection, addMissedInspection, updateMissedInspection, exportMissedInspection, downloadTemplate } from '@/api/blockingData/missedInspection'
 import { listDept } from '@/api/system/dept'
 import { listUser } from '@/api/system/user'
@@ -358,7 +381,7 @@ const rules = {
 }
 
 // 字典数据
-const { discrimination_type } = useDict('discrimination_type')
+const { discrimination_type, blocked_time_period, blocked_item_position, blocked_monthly_exam_result, blocked_operating_years, blocked_miss_check_reason } = useDict('discrimination_type', 'blocked_time_period', 'blocked_item_position', 'blocked_monthly_exam_result', 'blocked_operating_years', 'blocked_miss_check_reason')
 
 // 大队选项
 const brigadeOptions = ref([])
@@ -368,7 +391,23 @@ const personOptions = ref([])
 const teamLeaderOptions = ref([])
 // 主管选项
 const supervisorOptions = ref([])
+// 区域选项
+const areaOptions = ref([])
+// 上岗位置选项
+const channelOptions = ref([])
+
+/** 获取职位列表 */
+function getPositionList() {
+  // 获取区域选项
+  listPosition({ positionType: 'REGIONAL' }).then(response => {
+    areaOptions.value = response.data || []
+  })
 
+  // 获取上岗位置选项
+  listPosition({ positionType: 'TERMINL' }).then(response => {
+    channelOptions.value = response.data || []
+  })
+}
 
 /** 查询漏检列表 */
 function getList() {
@@ -427,11 +466,13 @@ function reset() {
   Object.assign(form, {
     id: null,
     brigadeId: null,
+    areaId: null,
     areaName: null,
     reviewedUserId: null,
     reviewDate: null,
     missCheckTime: null,
     missCheckTimePeriod: null,
+    channelId: null,
     channelName: null,
     supervisorId: null,
     actingSupervisorId: null,
@@ -494,6 +535,54 @@ function handleUpdate(row) {
 function submitForm() {
   proxy.$refs.missedInspectionRef.validate(valid => {
     if (valid) {
+      // 处理大队ID和名称映射
+      if (form.brigadeId) {
+        const brigade = brigadeOptions.value.find(item => item.value === form.brigadeId)
+        form.brigadeName = brigade ? brigade.label : null
+      }
+
+      // 处理区域ID和名称映射
+      if (form.areaId) {
+        const area = areaOptions.value.find(item => item.positionId === form.areaId)
+        form.areaName = area ? area.positionName : null
+      }
+
+      // 处理被回查人ID和名称映射
+      if (form.reviewedUserId) {
+        const reviewedUser = personOptions.value.find(item => item.value === form.reviewedUserId)
+        form.reviewedUserName = reviewedUser ? reviewedUser.label : null
+      }
+
+      // 处理上岗位置ID和名称映射
+      if (form.channelId) {
+        const channel = channelOptions.value.find(item => item.positionId === form.channelId)
+        form.channelName = channel ? channel.positionName : null
+      }
+
+      // 处理分管主管ID和名称映射
+      if (form.supervisorId) {
+        const supervisor = supervisorOptions.value.find(item => item.value === form.supervisorId)
+        form.supervisorName = supervisor ? supervisor.label : null
+      }
+
+      // 处理代管主管ID和名称映射
+      if (form.actingSupervisorId) {
+        const actingSupervisor = supervisorOptions.value.find(item => item.value === form.actingSupervisorId)
+        form.actingSupervisorName = actingSupervisor ? actingSupervisor.label : null
+      }
+
+      // 处理分管班组长ID和名称映射
+      if (form.teamLeaderId) {
+        const teamLeader = teamLeaderOptions.value.find(item => item.value === form.teamLeaderId)
+        form.teamLeaderName = teamLeader ? teamLeader.label : null
+      }
+
+      // 处理回查人ID和名称映射
+      if (form.reviewUserId) {
+        const reviewUser = personOptions.value.find(item => item.value === form.reviewUserId)
+        form.reviewUserName = reviewUser ? reviewUser.label : null
+      }
+
       if (form.id != null) {
         updateMissedInspection(form).then(response => {
           proxy.$modal.msgSuccess('修改成功')
@@ -564,6 +653,7 @@ onMounted(() => {
   getList()
   getDeptList()
   getUserList()
+  getPositionList()
 })
 </script>
 

src/views/blockingData/rateList/index.vue

@@ -149,6 +149,10 @@
         accept=".xlsx,.xls">
         <el-button type="primary">选取文件</el-button>
         <div class="el-upload__tip">只能上传xls/xlsx文件</div>
+        <div class="el-upload__tip">
+          <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
+            @click="importTemplate">下载模板</el-link>
+        </div>
       </el-upload>
       <template #footer>
         <div class="dialog-footer">
@@ -162,7 +166,7 @@
 
 <script setup>
 import { ref, reactive, onMounted, getCurrentInstance } from 'vue'
-import { listRate, getRate, delRate, addRate, updateRate, exportRate } from '@/api/blockingData/rateList'
+import { listRate, getRate, delRate, addRate, updateRate, exportRate,downloadTemplate } from '@/api/blockingData/rateList'
 import { listDept } from '@/api/system/dept'
 
 const { proxy } = getCurrentInstance()
@@ -316,6 +320,11 @@ function handleFileChange(file) {
   importFile.value = file.raw
 }
 
+/** 下载模板操作 */
+function importTemplate() {
+  proxy.download('rateList/importTemplate', {}, `rate_list_template_${new Date().getTime()}.xlsx`)
+}
+
 function submitImport() {
   if (!importFile.value) {
     proxy.$modal.msgWarning('请选择要导入的文件')