feat(equipManage): add tree position select component and optimize equipment ledger

1. 新增位置树形结构查询接口和级联选择组件
2. 替换设备台账页面的安装位置输入框为树形选择器
3. 优化表格中安装位置的显示格式
4. 调整表单代码格式和部分默认值

src/api/system/position.js

@@ -42,3 +42,10 @@ export function delPosition(id) {
     method: 'delete'
   })
 }
+//查询位置列表树形结构
+export function treePosition() {
+  return request({
+    url: '/system/position/listTree',
+    method: 'get'
+  })
+}

src/components/TreePositionSelect/index.vue

@@ -0,0 +1,133 @@
+<template>
+  <el-cascader
+    v-model="selectedValue"
+    :options="options"
+    :props="cascaderProps"
+    :placeholder="placeholder"
+    :disabled="disabled"
+    :style="{ width: width }"
+    filterable
+    clearable
+    collapse-tags
+    collapse-tags-tooltip
+    separator="/"
+    @change="handleChange"
+    @clear="handleClear"
+  />
+</template>
+
+<script lang="ts" setup>
+import { ref, watch, computed, onMounted, nextTick } from 'vue'
+import { treePosition } from '@/api/system/position'
+
+const props = defineProps<{
+  modelValue: any
+  disabled?: boolean
+  width?: string
+  placeholder?: string
+}>()
+
+const emits = defineEmits(['update:modelValue', 'change'])
+
+const options = ref<any[]>([])
+const loading = ref(false)
+const selectedValue = ref<any[]>([])
+
+const placeholder = computed(() => props.placeholder || '请选择安装位置')
+
+const cascaderProps = {
+  value: 'code',
+  label: 'name',
+  children: 'children',
+  expandTrigger: 'hover' as const
+}
+
+const loadData = async () => {
+  loading.value = true
+  try {
+    const response = await treePosition()
+    options.value = response.data || []
+    
+    if (props.modelValue) {
+      await nextTick()
+      updateSelectedValue(props.modelValue)
+    }
+  } catch (error) {
+    console.error('获取位置列表失败:', error)
+  } finally {
+    loading.value = false
+  }
+}
+
+const updateSelectedValue = (value: any) => {
+  if (value && typeof value === 'object') {
+    const obj = value as any
+    selectedValue.value = [obj.terminlCode, obj.regionalCode, obj.channelCode].filter(Boolean)
+  } else {
+    selectedValue.value = []
+  }
+}
+
+const findNodeByCode = (nodes: any[], code: string): any | null => {
+  for (const node of nodes) {
+    if (node.code === code) {
+      return node
+    }
+    if (node.children && node.children.length > 0) {
+      const found = findNodeByCode(node.children, code)
+      if (found) return found
+    }
+  }
+  return null
+}
+
+const handleChange = (value: any) => {
+  if (!value || value.length === 0) {
+    selectedValue.value = []
+    emits('update:modelValue', null)
+    emits('change', null)
+    return
+  }
+  
+  const terminal = findNodeByCode(options.value, value[0])
+  const region = value[1] ? findNodeByCode(options.value, value[1]) || (terminal?.children?.find((c: any) => c.code === value[1])) : null
+  const channel = value[2] ? (region?.children?.find((c: any) => c.code === value[2])) : null
+  
+  const result = {
+    terminlCode: value[0] || '',
+    terminlName: terminal?.name || '',
+    regionalCode: value[1] || '',
+    regionalName: region?.name || '',
+    channelCode: value[2] || '',
+    channelName: channel?.name || ''
+  }
+  
+  emits('update:modelValue', result)
+  emits('change', result)
+}
+
+const handleClear = () => {
+  selectedValue.value = []
+  emits('update:modelValue', null)
+  emits('change', null)
+}
+
+watch(() => props.modelValue, (newValue) => {
+  if (newValue && options.value.length > 0) {
+    updateSelectedValue(newValue)
+  }
+}, { deep: true })
+
+watch(() => options.value, (newOptions) => {
+  if (newOptions.length > 0 && props.modelValue) {
+    updateSelectedValue(props.modelValue)
+  }
+}, { immediate: false })
+
+onMounted(() => {
+  loadData()
+})
+</script>
+
+<style scoped>
+</style>

src/views/equipManage/equipLedger/index.vue

