sale-client 4.2.35 → 4.2.37

package/hs_err_pid36896.log

@@ -0,0 +1,249 @@
+#
+# There is insufficient memory for the Java Runtime Environment to continue.
+# Native memory allocation (mmap) failed to map 268435456 bytes for G1 virtual space
+# Possible reasons:
+#   The system is out of physical RAM or swap space
+#   The process is running with CompressedOops enabled, and the Java Heap may be blocking the growth of the native heap
+# Possible solutions:
+#   Reduce memory load on the system
+#   Increase physical memory or swap space
+#   Check if swap backing store is full
+#   Decrease Java heap size (-Xmx/-Xms)
+#   Decrease number of Java threads
+#   Decrease Java thread stack sizes (-Xss)
+#   Set larger code cache with -XX:ReservedCodeCacheSize=
+#   JVM is running with Zero Based Compressed Oops mode in which the Java heap is
+#     placed in the first 32GB address space. The Java Heap base address is the
+#     maximum limit for the native heap growth. Please use -XX:HeapBaseMinAddress
+#     to set the Java Heap base and to place the Java Heap above 32GB virtual address.
+# This output file may be truncated or incomplete.
+#
+#  Out of Memory Error (os_windows.cpp:3825), pid=36896, tid=34248
+#
+# JRE version:  (17.0.10+1) (build )
+# Java VM: OpenJDK 64-Bit Server VM (17.0.10+1-b1207.14, mixed mode, sharing, tiered, compressed oops, compressed class ptrs, g1 gc, windows-amd64)
+# No core dump will be written. Minidumps are not enabled by default on client versions of Windows
+#
+
+---------------  S U M M A R Y ------------
+
+Command Line: git4idea.http.GitAskPassApp Username for 'http://192.168.0.167:32573': 
+
+Host: Intel(R) Core(TM) i5-9300H CPU @ 2.40GHz, 8 cores, 15G,  Windows 11 , 64 bit Build 22621 (10.0.22621.3958)
+Time: Mon Nov 11 18:29:59 2024  Windows 11 , 64 bit Build 22621 (10.0.22621.3958) elapsed time: 0.034835 seconds (0d 0h 0m 0s)
+
+---------------  T H R E A D  ---------------
+
+Current thread (0x00000213694bdf80):  JavaThread "Unknown thread" [_thread_in_vm, id=34248, stack(0x000000823b100000,0x000000823b200000)]
+
+Stack: [0x000000823b100000,0x000000823b200000]
+Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
+V  [jvm.dll+0x687989]
+V  [jvm.dll+0x84116a]
+V  [jvm.dll+0x842dae]
+V  [jvm.dll+0x843413]
+V  [jvm.dll+0x249ccf]
+V  [jvm.dll+0x684759]
+V  [jvm.dll+0x67900a]
+V  [jvm.dll+0x30ab0b]
+V  [jvm.dll+0x311fb6]
+V  [jvm.dll+0x361d5e]
+V  [jvm.dll+0x361f8f]
+V  [jvm.dll+0x2e07f8]
+V  [jvm.dll+0x2e1764]
+V  [jvm.dll+0x811c31]
+V  [jvm.dll+0x36fc11]
+V  [jvm.dll+0x7f0666]
+V  [jvm.dll+0x3f3daf]
+V  [jvm.dll+0x3f5a41]
+C  [jli.dll+0x528f]
+C  [ucrtbase.dll+0x29333]
+C  [KERNEL32.DLL+0x1257d]
+C  [ntdll.dll+0x5af08]
+
+
+---------------  P R O C E S S  ---------------
+
+Threads class SMR info:
+_java_thread_list=0x00007ffd188fdf58, length=0, elements={
+}
+
+Java Threads: ( => current thread )
+
+Other Threads:
+  0x000002136952ce20 GCTaskThread "GC Thread#0" [stack: 0x000000823b200000,0x000000823b300000] [id=30896]
+  0x000002136953db50 ConcurrentGCThread "G1 Main Marker" [stack: 0x000000823b300000,0x000000823b400000] [id=31112]
+  0x000002136953e480 ConcurrentGCThread "G1 Conc#0" [stack: 0x000000823b400000,0x000000823b500000] [id=36060]
+
+[error occurred during error reporting (printing all threads), id 0xc0000005, EXCEPTION_ACCESS_VIOLATION (0xc0000005) at pc=0x00007ffd180b13c7]
+
+VM state: not at safepoint (not fully initialized)
+
+VM Mutex/Monitor currently owned by a thread:  ([mutex/lock_event])
+[0x00000213694b9a20] Heap_lock - owner thread: 0x00000213694bdf80
+
+Heap address: 0x0000000701200000, size: 4078 MB, Compressed Oops mode: Zero based, Oop shift amount: 3
+
+CDS archive(s) mapped at: [0x0000000000000000-0x0000000000000000-0x0000000000000000), size 0, SharedBaseAddress: 0x0000000800000000, ArchiveRelocationMode: 1.
+Narrow klass base: 0x0000000000000000, Narrow klass shift: 0, Narrow klass range: 0x0
+
+GC Precious Log:
+<Empty>
+
+Heap:
+ garbage-first heap   total 0K, used 0K [0x0000000701200000, 0x0000000800000000)
+  region size 2048K, 0 young (0K), 0 survivors (0K)
+ Metaspace       used 0K, committed 0K, reserved 0K
+  class space    used 0K, committed 0K, reserved 0K
+
+Heap Regions: E=young(eden), S=young(survivor), O=old, HS=humongous(starts), HC=humongous(continues), CS=collection set, F=free, OA=open archive, CA=closed archive, TAMS=top-at-mark-start (previous, next)
+
+Card table byte_map: [0x000002137c760000,0x000002137cf60000] _byte_map_base: 0x0000021378f57000
+
+Marking Bits (Prev, Next): (CMBitMap*) 0x000002136952d350, (CMBitMap*) 0x000002136952d390
+ Prev Bits: [0x0000021300000000, 0x0000021303fb8000)
+ Next Bits: [0x0000021303fc0000, 0x0000021307f78000)
+
+GC Heap History (0 events):
+No events
+
+Dll operation events (1 events):
+Event: 0.022 Loaded shared library D:\hiema\IntelliJ IDEA 2024.1.1\jbr\bin\java.dll
+
+Deoptimization events (0 events):
+No events
+
+Classes unloaded (0 events):
+No events
+
+Classes redefined (0 events):
+No events
+
+Internal exceptions (0 events):
+No events
+
+VM Operations (0 events):
+No events
+
+Events (0 events):
+No events
+
+
+Dynamic libraries:
+0x00007ff747e60000 - 0x00007ff747e6a000 	D:\hiema\IntelliJ IDEA 2024.1.1\jbr\bin\java.exe
+0x00007ffde9730000 - 0x00007ffde9947000 	C:\WINDOWS\SYSTEM32\ntdll.dll
+0x00007ffde7d00000 - 0x00007ffde7dc4000 	C:\WINDOWS\System32\KERNEL32.DLL
+0x00007ffde6b60000 - 0x00007ffde6f17000 	C:\WINDOWS\System32\KERNELBASE.dll
+0x00007ffde7340000 - 0x00007ffde7451000 	C:\WINDOWS\System32\ucrtbase.dll
+0x00007ffdc2aa0000 - 0x00007ffdc2ab7000 	D:\hiema\IntelliJ IDEA 2024.1.1\jbr\bin\jli.dll
+0x00007ffdd4a10000 - 0x00007ffdd4a2b000 	D:\hiema\IntelliJ IDEA 2024.1.1\jbr\bin\VCRUNTIME140.dll
+0x00007ffde7940000 - 0x00007ffde7aef000 	C:\WINDOWS\System32\USER32.dll
+0x00007ffde6f20000 - 0x00007ffde6f46000 	C:\WINDOWS\System32\win32u.dll
+0x00007ffde96c0000 - 0x00007ffde96e9000 	C:\WINDOWS\System32\GDI32.dll
+0x00007ffde6a40000 - 0x00007ffde6b58000 	C:\WINDOWS\System32\gdi32full.dll
+0x00007ffde6f50000 - 0x00007ffde6fea000 	C:\WINDOWS\System32\msvcp_win.dll
+0x00007ffdd12c0000 - 0x00007ffdd1553000 	C:\WINDOWS\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.22621.3672_none_2713b9d173822955\COMCTL32.dll
+0x00007ffde7af0000 - 0x00007ffde7b97000 	C:\WINDOWS\System32\msvcrt.dll
+0x00007ffde91d0000 - 0x00007ffde9201000 	C:\WINDOWS\System32\IMM32.DLL
+0x00007ffdde400000 - 0x00007ffdde40c000 	D:\hiema\IntelliJ IDEA 2024.1.1\jbr\bin\vcruntime140_1.dll
+0x00007ffd7e990000 - 0x00007ffd7ea1d000 	D:\hiema\IntelliJ IDEA 2024.1.1\jbr\bin\msvcp140.dll
+0x00007ffd17dc0000 - 0x00007ffd18a42000 	D:\hiema\IntelliJ IDEA 2024.1.1\jbr\bin\server\jvm.dll
+0x00007ffde7ec0000 - 0x00007ffde7f72000 	C:\WINDOWS\System32\ADVAPI32.dll
+0x00007ffde7890000 - 0x00007ffde7938000 	C:\WINDOWS\System32\sechost.dll
+0x00007ffde70b0000 - 0x00007ffde70d8000 	C:\WINDOWS\System32\bcrypt.dll
+0x00007ffde92f0000 - 0x00007ffde9404000 	C:\WINDOWS\System32\RPCRT4.dll
+0x00007ffde58f0000 - 0x00007ffde593d000 	C:\WINDOWS\SYSTEM32\POWRPROF.dll
+0x00007ffdc8fd0000 - 0x00007ffdc8fd9000 	C:\WINDOWS\SYSTEM32\WSOCK32.dll
+0x00007ffddfcc0000 - 0x00007ffddfcf4000 	C:\WINDOWS\SYSTEM32\WINMM.dll
+0x00007ffde9270000 - 0x00007ffde92e1000 	C:\WINDOWS\System32\WS2_32.dll
+0x00007ffddda10000 - 0x00007ffddda1a000 	C:\WINDOWS\SYSTEM32\VERSION.dll
+0x00007ffde58d0000 - 0x00007ffde58e3000 	C:\WINDOWS\SYSTEM32\UMPDC.dll
+0x00007ffde5b80000 - 0x00007ffde5b98000 	C:\WINDOWS\SYSTEM32\kernel.appcore.dll
+0x00007ffdde520000 - 0x00007ffdde52a000 	D:\hiema\IntelliJ IDEA 2024.1.1\jbr\bin\jimage.dll
+0x00007ffde4130000 - 0x00007ffde4362000 	C:\WINDOWS\SYSTEM32\DBGHELP.DLL
+0x00007ffde88a0000 - 0x00007ffde8c2e000 	C:\WINDOWS\System32\combase.dll
+0x00007ffde7790000 - 0x00007ffde7867000 	C:\WINDOWS\System32\OLEAUT32.dll
+0x00007ffdca2e0000 - 0x00007ffdca312000 	C:\WINDOWS\SYSTEM32\dbgcore.DLL
+0x00007ffde72c0000 - 0x00007ffde733b000 	C:\WINDOWS\System32\bcryptPrimitives.dll
+0x00007ffdb8650000 - 0x00007ffdb8675000 	D:\hiema\IntelliJ IDEA 2024.1.1\jbr\bin\java.dll
+
+dbghelp: loaded successfully - version: 4.0.5 - missing functions: none
+symbol engine: initialized successfully - sym options: 0x614 - pdb path: .;D:\hiema\IntelliJ IDEA 2024.1.1\jbr\bin;C:\WINDOWS\SYSTEM32;C:\WINDOWS\WinSxS\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.22621.3672_none_2713b9d173822955;D:\hiema\IntelliJ IDEA 2024.1.1\jbr\bin\server
+
+VM Arguments:
+java_command: git4idea.http.GitAskPassApp Username for 'http://192.168.0.167:32573': 
+java_class_path (initial): D:/hiema/IntelliJ IDEA 2024.1.1/plugins/vcs-git/lib/git4idea-rt.jar;D:/hiema/IntelliJ IDEA 2024.1.1/lib/externalProcess-rt.jar
+Launcher Type: SUN_STANDARD
+
+[Global flags]
+     intx CICompilerCount                          = 4                                         {product} {ergonomic}
+     uint ConcGCThreads                            = 2                                         {product} {ergonomic}
+     uint G1ConcRefinementThreads                  = 8                                         {product} {ergonomic}
+   size_t G1HeapRegionSize                         = 2097152                                   {product} {ergonomic}
+    uintx GCDrainStackTargetSize                   = 64                                        {product} {ergonomic}
+   size_t InitialHeapSize                          = 268435456                                 {product} {ergonomic}
+   size_t MarkStackSize                            = 4194304                                   {product} {ergonomic}
+   size_t MaxHeapSize                              = 4276092928                                {product} {ergonomic}
+   size_t MinHeapDeltaBytes                        = 2097152                                   {product} {ergonomic}
+   size_t MinHeapSize                              = 8388608                                   {product} {ergonomic}
+    uintx NonNMethodCodeHeapSize                   = 5839372                                {pd product} {ergonomic}
+    uintx NonProfiledCodeHeapSize                  = 122909434                              {pd product} {ergonomic}
+    uintx ProfiledCodeHeapSize                     = 122909434                              {pd product} {ergonomic}
+    uintx ReservedCodeCacheSize                    = 251658240                              {pd product} {ergonomic}
+     bool SegmentedCodeCache                       = true                                      {product} {ergonomic}
+   size_t SoftMaxHeapSize                          = 4276092928                             {manageable} {ergonomic}
+     bool UseCompressedClassPointers               = true                           {product lp64_product} {ergonomic}
+     bool UseCompressedOops                        = true                           {product lp64_product} {ergonomic}
+     bool UseG1GC                                  = true                                      {product} {ergonomic}
+     bool UseLargePagesIndividualAllocation        = false                                  {pd product} {ergonomic}
+
+Logging:
+Log output configuration:
+ #0: stdout all=warning uptime,level,tags
+ #1: stderr all=off uptime,level,tags
+
+Environment Variables:
+JAVA_HOME=D:\hiema\jdk\jdk-21
+CLASSPATH=.;D:\hiema\jdk\jdk-21\lib\tools.jar;D:\hiema\jdk\jdk-21\lib\dt.jar;D:\hiema\jdk\jdk-21\lib;
+PATH=D:\hiema\Git\mingw64\libexec\git-core;D:\hiema\Git\mingw64\libexec\git-core;D:\hiema\Git\mingw64\bin;D:\hiema\Git\usr\bin;C:\Users\32999\bin;D:\hiema\jdk\jdk-21\bin;C:\Program Files (x86)\Common Files\Oracle\Java\javapath;D:\hiema\VMware\VMware Workstation\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0;C:\Windows\System32\OpenSSH;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;C:\Program Files\NVIDIA Corporation\NVIDIA NvDLISR;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0;C:\WINDOWS\System32\OpenSSH;D:\hiema\mysql-8.0.30-winx64\bin;C:\Program Files\dotnet;D:\software\video\ffmpeg-6.0-essentials_build\bin;D:\hiema\΢��web�����߹���\dll;D:\hiema\Git\cmd;D:\hiema\TortoiseGit\bin;D:\hiema\apache-maven-3.9.4\bin;D:\hiema\jdk\jdk-21\jre\bi;.;D:\hiema\gradle-3.5.1\bin;D:\hiema\nvm;D:\hiema\nodejs;C:\Program Files\OpenVPN\bin;C:\Program Files (x86)\nodejs;D:\hiema\Python\Python38\Scripts;D:\hiema\Python\Python38;C:\Users\32999\AppData\Local\Programs\Python\Launcher;C:\Users\32999\AppData\Local\Microsoft\WindowsApps;D:\hiema\Microsoft VS Code\bin;D:\hiema\IntelliJ IDEA 2022.3.3\bin;D:\hiema\nvm;D:\hiema\nodejs;C:\Users\32999\AppData\Roaming\npm
+USERNAME=32999
+DISPLAY=:0.0
+LC_ALL=en_US.UTF-8
+TERM=xterm-256color
+TMPDIR=C:\Users\32999\AppData\Local\Temp
+OS=Windows_NT
+PROCESSOR_IDENTIFIER=Intel64 Family 6 Model 158 Stepping 10, GenuineIntel
+TMP=C:\Users\32999\AppData\Local\Temp
+TEMP=C:\Users\32999\AppData\Local\Temp
+
+
+
+Periodic native trim disabled
+
+JNI global refs:
+JNI global refs: 0, weak refs: 0
+
+JNI global refs memory usage: 0, weak refs: 0
+
+OOME stack traces (most recent first):
+Classloader memory used:
+
+
+---------------  S Y S T E M  ---------------
+
+OS:
+ Windows 11 , 64 bit Build 22621 (10.0.22621.3958)
+OS uptime: 5 days 0:23 hours
+
+CPU: total 8 (initial active 8) (4 cores per cpu, 2 threads per core) family 6 model 158 stepping 10 microcode 0xde, cx8, cmov, fxsr, ht, mmx, 3dnowpref, sse, sse2, sse3, ssse3, sse4.1, sse4.2, popcnt, lzcnt, tsc, tscinvbit, avx, avx2, aes, erms, clmul, bmi1, bmi2, adx, fma, vzeroupper, clflush, clflushopt
+Processor Information for all 8 processors :
+  Max Mhz: 2400, Current Mhz: 2400, Mhz Limit: 2400
+
+Memory: 4k page, system-wide physical 16304M (351M free)
+TotalPageFile size 35504M (AvailPageFile size 55M)
+current process WorkingSet (physical memory assigned to process): 11M, peak: 11M
+current process commit charge ("private bytes"): 60M, peak: 316M
+
+vm_info: OpenJDK 64-Bit Server VM (17.0.10+1-b1207.14) for windows-amd64 JRE (17.0.10+1-b1207.14), built on 2024-04-05 by "builduser" with MS VC++ 16.10 / 16.11 (VS2019)
+
+END.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "4.2.35",
+  "version": "4.2.37",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/filiale/bazhong/UserInfoDetailManageNew.vue

