vue2-client 1.18.17 → 1.18.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.18.17",
+  "version": "1.18.19",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/HIS/HFormTable/HFormTable.vue

@@ -268,6 +268,24 @@ const isHiddenFunctionalArea = computed(() => {
     }
   }
 
+  // 修复数据量少时下拉框被挡住的问题：为表格内容区域设置最小高度
+  // 当表格有数据时，确保表格内容区域有足够高度，避免下拉框被挡住
+  // 注意：只在表格有数据时应用，避免空表格时显示问题
+  :deep(.table-wrapper) {
+    .ant-table:not(.ant-table-empty) {
+      .ant-table-content {
+        // 设置最小高度，确保即使数据少时也有足够空间显示下拉框
+        // 这个高度应该足够显示下拉框选项（通常下拉框高度约200-300px）
+        min-height: 300px;
+        
+        .ant-table-body {
+          // 确保表格体也有最小高度，保证滚动容器有足够空间
+          min-height: 250px;
+        }
+      }
+    }
+  }
+
   // 表格样式
   &.h-form-table-table {
     :deep(.ant-table-small .ant-table-fixed-header) {

package/src/base-client/components/common/XFormTable/XFormTable.vue

@@ -1009,7 +1009,24 @@ export default {
      * @param toFirstPage 是否到第一页
      */
     refresh (toFirstPage = true) {
-      this.$refs.xTable.refresh(toFirstPage)
+      if (this.tableShowMode === 'popup') {
+        this.tableModalVisible = true
+        this.$nextTick(() => {
+          // 等待 Modal 中的 x-table 渲染完成
+          if (this.$refs.xTable) {
+            // 如果有待初始化的配置，先初始化表格
+            if (this.pendingTableInit) {
+              this.$refs.xTable.init(this.pendingTableInit)
+              this.$emit('afterTableInit')
+              this.pendingTableInit = null
+            }
+            this.$refs.xTable.refresh(toFirstPage)
+            this.$refs.xTable.summaryUpdate = true
+          }
+        })
+      } else {
+        this.$refs.xTable.refresh(toFirstPage)
+      }
     },
     /**
      * 获取表格数据

package/src/components/xScrollBox/index.vue

@@ -7,6 +7,11 @@
 <script>
 export default {
   name: 'XScrollBox',
+  data () {
+    return {
+      scrollBoxRef: null
+    }
+  },
   computed: {
     // 判断当前是否为 blank 模式
     isBlankMode () {
@@ -30,6 +35,55 @@ export default {
         }
       }
     }
+  },
+  mounted () {
+    // 获取滚动容器引用
+    this.scrollBoxRef = this.$el
+  },
+  methods: {
+    /**
+     * 滚动到顶部
+     * @param {boolean} smooth - 是否平滑滚动，默认 true
+     */
+    scrollToTop (smooth = true) {
+      if (this.scrollBoxRef) {
+        this.scrollBoxRef.scrollTo({
+          top: 0,
+          left: 0,
+          behavior: smooth ? 'smooth' : 'auto'
+        })
+      }
+    },
+
+    /**
+     * 滚动到指定位置
+     * @param {number} top - 垂直位置
+     * @param {number} left - 水平位置，默认 0
+     * @param {boolean} smooth - 是否平滑滚动，默认 true
+     */
+    scrollTo (top, left = 0, smooth = true) {
+      if (this.scrollBoxRef) {
+        this.scrollBoxRef.scrollTo({
+          top,
+          left,
+          behavior: smooth ? 'smooth' : 'auto'
+        })
+      }
+    },
+
+    /**
+     * 获取当前滚动位置
+     * @returns {Object} - { scrollTop, scrollLeft }
+     */
+    getScrollPosition () {
+      if (this.scrollBoxRef) {
+        return {
+          scrollTop: this.scrollBoxRef.scrollTop,
+          scrollLeft: this.scrollBoxRef.scrollLeft
+        }
+      }
+      return { scrollTop: 0, scrollLeft: 0 }
+    }
   }
 }
 </script>

package/src/pages/userInfoDetailManage/ApplyRecordQuery/index.vue

@@ -0,0 +1,64 @@
+<template>
+  <a-card :bordered="false" v-if="currUserInfo">
+    <x-form-table
+      title="报建记录查询"
+      :queryParamsName="queryParamsName"
+      :fixedQueryForm="fixedQueryForm"
+      @action="action"
+      service-name="af-revenue"
+      ref="xFormTable">
+    </x-form-table>
+  </a-card>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+export default {
+  name: 'ApplyRecordQuery',
+  components: {
+    XFormTable: () => import('@vue2-client/base-client/components/common/XFormTable/XFormTable.vue')
+  },
+  data () {
+    return {
+      // 查询配置名称
+      queryParamsName: 'ApplyRecordQueryCRUD',
+      // 查询表单固定值
+      fixedQueryForm: { ab_f_userinfo_id: this.currUserInfo.f_userinfo_id },
+      // 是否显示详情抽屉
+      detailVisible: false,
+      // 当前记录
+      record: {}
+    }
+  },
+  props: {
+    currUserInfo: {
+      type: Object,
+      default: () => undefined
+    }
+  },
+  mounted () {
+    this.$refs.xFormTable.refresh(true)
+  },
+  methods: {
+    action (record, id, actionType) {
+      this.detailVisible = true
+      console.log('触发了详情操作', record, id, actionType)
+    },
+    onClose () {
+      this.detailVisible = false
+      // 关闭详情之后重新查询表单
+      this.$refs.xFormTable.refreshTable(true)
+    }
+  },
+
+  computed: {
+    ...mapState('account', { currUser: 'user' }),
+    ...mapState('setting', { isMobile: 'isMobile' })
+  },
+}
+</script>
+
+<style scoped>
+
+</style>

package/src/pages/userInfoDetailManage/SafeCheckPaperV3RecordQuery/index.vue

@@ -0,0 +1,64 @@
+<template>
+  <a-card :bordered="false" v-if="currUserInfo">
+    <x-form-table
+      title="安检记录查询"
+      :queryParamsName="queryParamsName"
+      :fixedQueryForm="fixedQueryForm"
+      @action="action"
+      service-name="af-revenue"
+      ref="xFormTable">
+    </x-form-table>
+  </a-card>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+export default {
+  name: 'SafeCheckPaperV3RecordQuery',
+  components: {
+    XFormTable: () => import('@vue2-client/base-client/components/common/XFormTable/XFormTable.vue')
+  },
+  data () {
+    return {
+      // 查询配置名称
+      queryParamsName: 'SafeCheckRecordQueryCRUD',
+      // 查询表单固定值
+      fixedQueryForm: { tcp_f_userinfoid: this.currUserInfo.f_userinfo_id },
+      // 是否显示详情抽屉
+      detailVisible: false,
+      // 当前记录
+      record: {}
+    }
+  },
+  props: {
+    currUserInfo: {
+      type: Object,
+      default: () => undefined
+    }
+  },
+  mounted () {
+    this.$refs.xFormTable.refresh(true)
+  },
+  methods: {
+    action (record, id, actionType) {
+      this.detailVisible = true
+      console.log('触发了详情操作', record, id, actionType)
+    },
+    onClose () {
+      this.detailVisible = false
+      // 关闭详情之后重新查询表单
+      this.$refs.xFormTable.refreshTable(true)
+    }
+  },
+
+  computed: {
+    ...mapState('account', { currUser: 'user' }),
+    ...mapState('setting', { isMobile: 'isMobile' })
+  },
+}
+</script>
+
+<style scoped>
+
+</style>

package/src/pages/userInfoDetailManage/TelephoneV3RecordQuery/index.vue

@@ -0,0 +1,64 @@
+<template>
+  <a-card :bordered="false" v-if="currUserInfo">
+    <x-form-table
+      title="工单记录查询"
+      :queryParamsName="queryParamsName"
+      :fixedQueryForm="fixedQueryForm"
+      @action="action"
+      service-name="af-revenue"
+      ref="xFormTable">
+    </x-form-table>
+  </a-card>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+export default {
+  name: 'TelephoneV3RecordQuery',
+  components: {
+    XFormTable: () => import('@vue2-client/base-client/components/common/XFormTable/XFormTable.vue')
+  },
+  data () {
+    return {
+      // 查询配置名称
+      queryParamsName: 'TelephoneRecordQueryCRUD',
+      // 查询表单固定值
+      fixedQueryForm: { ts_f_userinfo_id: this.currUserInfo.f_userinfo_id },
+      // 是否显示详情抽屉
+      detailVisible: false,
+      // 当前记录
+      record: {}
+    }
+  },
+  props: {
+    currUserInfo: {
+      type: Object,
+      default: () => undefined
+    }
+  },
+  mounted () {
+    this.$refs.xFormTable.refresh(true)
+  },
+  methods: {
+    action (record, id, actionType) {
+      this.detailVisible = true
+      console.log('触发了详情操作', record, id, actionType)
+    },
+    onClose () {
+      this.detailVisible = false
+      // 关闭详情之后重新查询表单
+      this.$refs.xFormTable.refreshTable(true)
+    }
+  },
+
+  computed: {
+    ...mapState('account', { currUser: 'user' }),
+    ...mapState('setting', { isMobile: 'isMobile' })
+  },
+}
+</script>
+
+<style scoped>
+
+</style>

package/src/pages/userInfoDetailManage/userInfoDetailQueryTabs.vue

@@ -37,6 +37,9 @@ import PriceAdjustments from '@vue2-client/pages/userInfoDetailManage/PriceAdjus
 import uploadFilesHistory from '@vue2-client/pages/userInfoDetailManage/uploadFilesHistory'
 import InsuranceDetailQuery from '@vue2-client/pages/userInfoDetailManage/InsuranceDetailQuery'
 import ExceptionRecordQuery from '@vue2-client/pages/userInfoDetailManage/ExceptionRecordQuery'
+import ApplyRecordQuery from '@vue2-client/pages/userInfoDetailManage/ApplyRecordQuery'
+import SafeCheckPaperV3RecordQuery from '@vue2-client/pages/userInfoDetailManage/SafeCheckPaperV3RecordQuery'
+import TelephoneV3RecordQuery from '@vue2-client/pages/userInfoDetailManage/TelephoneV3RecordQuery'
 export default {
   name: 'UserInfoDetailQueryTabs',
   components: {
@@ -60,7 +63,10 @@ export default {
     PriceAdjustments,
     uploadFilesHistory,
     InsuranceDetailQuery,
-    ExceptionRecordQuery
+    ExceptionRecordQuery,
+    ApplyRecordQuery,
+    SafeCheckPaperV3RecordQuery,
+    TelephoneV3RecordQuery
   },
   props: {
     userInfo: {
@@ -114,6 +120,9 @@ export default {
         { key: '16', label: '附件查看', permission: '附件查看', component: 'uploadFilesHistory' },
         { key: '17', label: '保险明细', permission: '保险明细', component: 'InsuranceDetailQuery' },
         { key: '18', label: '异常查看', permission: '异常查看', component: 'ExceptionRecordQuery', condition: () => this.userInfo?.f_meter_type === '物联网表' },
+        { key: '19', label: '报建查看', permission: '报建查看', component: 'ApplyRecordQuery' },
+        { key: '20', label: '安检查看', permission: '安检查看', component: 'SafeCheckPaperV3RecordQuery' },
+        { key: '21', label: '工单查看', permission: '工单查看', component: 'TelephoneV3RecordQuery' },
       ],
     }
   },