vue2-client 1.20.37 → 1.20.38

package/package.json

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

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

@@ -152,7 +152,7 @@ export default {
   }
 }
 </script>
-<style>
+<style lang="less" scoped>
 .row {
   display: flex;
 

package/src/base-client/components/common/XDescriptions/XDescriptionsGroup.vue

@@ -44,10 +44,9 @@
             </template>
             <a-descriptions v-else-if="realDataItem.title" :column="isMobile ? 1 : column" :title="realDataItem.title">
               <a-descriptions-item
-                v-for="(item, index) in realDataItem.column"
+                v-for="(item, index) in visibleDescriptionFields(realDataItem.column)"
                 :key="index"
                 :span="item.span || 1"
-                v-if="shouldShowField(item, data)"
               >
                 <template #label>
                   {{ item.key }}
@@ -122,10 +121,9 @@
                   :title="tabMode === 'top' ? undefined : realData[activeTab].title"
                 >
                   <a-descriptions-item
-                    v-for="(fieldItem, fieldIndex) in realData[activeTab].column"
+                    v-for="(fieldItem, fieldIndex) in visibleDescriptionFields(realData[activeTab].column)"
                     :key="fieldIndex"
                     :span="fieldItem.span || 1"
-                    v-if="shouldShowField(fieldItem, data)"
                   >
                     <template #label>
                       {{ fieldItem.key }}
@@ -197,10 +195,9 @@
             </template>
             <a-descriptions v-else-if="realDataItem.title" :column="isMobile ? 1 : column" :title="realDataItem.title">
               <a-descriptions-item
-                v-for="(item, index) in realDataItem.column"
+                v-for="(item, index) in visibleDescriptionFields(realDataItem.column)"
                 :key="index"
                 :span="item.span || 1"
-                v-if="shouldShowField(item, data)"
               >
                 <template #label>
                   {{ item.key }}
@@ -499,6 +496,11 @@ export default {
         return true
       }
     },
+    /** 供模板循环使用，避免在同一元素上混用 v-for 与 v-if */
+    visibleDescriptionFields(column) {
+      if (!column?.length) return []
+      return column.filter(item => this.shouldShowField(item, this.data))
+    },
     // 获取字段样式
     getFieldStyle(field, data) {
       if (!field.styleFunc) return {}

package/src/pages/userInfoDetailManage/index.vue

@@ -11,6 +11,7 @@
       :closable="false"
       :visible="userInfoDetailVisible"
       @close="onClose">
+      <a-spin :spinning="detailLoading" tip="加载中..." style="min-height: 200px; display: block;">
       <a-page-header v-if="userInfoDetailVisible && userInfo" :title="`用户编号：${ userInfo ? userInfo.f_userinfo_code : '' }`">
         <x-descriptions
           :title="null"
@@ -33,6 +34,7 @@
           <a-button type="dashed" @click="refresh">刷新</a-button>
         </template>
       </a-page-header>
+      </a-spin>
     </a-drawer>
     <!-- 阀控管理弹框 -->
     <a-modal
@@ -136,6 +138,7 @@ export default {
       selectedOption: '手动',
       operateReason: '',
       operateReasonError: false,
+      detailLoading: false
     }
   },
   watch: {
@@ -158,10 +161,20 @@ export default {
         this.operateReasonError = false
       }
     },
-    refresh () {
-      return runLogic('getUserInfoDetailV4', this.userInfo, 'af-revenue').then(res => {
+    async fetchUserDetail () {
+      if (!this.userInfo) return
+      this.detailLoading = true
+      try {
+        const res = await runLogic('getUserInfoDetailV4', this.userInfo, 'af-revenue')
         this.userInfo = res
-      })
+      } catch (e) {
+        this.$message.error(e.message || '加载用户详情失败')
+      } finally {
+        this.detailLoading = false
+      }
+    },
+    refresh () {
+      return this.fetchUserDetail()
     },
     openUser () {
       this.$confirm({
@@ -193,9 +206,9 @@ export default {
     },
     async init (user) {
       this.userInfo = user
-      await this.refresh()
-      this.userInfoDetailVisible = true
       this.operateReasonError = false
+      this.userInfoDetailVisible = true
+      await this.fetchUserDetail()
     },
     onClose () {
       this.userInfoDetailVisible = false