vue2-client 1.21.14 → 1.22.1

package/package.json

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

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

@@ -20,7 +20,7 @@
             @onLocalSubmit="onLocalSubmit"
             @x-form-item-emit-func="emitFunc"
             @afterSubmit="onAddOrEditSubmitAfterSubmit"
-            @onSubmit="$listeners.addFormSubmit"
+            @onSubmit="onAddFormSubmit"
           >
             <template slot="groupFormItems" slot-scope="{ form, model, rules, modifyModelData }">
               <slot
@@ -877,6 +877,16 @@ export default {
         this.initConfig()
       }
     },
+    /**
+     * 新增/修改表单提交（未自定义 addFormSubmit 时走默认提交）
+     */
+    onAddFormSubmit (params, modalClose) {
+      if (this.$listeners.addFormSubmit) {
+        this.$listeners.addFormSubmit(params, modalClose)
+        return
+      }
+      this.$refs.xAddForm.$refs.nativeForm.defaultSubmit(params.realForm, modalClose)
+    },
     /**
      * 提交新增/修改表单后事件
      */

package/src/base-client/components/common/XInspectionDetailDrawer/index.vue

@@ -102,51 +102,53 @@
                       <div class="photos-header">
                         <div class="photos-title">
                           <a-icon type="picture" style="color: #1890FF;" />
-                          <span>安检照片</span>
-                        </div>
-                        <div class="photos-count" v-if="inspectionData.attachments.filePhotos && inspectionData.attachments.filePhotos.length > 0">
-                          共 {{ totalPhotos }} 张
+                          <span>拍照签名信息</span>
                         </div>
                       </div>
                       <div class="photos-content">
-                        <div class="subsection-label"><a-icon type="home" />整体安检照片</div>
-                        <file-image-group
-                          :file-ids="inspectionData.attachments.filePhotos || []"
-                          :service-name="effectiveServiceName"
-                          :columns="5"
-                          :image-size="60"
-                          :gap="10"
-                          alt-prefix="整体安检照片"
-                          empty-text="暂无整体安检照片"
-                        />
-                      </div>
-                      <div v-if="inspectionData?.attachments?.imagePhotos && inspectionData.attachments.imagePhotos.length > 0" class="photos-content">
-                        <div class="subsection-label"><a-icon type="file-protect" />
-                          {{safeCheckWebConfig?.safeCheckResult?.notificationName || '通知书照片'}}
-                        </div>
-                        <file-image-group
-                          :file-ids="inspectionData.attachments.imagePhotos || []"
-                          :service-name="effectiveServiceName"
-                          :columns="5"
-                          :image-size="60"
-                          :gap="10"
-                          :alt-prefix="safeCheckWebConfig?.safeCheckResult?.notificationName || '通知书照片'"
-                          :empty-text="`暂无${safeCheckWebConfig?.safeCheckResult?.notificationName  || '通知书照片'}`"
-                        />
-                      </div>
-                      <div v-if="inspectionData?.attachments?.contractPhotos && inspectionData.attachments.contractPhotos.length > 0" class="photos-content">
-                        <div class="subsection-label"><a-icon type="file" />
-                          {{safeCheckWebConfig?.safeCheckResult?.contractName || '合同照片'}}
-                        </div>
-                        <file-image-group
-                          :file-ids="inspectionData.attachments.contractPhotos || []"
-                          :service-name="effectiveServiceName"
-                          :columns="5"
-                          :image-size="60"
-                          :gap="10"
-                          :alt-prefix="safeCheckWebConfig?.safeCheckResult?.contractName || '合同照片'"
-                          :empty-text="`暂无${safeCheckWebConfig?.safeCheckResult?.contractName  || '合同照片'}`"
-                        />
+                        <template v-if="inspectionData.signatureForm && inspectionData.signatureForm.formConfig && inspectionData.signatureForm.formConfig.formJson">
+                          <template v-for="(field, fieldIndex) in inspectionData.signatureForm.formConfig.formJson">
+                            <div v-if="shouldShowField(field)" :key="fieldIndex" class="signature-field">
+                              <div class="field-label">
+                                <span class="field-name">{{ field.name }}</span>
+                              </div>
+                              <div class="field-value">
+                                <!-- file 类型 -->
+                                <template v-if="field.type === 'file'">
+                                  <file-image-group
+                                    v-if="getFieldFiles(field.model)"
+                                    :file-ids="getFieldFiles(field.model)"
+                                    :service-name="effectiveServiceName"
+                                    :columns="5"
+                                    :image-size="60"
+                                    :gap="10"
+                                    :alt-prefix="field.name"
+                                    :empty-text="`暂无${field.name}`"
+                                  />
+                                  <span v-else class="empty-text">暂无</span>
+                                </template>
+                                <!-- image 类型 -->
+                                <template v-else-if="field.type === 'image'">
+                                  <file-image-group
+                                    v-if="getFieldImages(field.model)"
+                                    :file-ids="getFieldImages(field.model)"
+                                    :service-name="effectiveServiceName"
+                                    :columns="5"
+                                    :image-size="60"
+                                    :gap="10"
+                                    :alt-prefix="field.name"
+                                    :empty-text="`暂无${field.name}`"
+                                  />
+                                  <span v-else class="empty-text">暂无</span>
+                                </template>
+                                <!-- select/其他文本类型 -->
+                                <template v-else>
+                                  <span class="text-value">{{ getFieldValue(field.model) || '暂无' }}</span>
+                                </template>
+                              </div>
+                            </div>
+                          </template>
+                        </template>
                       </div>
                     </div>
                   </div>
