Merge branch 'equipManage' into dev

src/components/UserSelect/index.vue

@@ -9,19 +9,17 @@
 </template>
 
 <script lang="ts" setup>
-import { onMounted, ref, watch, defineProps, defineEmits, onUnmounted } from 'vue'
+import { nextTick, onMounted, ref, watch, defineProps, defineEmits, onUnmounted } from 'vue'
 import { debounce } from 'lodash-es'
 import { listUser, getUser } from "@/api/system/user"
-import { unref } from 'vue'
 
 interface ListItem {
-  value: string
+  value: string | number
   label: string
 }
 
-// 定义组件属性
 const props = defineProps<{
-  modelValue: string | string[]
+  modelValue: string | string[] | number | number[]
   multiple?: boolean
   disabled?: boolean
   width?: string
@@ -29,19 +27,16 @@ const props = defineProps<{
   placeholder?: string
 }>()
 
-// 定义组件事件
 const emits = defineEmits(['update:modelValue'])
 
 const options = ref<ListItem[]>([])
 const loading = ref(false)
-const selectedValue = ref<string | string[]>(props.modelValue)
+const selectedValue = ref<string | string[] | number | number[]>(props.modelValue)
 
-// 根据用户ID列表获取用户信息
-const fetchUsersByIds = async (userIds: string[]) => {
+const fetchUsersByIds = async (userIds: (string | number)[]) => {
   if (!userIds || userIds.length === 0) return []
   try {
-    // 使用Promise.all并行获取每个用户的信息
-    const userPromises = userIds.map(userId => getUser(userId))
+    const userPromises = userIds.map(userId => getUser(String(userId)))
     const userResponses = await Promise.all(userPromises)
 
     return userResponses.map((response: any) => ({
@@ -54,17 +49,14 @@ const fetchUsersByIds = async (userIds: string[]) => {
   }
 }
 
-// 远程搜索方法
 const remoteMethod = async (query: string) => {
   if (query) {
     loading.value = true
     try {
-      // 调用远程接口获取数据
       const response = await listUser({ nickName: query })
-      // 假设接口返回的数据结构为 { data: [...] }，根据实际情况调整
       options.value = response.rows.map((item) => ({
-        value: item.userId, // 根据实际接口返回字段调整
-        label: item.nickName // 根据实际接口返回字段调整
+        value: item.userId,
+        label: item.nickName
       }))
     } catch (error) {
       console.error('远程搜索出错:', error)
@@ -76,39 +68,47 @@ const remoteMethod = async (query: string) => {
   }
 }
 
-// 防抖处理远程搜索
 const debouncedRemoteMethod = debounce(remoteMethod, 300)
-
-// 标记是否正在初始化回显，避免循环更新
 const isInitializing = ref(false)
 
-// 监听modelValue变化，有值时执行回显逻辑
+const hasValue = (value: any): boolean => {
+  if (value === null || value === undefined) return false
+  if (typeof value === 'string') return value.length > 0
+  if (Array.isArray(value)) return value.length > 0
+  if (typeof value === 'number') return true
+  return false
+}
+
+const initSelection = async (value: any) => {
+  if (!hasValue(value)) return
+  
+  isInitializing.value = true
+  try {
+    const userIds = Array.isArray(value) ? value : [value]
+    const userOptions = await fetchUsersByIds(userIds as (string | number)[])
+    options.value = userOptions
+    
+    await nextTick()
+    selectedValue.value = value
+  } catch (error) {
+    console.error('初始化选中失败:', error)
+  } finally {
+    isInitializing.value = false
+  }
+}
+
 watch(() => props.modelValue, async (newValue, oldValue) => {
-  // 只有当值从无到有或值发生变化时才执行回显
-  if (newValue && newValue.length > 0 && newValue !== oldValue) {
-    isInitializing.value = true
-    try {
-      const userIds = Array.isArray(newValue) ? newValue : [newValue]
-      const userOptions = await fetchUsersByIds(userIds)
-      options.value = userOptions
-      
-      // 设置选中值，但不触发更新事件
-      selectedValue.value = newValue
-    } finally {
-      isInitializing.value = false
-    }
+  if (hasValue(newValue) && newValue !== oldValue) {
+    await initSelection(newValue)
   }
 }, { immediate: true })
 
-// 监听选中值变化并触发更新事件
 watch(selectedValue, (newValue) => {
-  // 只有在非初始化状态下才触发更新事件
   if (!isInitializing.value) {
     emits('update:modelValue', newValue)
   }
 })
 
-// 组件销毁时清空数据
 onUnmounted(() => {
   options.value = []
   selectedValue.value = props.multiple ? [] : ''

src/views/equipManage/equipLedger/index.vue

@@ -6,6 +6,10 @@
         <el-form-item label="设备名称" prop="equipmentName">
           <el-input v-model="queryParams.equipmentName" placeholder="请输入设备名称" clearable style="width: 200px" />
         </el-form-item>
+
+        <el-form-item label="设备序列号" prop="equipmentSerialNumber">
+          <el-input v-model="queryParams.equipmentSerialNumber" placeholder="请输入设备序列号" clearable style="width: 200px" />
+        </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"
@@ -53,11 +57,13 @@
         </template>
       </el-table-column>
       <el-table-column label="设备名称" prop="equipmentName" align="center" min-width="150" show-overflow-tooltip />
+      <el-table-column label="设备种类" prop="equipmentType" align="center" min-width="120" 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">
-          <span>{{ scope.row.terminlName }}{{scope.row.terminlName?'/':''}}{{ scope.row.regionalName }}{{scope.row.regionalName?'/':''}}{{ scope.row.channelName }}</span>
+          <span>{{ scope.row.terminlName }}{{ scope.row.terminlName ? '/' : '' }}{{ scope.row.regionalName
+            }}{{ scope.row.regionalName ? '/' : '' }}{{ scope.row.channelName }}</span>
         </template>
       </el-table-column>
       <el-table-column label="使用状态" prop="usageStatus" align="center" min-width="100">
@@ -72,8 +78,8 @@
         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">
+      <el-table-column label="最近定检/自检到期日期" prop="nextInspectionDueDate" align="center" min-width="120" />
+      <el-table-column label="操作" align="center" width="220" fixed="right" class-name="operation-column">
         <template #default="scope">
           <el-button link type="primary" icon="View" @click="handleDetail(scope.row)">详情</el-button>
           <el-button link type="primary" icon="Edit" @click="handleEdit(scope.row)">编辑</el-button>
@@ -87,7 +93,8 @@
       v-model:limit="queryParams.pageSize" @pagination="getList" />
 
     <!-- 编辑/详情弹窗 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="1000px" :close-on-click-modal="false">
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="1000px" :close-on-click-modal="false"
+      destroy-on-close>
       <el-form :model="form" ref="formRef" :rules="rules" label-width="160px">
         <el-row :gutter="20">
           <el-col :span="12">
@@ -311,6 +318,8 @@ const queryParams = reactive({
   pageNum: 1,
   pageSize: 10,
   equipmentName: '',
+
+  equipmentSerialNumber: '',
   usageStatus: '',
   inspectionSelfCheckDate: '',
   inspectionTeamUserName: ''
@@ -338,9 +347,9 @@ const form = reactive({
   inspectionSelfCheckDate: '',
   inspectionSelfCheckCycle: 0,
   nextInspectionDueDate: '',
-  inspectionTeamLeaderId: '',
-  inspectionTeamMember1Id: '',
-  inspectionTeamMember2Id: '',
+  inspectionTeamLeaderId: null,
+  inspectionTeamMember1Id: null,
+  inspectionTeamMember2Id: null,
   initialAcceptanceStatus: '',
   baseAttachmentList: [],
   equipmentInspectionRecordList: []
@@ -421,9 +430,9 @@ function handleEdit(row) {
       regionalCode: response.data.regionalCode,
       channelCode: response.data.channelCode
     }
-    form.inspectionTeamLeaderId = form.inspectionTeamLeaderId || ''
-    form.inspectionTeamMember1Id = form.inspectionTeamMember1Id || ''
-    form.inspectionTeamMember2Id = form.inspectionTeamMember2Id || ''
+    form.inspectionTeamLeaderId = form.inspectionTeamLeaderId || null
+    form.inspectionTeamMember1Id = form.inspectionTeamMember1Id || null;
+    form.inspectionTeamMember2Id = form.inspectionTeamMember2Id || null;
     formDisabled.value = false
     dialog.title = '编辑设备'
     dialog.visible = true
@@ -449,9 +458,9 @@ function handleDetail(row) {
       regionalCode: response.data.regionalCode,
       channelCode: response.data.channelCode
     }
-    form.inspectionTeamLeaderId = form.inspectionTeamLeaderId || ''
-    form.inspectionTeamMember1Id = form.inspectionTeamMember1Id || ''
-    form.inspectionTeamMember2Id = form.inspectionTeamMember2Id || ''
+    form.inspectionTeamLeaderId = form.inspectionTeamLeaderId || null
+    form.inspectionTeamMember1Id = form.inspectionTeamMember1Id || null;
+    form.inspectionTeamMember2Id = form.inspectionTeamMember2Id || null;
     formDisabled.value = true
     dialog.title = '设备详情'
     dialog.visible = true
@@ -523,9 +532,9 @@ function resetForm() {
     inspectionSelfCheckDate: '',
     inspectionSelfCheckCycle: 0,
     nextInspectionDueDate: '',
-    inspectionTeamLeaderId: '',
-    inspectionTeamMember1Id: '',
-    inspectionTeamMember2Id: '',
+    inspectionTeamLeaderId: null,
+    inspectionTeamMember1Id: null,
+    inspectionTeamMember2Id: null,
     initialAcceptanceStatus: '',
     baseAttachmentList: [],
     equipmentInspectionRecordList: []
@@ -669,4 +678,9 @@ onMounted(() => {
 :deep(.row-yellow) {
   background-color: rgba(255, 206, 86, 0.3) !important;
 }
+
+:deep(.operation-column) {
+  background-color: transparent !important;
+
+}
 </style>