@@ -8,11 +8,13 @@
         </el-form-item>
         <el-form-item label="使用状态" prop="usageStatus">
           <el-select v-model="queryParams.usageStatus" placeholder="请选择使用状态" clearable style="width: 200px">
-            <el-option v-for="dict in equipment_usage_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+            <el-option v-for="dict in equipment_usage_status" :key="dict.value" :label="dict.label"
+              :value="dict.value" />
           </el-select>
         </el-form-item>
         <el-form-item label="最近定/自检日期" prop="inspectionSelfCheckDate">
-          <el-date-picker v-model="queryParams.inspectionSelfCheckDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择日期" style="width: 200px" />
+          <el-date-picker v-model="queryParams.inspectionSelfCheckDate" type="date" value-format="YYYY-MM-DD"
+            placeholder="请选择日期" style="width: 200px" />
         </el-form-item>
         <el-form-item label="检查成员" prop="inspectionTeamUserName">
           <el-input v-model="queryParams.inspectionTeamUserName" placeholder="请输入检查成员" clearable style="width: 200px" />
@@ -26,14 +28,19 @@
 
     <!-- 操作按钮 -->
     <div class="operation-container">
-      <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['equipment:ledger:add']">新增</el-button>
-      <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleBatchDelete" v-hasPermi="['equipment:ledger:delete']">删除</el-button>
-      <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['equipment:ledger:export']">导出</el-button>
-      <el-button type="info" plain icon="Upload" @click="handleImport" v-hasPermi="['equipment:ledger:import']">导入</el-button>
+      <el-button type="primary" plain icon="Plus" @click="handleAdd"
+        v-hasPermi="['equipment:ledger:add']">新增</el-button>
+      <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleBatchDelete"
+        v-hasPermi="['equipment:ledger:delete']">删除</el-button>
+      <el-button type="warning" plain icon="Download" @click="handleExport"
+        v-hasPermi="['equipment:ledger:export']">导出</el-button>
+      <el-button type="info" plain icon="Upload" @click="handleImport"
+        v-hasPermi="['equipment:ledger:import']">导入</el-button>
     </div>
 
     <!-- 数据表格 -->
-    <el-table v-loading="loading" :data="tableData" border @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
+    <el-table v-loading="loading" :data="tableData" border @selection-change="handleSelectionChange"
+      :row-class-name="tableRowClassName">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" prop="rowIndex" width="70" align="center">
         <template #default="scope">
@@ -46,17 +53,25 @@
         </template>
       </el-table-column>
       <el-table-column label="设备名称" prop="equipmentName" align="center" min-width="150" show-overflow-tooltip />
-      <el-table-column label="设备序列号" prop="equipmentSerialNumber" align="center" min-width="150" show-overflow-tooltip />
-      <el-table-column label="安装位置" prop="installationLocation" align="center" min-width="150" show-overflow-tooltip />
+      <el-table-column label="设备序列号" prop="equipmentSerialNumber" align="center" min-width="150"
+        show-overflow-tooltip />
+      <el-table-column label="安装位置" prop="installationLocation" align="center" min-width="180" show-overflow-tooltip>
+        <template #default="scope">
+          {{ formatInstallationLocation(scope.row.installationLocation) }}
+        </template>
+      </el-table-column>
       <el-table-column label="使用状态" prop="usageStatus" align="center" min-width="100">
         <template #default="scope">
           <dict-tag :options="equipment_usage_status" :value="scope.row.usageStatus" />
-          
+
         </template>
       </el-table-column>
-      <el-table-column label="定/自检小组组长" prop="inspectionTeamLeaderName" align="center" min-width="120" show-overflow-tooltip />
-      <el-table-column label="定/自检小组组员1" prop="inspectionTeamMember1Name" align="center" min-width="120" show-overflow-tooltip />
-      <el-table-column label="定/自检小组组员2" prop="inspectionTeamMember2Name" align="center" min-width="120" show-overflow-tooltip />
+      <el-table-column label="定/自检小组组长" prop="inspectionTeamLeaderName" align="center" min-width="120"
+        show-overflow-tooltip />
+      <el-table-column label="定/自检小组组员1" prop="inspectionTeamMember1Name" align="center" min-width="120"
+        show-overflow-tooltip />
+      <el-table-column label="定/自检小组组员2" prop="inspectionTeamMember2Name" align="center" min-width="120"
+        show-overflow-tooltip />
       <el-table-column label="最近定检/自检日期" prop="inspectionSelfCheckDate" align="center" min-width="120" />
       <el-table-column label="操作" align="center" width="220" fixed="right">
         <template #default="scope">