@@ -210,6 +212,7 @@ import { FileImageGroup } from '@vue2-client/base-client/components/common/FileI
 import ImagePreviewModal from '@vue2-client/base-client/components/common/ImagePreviewModal/ImagePreviewModal.vue'
 import { printWithHtmlToImage, exportToPDFWithJpeg } from '@vue2-client/utils/htmlToImage'
 import { runLogic } from '@vue2-client/services/api/common'
+import { executeStrFunctionByContext } from 'vue2-client/src/utils/runEvalFunction'
 
 export default {
   name: 'XInspectionDetailDrawer',
@@ -614,8 +617,69 @@ export default {
         deviceList: [],
         checkItems: [],
         hazardList: [],
-        attachments: { signature: null, recordings: [], filePhotos: [], imagePhotos:  [] }
+        attachments: { signature: null, recordings: [], filePhotos: [], imagePhotos: [] }
       }
+    },
+
+    /**
+     * 判断字段是否应该显示（根据 showFormItemFunc 条件）
+     */
+    shouldShowField (field) {
+      if (!field.showFormItemFunc) return true
+      try {
+        const formData = this.inspectionData.signatureForm || {}
+        const obj = executeStrFunctionByContext(this, field.showFormItemFunc, [
+          formData,
+          null,
+          field,
+          null,
+          'view',
+          null,
+          null
+        ])
+        // 判断是 bool 还是  obj  兼容
+        if (typeof obj === 'boolean') {
+          return obj
+        } else if (obj && typeof obj === 'object') {
+          console.warn('showFormItemFunc obj', obj)
+          // obj 是一个对象，并且不是数组
+          if (Object.prototype.hasOwnProperty.call(obj, 'show')) {
+            return obj?.show
+          }
+        }
+        return true
+      } catch (e) {
+        console.warn('showFormItemFunc 执行失败:', e)
+        return true
+      }
+    },
+
+    /**
+     * 获取字段对应的文本值
+     */
+    getFieldValue (modelName) {
+      if (!modelName || !this.inspectionData.signatureForm) return null
+      return this.inspectionData.signatureForm[modelName]
+    },
+
+    /**
+     * 获取 file 类型字段的文件列表
+     */
+    getFieldFiles (modelName) {
+      if (!modelName || !this.inspectionData.signatureForm) return null
+      const files = this.inspectionData.signatureForm[modelName]
+      if (!Array.isArray(files) || files.length === 0) return null
+      return files
+    },
+
+    /**
+     * 获取 image 类型字段的图片列表
+     */
+    getFieldImages (modelName) {
+      if (!modelName || !this.inspectionData.signatureForm) return null
+      const images = this.inspectionData.signatureForm[modelName]
+      if (!Array.isArray(images) || images.length === 0) return null
+      return images
     }
   }
 }