@@ -0,0 +1,245 @@
+<template>
+  <div class="binary flex">
+    <div class="row binary-left flex" style="width:99%;height:98%;margin-bottom:0">
+      <div class="auto">
+        <user-base-info-new :row="row"
+                            :buttonshow="buttonshow"
+                            @refresh="search"
+                            @cancel-main="cancel"
+                            @cancel-re="cancelRe"
+                            @search-main="search">
+        </user-base-info-new>
+      </div>
+      <saletabbut v-if="row" v-ref:list style="height:72%;margin-top: 1%;overflow-y: scroll">
+        <saletab header="流水查询" v-if="permission('流水查询')">
+          <record-query-user :row="row"></record-query-user>
+        </saletab>
+        <saletab header="机表流水查询" v-if="permission('机表流水查询') && row.f_meter_type.includes('机表')">
+          <machine-record-query :row="row" v-if="show === '机表流水查询'" @deal-msg="dealMsg"></machine-record-query>
+        </saletab>
+        <saletab header="收费查询" v-if="!newWebHand && permission('收费查询')">
+          <charge-query-user :row="row" v-if="show === '收费查询'" @deal-msg="dealMsg"></charge-query-user>
+        </saletab>
+        <saletab header="收费查询" v-if="newWebHand && permission('收费查询')">
+          <charge-query-user :row="row" v-if="show === '收费查询'" @deal-msg="dealMsg"></charge-query-user>
+        </saletab>
+        <saletab header="累购查询" v-if="permission('累购查询')">
+          <Repurchase :row="row" v-if="show === '累购查询'" @deal-msg="dealMsg"></Repurchase>
+        </saletab>
+        <saletab header="下账查询" v-if="!newWebHand && row.f_meter_type.includes('物联网表') && permission('自动下账查询')">
+          <automatic-purse :row="row" @deal-msg="dealMsg"></automatic-purse>
+        </saletab>
+        <saletab header="下账查询" v-if="newWebHand && row.f_meter_type.includes('物联网表') && permission('自动下账查询')">
+          <web-automatic-purse :row="row" @deal-msg="dealMsg"></web-automatic-purse>
+        </saletab>
+        <saletab header="抄表记录" v-if="row.f_meter_type.includes('卡表') && permission('抄表记录')">
+          <card-hand-record :row="row" v-if="show === '抄表记录'" @deal-msg="dealMsg"></card-hand-record>
+        </saletab>
+        <saletab header="抄表记录" v-if="!newWebHand && !row.f_meter_type.includes('卡表') && permission('抄表记录')">
+          <hand-query-user :row="row" v-if="show === '抄表记录'" @deal-msg="dealMsg"></hand-query-user>
+        </saletab>
+        <saletab header="抄表记录" v-if="newWebHand && !row.f_meter_type.includes('卡表') && permission('抄表记录')">
+          <web-hand-query-user :row="row" v-if="show === '抄表记录'" @deal-msg="dealMsg"></web-hand-query-user>
+        </saletab>
+        <saletab header="补卡查询" v-if="row.f_meter_type.includes('卡表') && permission('补卡查询')">
+          <fill-card-query-user :row="row" v-if="show === '补卡查询'" @deal-msg="dealMsg"></fill-card-query-user>
+        </saletab>
+        <saletab header="补气查询" v-if="permission('补气查询')">
+          <fill-gas-query-user :row="row" v-if="show === '补气查询'" @deal-msg="dealMsg"></fill-gas-query-user>
+        </saletab>
+        <saletab header="换表查询" v-if="permission('换表查询')">
+          <change-meter-query-user :row="row" v-if="show === '换表查询'" @deal-msg="dealMsg"></change-meter-query-user>
+        </saletab>
+        <saletab header="其他收费" v-if="permission('其他收费')">
+          <other-charge-query-user :row="row" v-if="show === '其他收费'" @deal-msg="dealMsg"></other-charge-query-user>
+        </saletab>
+        <saletab header="保险收费记录" v-if="permission('保险收费记录')">
+          <insurance-charges-record :row="row" @deal-msg="dealMsg"></insurance-charges-record>
+        </saletab>
+        <saletab header="垃圾费收费记录" v-if="permission('垃圾费收费记录')">
+          <garbage-record-list :row="row" @deal-msg="dealMsg"></garbage-record-list>
+        </saletab>
+        <saletab header="过户查询" v-if="permission('过户查询')">
+          <transfer-query-user :row="row" v-if="show === '过户查询'" @deal-msg="dealMsg"></transfer-query-user>
+        </saletab>
+        <saletab header="价格调整" v-if="permission('价格调整')">
+          <price-change-query-user :row="row" v-if="show === '价格调整'" @deal-msg="dealMsg"></price-change-query-user>
+        </saletab>
+        <saletab header="附件查看" v-if="permission('附件查看')">
+          <upload-file-history :row="row" v-if="show === '附件查看'" @deal-msg="dealMsg"></upload-file-history>
+        </saletab>
+        <saletab header="变更记录" v-if="permission('变更记录')">
+          <change-record :row="row" v-if="show === '变更记录'" @deal-msg="dealMsg"></change-record>
+        </saletab>
+        <saletab header="指令查看" v-if="row.f_meter_type.includes('物联网表') && permission('指令查看')">
+          <query-instruct :row="row" v-if="show === '指令查看'" @deal-msg="dealMsg"></query-instruct>
+        </saletab>
+        <saletab header="历史指令查看" v-if="row.f_meter_type.includes('物联网表') && permission('历史指令查看')">
+          <query-history-instruct :row="row" v-if="show === '历史指令查看'" @deal-msg="dealMsg"></query-history-instruct>
+        </saletab>
+        <saletab header="异常报警" v-if="row.f_meter_type.includes('物联网表') && permission('异常报警')">
+          <watch-warning :row="row" v-if="show === '异常报警'" @deal-msg="dealMsg"></watch-warning>
+        </saletab>
+        <saletab header="表具采集" v-if="row.f_meter_type.includes('物联网表') && permission('表具采集')">
+          <watch-collection :row="row" v-if="show === '表具采集'" @deal-msg="dealMsg"></watch-collection>
+        </saletab>
+        <saletab header="调价补差" v-if="permission('调价补差')">
+          <price-adjustment-query-user :row="row" v-if="show === '调价补差'" @deal-msg="dealMsg"></price-adjustment-query-user>
+        </saletab>
+        <saletab header="设备查询" v-if="permission('设备查询')">
+          <deveice-record :row="row" v-if="show === '设备查询'" @deal-msg="dealMsg"></deveice-record>
+        </saletab>
+        <saletab header="流量计参数查看" v-if="permission('流量计参数查看')">
+          <meter-param :row="row" v-if="show === '流量计参数查看'" @deal-msg="dealMsg"></meter-param>
+        </saletab>
+        <saletab header="表使用量图表" v-if="permission('流量计参数查看')">
+          <table-usage-chart :row="row" v-if="show === '表使用量图表'" @deal-msg="dealMsg"></table-usage-chart>
+        </saletab>
+        <saletab header="用户设备查询" v-if="permission('用户设备查看')">
+          <user-device-query :row="row" v-if="show === '用户设备查询'" @deal-msg="dealMsg"></user-device-query>
+        </saletab>
+        <saletab header="合同查看" v-if="permission('合同查看')">
+          <contract-signing-list :row="row" v-if="show === '合同查看'" @deal-msg="dealMsg"></contract-signing-list>
+        </saletab>
+        <saletab header="用户重点记录" v-if="permission('用户重点记录')">
+          <user-key-record :row="row" @deal-msg="dealMsg"></user-key-record>
+        </saletab>
+        <saletab header="维修记录" v-if="permission('维修记录')">
+          <repair-list :row="row" @deal-msg="dealMsg"></repair-list>
+        </saletab>
+        <saletab header="安检记录" v-if="permission('安检记录')">
+          <security-check-info :row="row" @deal-msg="dealMsg"></security-check-info>
+        </saletab>
+      </saletabbut>
+    </div>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass} from 'vue-client'
+// 导入IC卡相关查询界面
+import ChangeMeterQueryUser from './ic_detail/ChangeMeterQueryUser.vue'
+import ChargeQueryUser from '../../components/common/userinfo_detail/ic_detail/ChargeQueryUser.vue'
+import ChargeRecordQueryUser from '../../components/common/userinfo_detail/ic_detail/ChargeRecordQuery.vue'
+import FillCardQueryUser from '../../components/common/userinfo_detail/ic_detail/FillCardQueryUser.vue'
+import HandQueryUser from '../../components/common/userinfo_detail/ic_detail/HandQueryUser.vue'
+import OtherChargeQueryUser from '../../components/common/userinfo_detail/ic_detail/OtherChargeQueryUser.vue'
+import RecordQueryUser from '../../components/common/userinfo_detail/ic_detail/RecordQueryUser.vue'
+import TransferQueryUser from '../../components/common/userinfo_detail/ic_detail/TransferQueryUser.vue'
+import CardHandRecord from '../../components/common/userinfo_detail/ic_detail/CardHandRecord.vue'
+import AutomaticPurse from '../../components/common/userinfo_detail/ic_detail/AutomaticPurse.vue'
+import Repurchase from '../../components/common/userinfo_detail/ic_detail/Repurchase.vue'
+import MachineRecordQuery from '../../components/common/userinfo_detail/ic_detail/MachineRecordQuery.vue'
+import WebAutomaticPurse from '../../components/common/userinfo_detail/ic_detail/WebAutomaticPurse.vue'
+import WebChargeQueryUser from '../../components/common/userinfo_detail/ic_detail/WebChargeQueryUser.vue'
+import WebHandQueryUser from '../../components/common/userinfo_detail/ic_detail/WebHandQueryUser.vue'
+import UserDeviceQuery from '../../components/common/userinfo_detail/ic_detail/UserDeviceQuery.vue'
+import contractSigningList from '../../components/common/userinfo_detail/ic_detail/contractSigningList.vue'
+import UserKeyRecord from '../../components/common/userinfo_detail/ic_detail/UserKeyRecord.vue'
+import RepairList from '../../components/common/userinfo_detail/ic_detail/RepairList.vue'
+import SecurityCheckInfo from '../../components/common/userinfo_detail/ic_detail/SecuritycheckInfo.vue'
+// 导入物联网相关查询
+import QueryInstruct from '../../components/common/userinfo_detail/iot_detail/QueryInstruct.vue'
+import QueryHistoryInstruct from '../../components/common/userinfo_detail/iot_detail/QueryHistoryInstruct.vue'
+import WatchCollection from '../../components/common/userinfo_detail/iot_detail/WatchCollection.vue'
+import WatchWarning from '../../components/common/userinfo_detail/iot_detail/WatchWarning.vue'
+import PriceChangeQueryUser from '../../components/common/userinfo_detail/ic_detail/PriceChangeQueryUser.vue'
+import ChangeRecord from '../../components/common/userinfo_detail/ic_detail/ChangeRecord.vue'
+import PriceAdjustmentQueryUser from '../../components/common/userinfo_detail/ic_detail/PriceAdjustmentQueryUser.vue'
+import MeterParam from '../../components/common/userinfo_detail/ic_detail/MeterParam.vue'
+import DeveiceRecord from '../../components/common/userinfo_detail/ic_detail/DeveiceRecord.vue'
+import GarbageRecordList from '../../components/common/userinfo_detail/ic_detail/GarbageRecordList.vue'
+import InsuranceChargesRecord from '../../components/common/userinfo_detail/ic_detail/InsuranceChargesRecord.vue'
+
+export default {
+  title: '用户详细信息',
+  props: ['f_userfiles_id', 'f_userinfo_id', 'f_userinfo_code', 'parentname', 'buttonshow'],
+  components: {
+    InsuranceChargesRecord,
+    GarbageRecordList,
+    SecurityCheckInfo,
+    RepairList,
+    PriceAdjustmentQueryUser,
+    PriceChangeQueryUser,
+    AutomaticPurse,
+    WebAutomaticPurse,
+    WebChargeQueryUser,
+    WebHandQueryUser,
+    Repurchase,
+    ChangeMeterQueryUser,
+    ChargeQueryUser,
+    ChargeRecordQueryUser,
+    FillCardQueryUser,
+    HandQueryUser,
+    OtherChargeQueryUser,
+    RecordQueryUser,
+    TransferQueryUser,
+    WatchWarning,
+    WatchCollection,
+    QueryInstruct,
+    QueryHistoryInstruct,
+    ChangeRecord,
+    CardHandRecord,
+    MeterParam,
+    DeveiceRecord,
+    MachineRecordQuery,
+    UserDeviceQuery,
+    contractSigningList,
+    UserKeyRecord
+  },
+  data () {
+    return {
+      row: null,
+      name: '自动下账查询',
+      newWebHand: this.$appdata.getSingleValue('新抄表'),
+      show: ''
+    }
+  },
+  ready () {
+    this.search()
+    console.log(this.$login)
+  },
+  methods: {
+    permission (name) {
+      if (this.$login.r.find(value => value == '收费综合查询')) {
+        if (!this.$login.r.find(value => value == name)) {
+          return false
+        }
+      }
+      return true
+    },
+    async search () {
+      let http = new HttpResetClass()
+      if (!this.f_userfiles_id && !this.f_userinfo_id && !this.f_userinfo_code) {
+        this.$showMessage('用户信息缺失，查询详情信息失败')
+        return
+      }
+      let getBaseInfo = await http.load('POST', 'api/af-revenue/logic/iot_getUserBaseData',
+        {
+          data: {
+            f_userfiles_id: this.f_userfiles_id,
+            f_userinfo_id: this.f_userinfo_id,
+            f_userinfo_code: this.f_userinfo_code
+          }
+        }, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
+      this.row = getBaseInfo.data
+      this.row.parentname = this.parentname || ''
+    },
+    cancel (val) {
+      // 判断当前是否在 iframe 环境中
+      this.$emit('cancel-main', val)
+    },
+    cancelRe (val) {
+      this.$emit('cancel-re', val)
+    },
+    butOper (val) {
+      this.name = val
+    }
+  },
+  watch: {
+    'f_userinfo_id' () {
+      this.search()
+    }
+  }
+}
+</script>