@@ -68,7 +83,8 @@
     </el-table>
 
     <!-- 分页 -->
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize" @pagination="getList" />
 
     <!-- 编辑/详情弹窗 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="1000px" :close-on-click-modal="false">
@@ -111,69 +127,82 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="出厂日期" prop="manufacturingDate">
-              <el-date-picker v-model="form.manufacturingDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择出厂日期" :disabled="formDisabled" />
+              <el-date-picker v-model="form.manufacturingDate" type="date" value-format="YYYY-MM-DD"
+                placeholder="请选择出厂日期" :disabled="formDisabled" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="验收日期" prop="acceptanceDate">
-              <el-date-picker v-model="form.acceptanceDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择验收日期" :disabled="formDisabled" />
+              <el-date-picker v-model="form.acceptanceDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择验收日期"
+                :disabled="formDisabled" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="启用日期" prop="commissioningDate">
-              <el-date-picker v-model="form.commissioningDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择启用日期" :disabled="formDisabled" />
+              <el-date-picker v-model="form.commissioningDate" type="date" value-format="YYYY-MM-DD"
+                placeholder="请选择启用日期" :disabled="formDisabled" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="使用状态" prop="usageStatus">
               <el-select v-model="form.usageStatus" placeholder="请选择使用状态" :disabled="formDisabled">
-                <el-option v-for="dict in equipment_usage_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+                <el-option v-for="dict in equipment_usage_status" :key="dict.value" :label="dict.label"
+                  :value="dict.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="报废日期" prop="scrappingDate">
-              <el-date-picker v-model="form.scrappingDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择报废日期" :disabled="formDisabled" />
+              <el-date-picker v-model="form.scrappingDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择报废日期"
+                :disabled="formDisabled" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="安装位置" prop="installationLocation">
-              <el-input v-model="form.installationLocation" placeholder="请输入安装位置" :disabled="formDisabled" />
+              <TreePositionSelect v-model="form.installationLocation" :disabled="formDisabled" width="100%"
+                placeholder="请选择安装位置" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="定/自检日期" prop="inspectionSelfCheckDate">
-              <el-date-picker v-model="form.inspectionSelfCheckDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择定/自检日期" :disabled="formDisabled" @change="calculateDueDate" />
+              <el-date-picker v-model="form.inspectionSelfCheckDate" type="date" value-format="YYYY-MM-DD"
+                placeholder="请选择定/自检日期" :disabled="formDisabled" @change="calculateDueDate" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="定/自检周期" prop="inspectionSelfCheckCycle">
-              <el-input-number v-model="form.inspectionSelfCheckCycle" placeholder="请输入定/自检周期" :min="0" :precision="0" :disabled="formDisabled" @change="calculateDueDate" />&nbsp;月
+              <el-input-number v-model="form.inspectionSelfCheckCycle" placeholder="请输入定/自检周期" :min="0" :precision="0"
+                :disabled="formDisabled" @change="calculateDueDate" />&nbsp;月
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="最近定/自检到期日期" prop="nextInspectionDueDate">
-              <el-date-picker v-model="form.nextInspectionDueDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择最近定/自检到期日期" :disabled="formDisabled" />
+              <el-date-picker v-model="form.nextInspectionDueDate" type="date" value-format="YYYY-MM-DD"
+                placeholder="请选择最近定/自检到期日期" :disabled="formDisabled" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="定/自检小组组长" prop="inspectionTeamLeaderId">
-              <UserSelect v-model="form.inspectionTeamLeaderId" :disabled="formDisabled" width="100%" placeholder="请选择组长" />
+              <UserSelect v-model="form.inspectionTeamLeaderId" :disabled="formDisabled" width="100%"
+                placeholder="请选择组长" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="定/自检小组组员1" prop="inspectionTeamMember1Id">
-              <UserSelect v-model="form.inspectionTeamMember1Id" :disabled="formDisabled" width="100%" placeholder="请选择组员1" />
+              <UserSelect v-model="form.inspectionTeamMember1Id" :disabled="formDisabled" width="100%"
+                placeholder="请选择组员1" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="定/自检小组组员2" prop="inspectionTeamMember2Id">
-              <UserSelect v-model="form.inspectionTeamMember2Id" :disabled="formDisabled" width="100%" placeholder="请选择组员2" />
+              <UserSelect v-model="form.inspectionTeamMember2Id" :disabled="formDisabled" width="100%"
+                placeholder="请选择组员2" />
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="首次验收情况" prop="initialAcceptanceStatus">
-              <el-input v-model="form.initialAcceptanceStatus" type="textarea" :rows="3" placeholder="请输入首次验收情况" :disabled="formDisabled" />
+              <el-input v-model="form.initialAcceptanceStatus" type="textarea" :rows="3" placeholder="请输入首次验收情况"
+                :disabled="formDisabled" />
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -189,12 +218,15 @@
         <el-table :data="form.equipmentInspectionRecordList" border style="margin-top: 10px">
           <el-table-column label="定检日期" prop="inspectionDate">
             <template #default="scope">
