From b8ac379c1bbce57d18ae6f5891111b98b21e3592 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Fri, 1 Aug 2025 16:07:20 +0800
Subject: [PATCH] v1.9 优化缴费页面扫码缴费

---
 src/components/inspection/addInspectionPoint.vue | 20 +++++++++++++-------
 src/components/inspection/machineSelect2.vue     |  2 +-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/components/inspection/addInspectionPoint.vue b/src/components/inspection/addInspectionPoint.vue
index fa2112e..b83a34d 100644
--- a/src/components/inspection/addInspectionPoint.vue
+++ b/src/components/inspection/addInspectionPoint.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog :title="$t('addInspectionPoint.title')" :visible.sync="dialogVisible" width="60%" top="5vh"
     @close="resetForm">
-    <el-form ref="addForm" :model="addInspectionPointInfo" :rules="rules" label-width="120px" label-position="right">
+    <el-form ref="addForm" :model="addInspectionPointInfo" class="text-left" :rules="rules" label-width="120px" label-position="right">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item :label="$t('addInspectionPoint.inspectionName')" prop="inspectionName">
@@ -31,7 +31,7 @@
       </el-row>
 
       <el-row :gutter="20" v-if="addInspectionPointInfo.pointObjType === '1001'">
-        <el-col :span="24">
+        <el-col :span="12">
           <el-form-item :label="$t('addInspectionPoint.machine')" prop="pointObjId">
             <machine-select2 ref="machineSelect" :parent-modal="true" @notify="handleMachineSelect" />
             <div class="tip-text">{{ $t('addInspectionPoint.tip.addMachine') }}</div>
@@ -157,9 +157,10 @@ export default {
     open() {
       this.dialogVisible = true
       this.resetForm()
+      this.getDictData()
+
       this.$nextTick(() => {
         this.initMap()
-        this.getDictData()
         this._listAddInspectionItems()
       })
     },
@@ -168,6 +169,7 @@ export default {
       try {
         const data = await getDict('inspection_point', 'point_obj_type')
         this.addInspectionPointInfo.pointObjTypes = data
+        console.log(this.addInspectionPointInfo.pointObjTypes)
       } catch (error) {
         console.error('获取字典数据失败:', error)
       }
@@ -200,7 +202,9 @@ export default {
       this.addInspectionPointInfo.pointObjName = ''
 
       if (this.addInspectionPointInfo.pointObjType === '1001') {
-        this.$refs.machineSelect.clearMachine()
+        setTimeout(() => {
+          this.$refs.machineSelect.searchMachines()
+        }, 500)
       }
     },
 
@@ -266,9 +270,11 @@ export default {
         this.$refs.addForm.resetFields()
       }
 
-      if (this.$refs.machineSelect) {
-        this.$refs.machineSelect.clearMachine()
-      }
+      setTimeout(() => {
+        if (this.$refs.machineSelect) {
+          this.$refs.machineSelect.clearMachine()
+        }
+      }, 500)
     },
     handlePositionChange(data) {
       this.addInspectionPointInfo.lng = data.lng
diff --git a/src/components/inspection/machineSelect2.vue b/src/components/inspection/machineSelect2.vue
index ff861c1..fdfb908 100644
--- a/src/components/inspection/machineSelect2.vue
+++ b/src/components/inspection/machineSelect2.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script>
-import { listEquipmentAccount } from '@/api/inspection/inspectionPointApi'
+import { listEquipmentAccount } from '@/api/inspection/addMaintainancePlanApi'
 import { getCommunityId } from '@/api/community/communityApi'
 
 export default {
--
libgit2 0.21.4