@@ -735,4 +799,37 @@ export default {
   .section-grid { grid-template-columns: 1fr; }
 }
 .subsection-label { display: flex; align-items: center; gap: 6px; font-size: 12px; color: #6b7280; font-weight: 500; margin-bottom: 12px; }
+
+.signature-field {
+  display: flex;
+  flex-direction: column;
+  margin-bottom: 16px;
+  padding: 12px;
+  background: #fafafa;
+  border-radius: 6px;
+  border: 1px solid #f0f0f0;
+
+  .field-label {
+    margin-bottom: 8px;
+
+    .field-name {
+      font-size: 14px;
+      font-weight: 600;
+      color: #1f2937;
+    }
+  }
+
+  .field-value {
+    .text-value {
+      font-size: 14px;
+      color: #6b7280;
+    }
+
+    .empty-text {
+      font-size: 14px;
+      color: #9ca3af;
+      font-style: italic;
+    }
+  }
+}
 </style>

package/src/base-client/components/common/XInspectionDetailDrawer/services/inspectionService.js

@@ -251,7 +251,8 @@ class InspectionService {
       deviceList: await this.extractDeviceList(checkResultJson),
       checkItems: this.extractCheckItems(checkResultJson),
       hazardList: this.transformDefectList(defectList),
-      attachments: this.extractAttachments(signatureForm)
+      attachments: this.extractAttachments(signatureForm),
+      signatureForm: signatureForm
     }
   }
 

package/src/pages/userInfoDetailManage/ApplySystemQuery/applySystemConfig.js

@@ -0,0 +1,4 @@
+export {
+  filterApplySubTabs,
+  canShowApplyTab
+} from '@vue2-client/pages/userInfoDetailManage/queryTabConfig'

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