-              <el-date-picker v-model="scope.row.inspectionDate" type="date" value-format="YYYY-MM-DD" placeholder="选择日期" :disabled="formDisabled" @change="handleInspectionDateChange(scope.row, scope.$index)" />
+              <el-date-picker v-model="scope.row.inspectionDate" type="date" value-format="YYYY-MM-DD"
+                placeholder="选择日期" :disabled="formDisabled"
+                @change="handleInspectionDateChange(scope.row, scope.$index)" />
             </template>
           </el-table-column>
           <el-table-column label="定检小组" prop="inspectionTeamName">
             <template #default="scope">
-              <UserSelect v-model="scope.row.inspectionTeamIds" :multiple="true" :disabled="formDisabled" width="100%" placeholder="请选择" />
+              <UserSelect v-model="scope.row.inspectionTeamIds" :multiple="true" :disabled="formDisabled" width="100%"
+                placeholder="请选择" />
             </template>
           </el-table-column>
           <el-table-column label="定检结论" prop="inspectionResult">
@@ -205,13 +237,15 @@
           <el-table-column label="定检性质" prop="inspectionNature">
             <template #default="scope">
               <el-select v-model="scope.row.inspectionNature" placeholder="请选择" :disabled="formDisabled">
-                <el-option v-for="dict in equipment_inspection_nature" :key="dict.value" :label="dict.label" :value="dict.value" />
+                <el-option v-for="dict in equipment_inspection_nature" :key="dict.value" :label="dict.label"
+                  :value="dict.value" />
               </el-select>
             </template>
           </el-table-column>
           <el-table-column label="操作" width="80" v-if="!formDisabled">
             <template #default="scope">
-              <el-button type="danger" link icon="Delete" @click="removeCheckRecord(scope.$index)" v-hasPermi="['equipment:ledger:delete']">删除</el-button>
+              <el-button type="danger" link icon="Delete" @click="removeCheckRecord(scope.$index)"
+                v-hasPermi="['equipment:ledger:delete']">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -225,13 +259,18 @@
 
     <!-- 导入对话框 -->
     <el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body>
-      <el-upload ref="uploadRef" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
-        <el-icon class="el-icon--upload"><UploadFilled /></el-icon>
+      <el-upload ref="uploadRef" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
+        <el-icon class="el-icon--upload">
+          <UploadFilled />
+        </el-icon>
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
         <template #tip>
           <div class="el-upload__tip text-center">
             <span>仅允许导入xls、xlsx格式文件。</span>
-            <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline" @click="importTemplate">下载模板</el-link>
+            <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
+              @click="importTemplate">下载模板</el-link>
           </div>
         </template>
       </el-upload>
@@ -248,9 +287,10 @@
 <script setup>
 import { ref, reactive, onMounted, getCurrentInstance } from 'vue'
 import { ElMessage } from 'element-plus'
-import { UploadFilled } from '@element-plus/icons-vue'
+import { Delete, UploadFilled } from '@element-plus/icons-vue'
 import ImageUpload from '@/components/ImageUpload/index.vue'
 import UserSelect from '@/components/UserSelect/index.vue'
+import TreePositionSelect from '@/components/TreePositionSelect/index.vue'
 import { listEquipLedger, getEquipLedger, addEquipLedger, updateEquipLedger, delEquipLedger, exportEquipLedger } from '@/api/equipManage/equipLedger'
 import { getUser } from '@/api/system/user'
 import { getToken } from '@/utils/auth'
