Merge branch 'equipManage' into dev

src/components/TreePositionSelect/index.vue

@@ -32,6 +32,7 @@ const emits = defineEmits(['update:modelValue', 'change'])
 const options = ref<any[]>([])
 const loading = ref(false)
 const selectedValue = ref<any[]>([])
+const dataLoaded = ref(false)
 
 const placeholder = computed(() => props.placeholder || '请选择安装位置')
 
@@ -43,13 +44,18 @@ const cascaderProps = {
 }
 
 const loadData = async () => {
+  if (dataLoaded.value) return
   loading.value = true
   try {
     const response = await treePosition()
     options.value = response.data || []
+    dataLoaded.value = true
+    
+    // 等待DOM更新后再设置选中值
+    await nextTick()
+    await nextTick()
     
     if (props.modelValue) {
-      await nextTick()
       updateSelectedValue(props.modelValue)
     }
   } catch (error) {
@@ -82,6 +88,7 @@ const findNodeByCode = (nodes: any[], code: string): any | null => {
 }
 
 const handleChange = (value: any) => {
+  console.log(value,"value")
   if (!value || value.length === 0) {
     selectedValue.value = []
     emits('update:modelValue', null)
@@ -112,15 +119,22 @@ const handleClear = () => {
   emits('change', null)
 }
 
-watch(() => props.modelValue, (newValue) => {
-  if (newValue && options.value.length > 0) {
-    updateSelectedValue(newValue)
+watch(() => props.modelValue, async (newValue) => {
+  if (newValue) {
+    if (!dataLoaded.value) {
+      await loadData()
+    } else {
+      await nextTick()
+      updateSelectedValue(newValue)
+    }
   }
-}, { deep: true })
+}, { deep: true, immediate: true })
 
 watch(() => options.value, (newOptions) => {
   if (newOptions.length > 0 && props.modelValue) {
-    updateSelectedValue(props.modelValue)
+    nextTick(() => {
+      updateSelectedValue(props.modelValue)
+    })
   }
 }, { immediate: false })
 

src/views/equipManage/equipLedger/index.vue

@@ -63,7 +63,7 @@
       <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>
+          }}{{ scope.row.regionalName ? '/' : '' }}{{ scope.row.channelName }}</span>
         </template>
       </el-table-column>
       <el-table-column label="使用状态" prop="usageStatus" align="center" min-width="100">
@@ -347,9 +347,9 @@ const form = reactive({
   inspectionSelfCheckDate: '',
   inspectionSelfCheckCycle: 0,
   nextInspectionDueDate: '',
-  inspectionTeamLeaderId: null,
-  inspectionTeamMember1Id: null,
-  inspectionTeamMember2Id: null,
+  inspectionTeamLeaderId: '',
+  inspectionTeamMember1Id: '',
+  inspectionTeamMember2Id: '',
   initialAcceptanceStatus: '',
   baseAttachmentList: [],
   equipmentInspectionRecordList: []
@@ -374,7 +374,7 @@ const upload = reactive({
   open: false,
   title: '',
   isUploading: false,
-  updateSupport: 0,
+  updateSupport: 1,
   headers: { Authorization: 'Bearer ' + getToken() },
   url: import.meta.env.VITE_APP_BASE_API + '/equipment/ledger/importData'
 })
@@ -425,14 +425,16 @@ function handleEdit(row) {
     if (!form.equipmentInspectionRecordList || !Array.isArray(form.equipmentInspectionRecordList)) {
       form.equipmentInspectionRecordList = []
     }
+    // form.installationLocation = [response.data.terminlCode, response.data.regionalCode, response.data.channelCode]
+ 
     form.installationLocation = {
       terminlCode: response.data.terminlCode,
       regionalCode: response.data.regionalCode,
       channelCode: response.data.channelCode
     }
-    form.inspectionTeamLeaderId = form.inspectionTeamLeaderId || null
-    form.inspectionTeamMember1Id = form.inspectionTeamMember1Id || null;
-    form.inspectionTeamMember2Id = form.inspectionTeamMember2Id || null;
+    form.inspectionTeamLeaderId = form.inspectionTeamLeaderId || ''
+    form.inspectionTeamMember1Id = form.inspectionTeamMember1Id || ''
+    form.inspectionTeamMember2Id = form.inspectionTeamMember2Id || ''
     formDisabled.value = false
     dialog.title = '编辑设备'
     dialog.visible = true
@@ -453,14 +455,16 @@ function handleDetail(row) {
     if (!form.equipmentInspectionRecordList || !Array.isArray(form.equipmentInspectionRecordList)) {
       form.equipmentInspectionRecordList = []
     }
+    // form.installationLocation = [response.data.terminlCode, response.data.regionalCode, response.data.channelCode]
+ 
     form.installationLocation = {
       terminlCode: response.data.terminlCode,
       regionalCode: response.data.regionalCode,
       channelCode: response.data.channelCode
     }
-    form.inspectionTeamLeaderId = form.inspectionTeamLeaderId || null
-    form.inspectionTeamMember1Id = form.inspectionTeamMember1Id || null;
-    form.inspectionTeamMember2Id = form.inspectionTeamMember2Id || null;
+    form.inspectionTeamLeaderId = form.inspectionTeamLeaderId || ''
+    form.inspectionTeamMember1Id = form.inspectionTeamMember1Id || ''
+    form.inspectionTeamMember2Id = form.inspectionTeamMember2Id || ''
     formDisabled.value = true
     dialog.title = '设备详情'
     dialog.visible = true
@@ -532,9 +536,9 @@ function resetForm() {
     inspectionSelfCheckDate: '',
     inspectionSelfCheckCycle: 0,
     nextInspectionDueDate: '',
-    inspectionTeamLeaderId: null,
-    inspectionTeamMember1Id: null,
-    inspectionTeamMember2Id: null,
+    inspectionTeamLeaderId: '',
+    inspectionTeamMember1Id: '',
+    inspectionTeamMember2Id: '',
     initialAcceptanceStatus: '',
     baseAttachmentList: [],
     equipmentInspectionRecordList: []
@@ -680,7 +684,8 @@ onMounted(() => {
 }
 
 :deep(.operation-column) {
-  background-color: transparent !important;
 
+  background-color: white !important;
+  z-index: 3;
 }
 </style>