@@ -0,0 +1,111 @@
+<template>
+  <div v-if="currUserInfo" class="user-detail-apply">
+    <h4 class="user-detail-apply-title">
+      报建系统记录
+      <span v-if="activeSubLabel" class="user-detail-apply-curr">{{ activeSubLabel }}</span>
+    </h4>
+    <a-tabs
+      :activeKey="activeSubKey"
+      class="user-detail-apply-tabs"
+      :tab-bar-gutter="8"
+      @change="changeSubTab"
+    >
+      <a-tab-pane v-for="sub in filteredSubTabs" :key="sub.key">
+        <span slot="tab" class="user-detail-apply-sub-tab">
+          <a-icon :type="sub.icon" />
+          {{ sub.label }}
+        </span>
+        <template v-if="activeSubKey === sub.key">
+          <component
+            :is="sub.component"
+            :currUserInfo="currUserInfo"
+          />
+        </template>
+      </a-tab-pane>
+    </a-tabs>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+import { filterApplySubTabs } from '@vue2-client/pages/userInfoDetailManage/ApplySystemQuery/applySystemConfig'
+import ApplyRecordQuery from '@vue2-client/pages/userInfoDetailManage/ApplyRecordQuery'
+
+export default {
+  name: 'ApplySystemQuery',
+  components: {
+    ApplyRecordQuery
+  },
+  props: {
+    currUserInfo: {
+      type: Object,
+      default: () => undefined
+    }
+  },
+  data () {
+    return {
+      activeSubKey: ''
+    }
+  },
+  watch: {
+    filteredSubTabs: {
+      immediate: true,
+      handler (tabs) {
+        if (!tabs.length) {
+          return
+        }
+        const valid = tabs.some(tab => tab.key === this.activeSubKey)
+        if (!valid) {
+          this.activeSubKey = tabs[0].key
+        }
+      }
+    }
+  },
+  computed: {
+    ...mapState('account', { login: 'login' }),
+    filteredSubTabs () {
+      return filterApplySubTabs(this.login)
+    },
+    activeSubLabel () {
+      const tab = this.filteredSubTabs.find(item => item.key === this.activeSubKey)
+      return tab?.label || ''
+    }
+  },
+  methods: {
+    changeSubTab (key) {
+      this.activeSubKey = key
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+.user-detail-apply-title {
+  margin: 0 0 16px;
+  padding-left: 12px;
+  border-left: 4px solid #1890ff;
+  font-size: 16px;
+  font-weight: 700;
+  color: rgba(0, 0, 0, 0.85);
+  line-height: 1.4;
+}
+
+.user-detail-apply-curr {
+  margin-left: 12px;
+  font-size: 13px;
+  font-weight: 400;
+  color: rgba(0, 0, 0, 0.45);
+}
+
+.user-detail-apply-tabs {
+  :deep(.ant-tabs-bar) {
+    margin-bottom: 16px;
+  }
+}
+
+.user-detail-apply-sub-tab {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+}
+</style>

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

@@ -0,0 +1,56 @@
+<template>
+  <user-detail-sub-tab-panel
+    title="档案维护记录"
+    :currUserInfo="currUserInfo"
+    :sub-tabs="subTabs"
+    :panel-components="panelComponents"
+    :filter-sub-tabs="filterSubTabs"
+  />
+</template>
+
+<script>
+import { mapState } from 'vuex'
+import UserDetailSubTabPanel from '@vue2-client/pages/userInfoDetailManage/UserDetailSubTabPanel'
+import InfoChangeRecordQuery from '@vue2-client/pages/userInfoDetailManage/InfoChangeRecordQuery'
+import UserPriceChangeQuery from '@vue2-client/pages/userInfoDetailManage/UserPriceChangeQuery'
+
+export default {
+  name: 'ArchiveMaintainQuery',
+  components: {
+    UserDetailSubTabPanel,
+    InfoChangeRecordQuery,
+    UserPriceChangeQuery
+  },
+  props: {
+    currUserInfo: {
+      type: Object,
+      default: () => undefined
+    }
+  },
+  data () {
+    return {
+      subTabs: [
+        { key: 'priceChange', label: '调价记录查询', icon: 'rise', component: 'UserPriceChangeQuery' },
+        { key: 'archiveChange', label: '档案变更记录', icon: 'form', component: 'InfoChangeRecordQuery', permission: '变更记录' }
+      ]
+    }
+  },
+  computed: {
+    ...mapState('account', { login: 'login' }),
+    panelComponents () {
+      return { InfoChangeRecordQuery, UserPriceChangeQuery }
+    }
+  },
+  methods: {
+    filterSubTabs (tabs) {
+      const roles = this.login?.r || []
+      return tabs.map(tab => {
+        if (tab.component && tab.permission && !roles.includes(tab.permission)) {
+          return { ...tab, component: null }
+        }
+        return tab
+      })
+    }
+  }
+}
+</script>

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

@@ -0,0 +1,20 @@
+<template>
+  <upload-files-history :currUserInfo="currUserInfo" />
+</template>
+
+<script>
+import uploadFilesHistory from '@vue2-client/pages/userInfoDetailManage/uploadFilesHistory'
+
+export default {
+  name: 'AttachmentSystemQuery',
+  components: {
+    uploadFilesHistory
+  },
+  props: {
+    currUserInfo: {
+      type: Object,
+      default: () => undefined
+    }
+  }
+}
+</script>