@@ -294,7 +334,7 @@ const form = reactive({
   commissioningDate: '',
   usageStatus: '',
   scrappingDate: '',
-  installationLocation: '',
+  installationLocation: null,
   inspectionSelfCheckDate: '',
   inspectionSelfCheckCycle: 0,
   nextInspectionDueDate: '',
@@ -376,6 +416,14 @@ function handleEdit(row) {
     if (!form.equipmentInspectionRecordList || !Array.isArray(form.equipmentInspectionRecordList)) {
       form.equipmentInspectionRecordList = []
     }
+    form.installationLocation = {
+      terminlCode: response.data.terminlCode,
+      regionalCode: response.data.regionalCode,
+      channelCode: response.data.channelCode
+    }
+    form.inspectionTeamLeaderId = form.inspectionTeamLeaderId || ''
+    form.inspectionTeamMember1Id = form.inspectionTeamMember1Id || ''
+    form.inspectionTeamMember2Id = form.inspectionTeamMember2Id || ''
     formDisabled.value = false
     dialog.title = '编辑设备'
     dialog.visible = true
@@ -396,6 +444,14 @@ function handleDetail(row) {
     if (!form.equipmentInspectionRecordList || !Array.isArray(form.equipmentInspectionRecordList)) {
       form.equipmentInspectionRecordList = []
     }
+    form.installationLocation = {
+      terminlCode: response.data.terminlCode,
+      regionalCode: response.data.regionalCode,
+      channelCode: response.data.channelCode
+    }
+    form.inspectionTeamLeaderId = form.inspectionTeamLeaderId || ''
+    form.inspectionTeamMember1Id = form.inspectionTeamMember1Id || ''
+    form.inspectionTeamMember2Id = form.inspectionTeamMember2Id || ''
     formDisabled.value = true
     dialog.title = '设备详情'
     dialog.visible = true
@@ -411,6 +467,14 @@ function handleDelete(row) {
   }).catch(() => { })
 }
 
+function formatInstallationLocation(location) {
+  if (!location) return ''
+  if (typeof location === 'object') {
+    return `${location.terminlName || ''}/${location.regionalName || ''}/${location.channelName || ''}`
+  }
+  return location
+}
+
 function handleBatchDelete() {
   proxy.$modal.confirm('是否确认删除选中的设备？').then(function () {
     return delEquipLedger(selectedIds.value.join(','))
@@ -459,9 +523,9 @@ function resetForm() {
     manufacturingDate: '',
     acceptanceDate: '',
     commissioningDate: '',
-    usageStatus: '1',
+    usageStatus: '',
     scrappingDate: '',
-    installationLocation: '',
+    installationLocation: null,
     inspectionSelfCheckDate: '',
     inspectionSelfCheckCycle: 0,
     nextInspectionDueDate: '',
@@ -477,9 +541,9 @@ function resetForm() {
 async function submitForm() {
   formRef.value?.validate(async valid => {
     if (valid) {
-      const submitData = { ...form }
+      const submitData = { ...form, ...form.installationLocation }
       submitData.baseAttachmentList = baseAttachmentListInternal.value
-      
+
       try {
         if (submitData.inspectionTeamLeaderId) {
           const leaderRes = await getUser(submitData.inspectionTeamLeaderId)
@@ -496,6 +560,7 @@ async function submitForm() {
       } catch (error) {
         console.error('获取用户信息失败:', error)
       }
+      delete submitData.installationLocation
 
       if (submitData.id != null) {
         updateEquipLedger(submitData).then(response => {
@@ -542,7 +607,7 @@ function handleInspectionDateChange(row, index) {
   if (row.inspectionDate) {
     const recordDate = new Date(row.inspectionDate)
     const checkDate = form.inspectionSelfCheckDate ? new Date(form.inspectionSelfCheckDate) : null
-    
+
     if (!checkDate || recordDate > checkDate) {
       form.inspectionSelfCheckDate = row.inspectionDate
       calculateDueDate()
@@ -587,8 +652,7 @@ onMounted(() => {
   padding: 20px;
 }
 
-.filter-container {
-}
+.filter-container {}
 
 .operation-container {
   margin-bottom: 15px;