vue2-client 1.20.20 → 1.20.21

package/package.json

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

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

@@ -2,32 +2,51 @@
   <a-card :bordered="false">
     <x-form-table
       title="示例表单"
-      :queryParamsName="queryParamsName"
+      queryParamsName="scanCodeAndNFCRUD"
       :fixedAddForm="fixedAddForm"
       :externalSelectedRowKeys="selectedKeys"
+      :defaultPageSize="100"
+      :pageSizeArray="['100','200']"
       @action="action"
       @selectRow="selectRow"
       @columnClick="columnClick"
       @ceshi="ceshi"
-      @rowDblClick="rowDblClick"
-      :defaultPageSize="5"
-      serviceName="af-revenue"
+      @startService="startService"
+      serviceName="af-safecheck"
       ref="xFormTable"
       :reserveSpaceForButtons="true"
-      @addFormSubmit="addFormSubmit"
-    ></x-form-table>
+    >
+    </x-form-table>
+    <a-modal
+      v-model="formModalVisible"
+      title="工单回访"
+      :zIndex="1002"
+      width="50vw"
+      :destroy-on-close="true"
+      @cancel="formModalVisible = false"
+      @ok="ok"
+    >
+      <x-add-native-form
+        ref="xForm"
+      />
+    </a-modal>
+    <button @click="backDealData">提交</button>
   </a-card>
 </template>
 
 <script>
 import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable.vue'
+import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
 import { microDispatch } from '@vue2-client/utils/microAppUtils'
+import {getConfigByNameAsync, runLogic} from '@vue2-client/services/api/common'
+
 export default {
   name: 'Demo',
   components: {
-    XFormTable
+    XFormTable,
+    XAddNativeForm,
   },
-  data() {
+  data () {
     return {
       // 查询配置文件名
       queryParamsName: 'ceshiCRUD',
@@ -43,26 +62,32 @@ export default {
       selectedKeys: [],
       selected: {
         keys: [],
-        rows: []
-      }
+        rows: [],
+      },
+      formModalVisible: false,
     }
   },
-
   methods: {
-    handleCustomQuery() {
-      this.$refs.xFormTable.queryTable({
-        uf_f_alias: 'XianFeng',
-        uf_f_card_id: '10500030'
+    backDealData () {
+      this.$refs.xFormTable.$refs.xForm.backDealData().then(data => {
+        console.log('backDealData', data)
+        console.log('selected', this.$refs.xFormTable.$refs.xForm?.form)
       })
     },
-    rowDblClick(record) {
-      console.log('rowDblClick', record)
-    },
     // input框 行編輯參數傳遞
-    ceshi(...args) {
+    ceshi (...args) {
       // attr, value, currentRecord, currentIndex, nextRecord, nextIndex
-      const [attr, value, currentRecord, currentIndex, nextRecord, nextIndex] = args
-      console.log('ceshi', attr, value, currentRecord, currentIndex, nextRecord, nextIndex)
+      const [attr, value, currentRecord, currentIndex, nextRecord, nextIndex] =
+        args
+      console.log(
+        'ceshi',
+        attr,
+        value,
+        currentRecord,
+        currentIndex,
+        nextRecord,
+        nextIndex
+      )
       // 示例：当按下 Enter 键且有下一行时，跳转到下一行的同一列
       // 可以在这里执行业务逻辑（例如：保存数据）
       console.log('当前行:', currentIndex, '下一行:', nextIndex)
@@ -73,44 +98,61 @@ export default {
       // 跳转到下一行的同一列
       this.$refs.xFormTable.$refs.xTable.focusInput(nextIndex, attr.model)
     },
-    test() {
+    test () {
       this.$refs.xFormTable.setTableData([])
     },
-    defaultF() {
+    defaultF () {
       this.$refs.xFormTable.setTableSize('default')
     },
-    middleF() {
+    middleF () {
       this.$refs.xFormTable.setTableSize('middle')
     },
-    smallF() {
+    smallF () {
       this.$refs.xFormTable.setTableSize('small')
     },
-    columnClick(key, value, record) {
+    columnClick (key, value, record) {
       microDispatch({
         type: 'v3route',
         path: '/bingliguanli/dianzibingliluru',
-        props: { selected: arguments[0].his_f_admission_id }
+        props: { selected: arguments[0].his_f_admission_id },
       })
     },
-    action(record, id, actionType) {
-      this.detailVisible = true
-      console.log('触发了详情操作', record, id, actionType)
+    startService (record, id, actionType) {
+      getConfigByNameAsync('测试Form', 'af-safecheck').then(config => {
+        this.formModalVisible = true
+        this.$nextTick(
+          () => {
+            this.formModalVisible = true
+            this.$refs.xForm.init({
+              formItems: config.formJson,
+              title: '工单回访',
+              businessType: '新增',
+              ...config,
+              modifyModelData: { data: { id: 1 } },
+            })
+          })
+      })
+      // this.detailVisible = true
+      // console.log('触发了详情操作', record, id, actionType)
+    },
+    async ok () {
+      const res = await this.$refs.xForm.asyncSubmit()
+      await runLogic('ceshwewei', res.realForm)
     },
-    onClose() {
+    onClose () {
       this.detailVisible = false
       // 关闭详情之后重新查询表单
       this.$refs.xFormTable.refreshTable(true)
     },
-    selectRow(selectedRowKeys, selectedRows) {
+    selectRow (selectedRowKeys, selectedRows) {
       this.selected = {
         keys: selectedRowKeys,
-        rows: selectedRows
+        rows: selectedRows,
       }
+      console.log('selectedDemo', this.selected)
     },
-    addFormSubmit(params, callback){
-      callback()
-    }
-  }
+  },
+  computed: {},
 }
 </script>
 

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

@@ -79,9 +79,9 @@
                         >
                           <!-- 有 fileId 时通过 img 展示加载中/错误/图片 -->
                           <template v-if="photo.fileId">
-                            <a-spin v-if="getThumbState(photo.fileId) === 'loading'" size="small" />
-                            <a-icon v-else-if="getThumbState(photo.fileId) === 'error'" type="picture" class="thumb-error-icon" />
-                            <img v-else :src="thumbUrlMap[photo.fileId]" :alt="photo.title || '照片'" />
+                            <a-spin v-if="getThumbState(photo) === 'loading'" size="small" />
+                            <a-icon v-else-if="getThumbState(photo) === 'error'" type="picture" class="thumb-error-icon" />
+                            <img v-else :src="thumbUrlMap[thumbCacheKey(photo)]" :alt="photo.title || '照片'" />
                           </template>
                           <!-- 直接有 url 时展示 -->
                           <img v-else-if="photo.url" :src="photo.url" :alt="photo.title || '照片'" />
@@ -162,7 +162,8 @@ export default {
       if (!this.currentPhoto) return ''
       if (this.currentPhoto.url) return this.currentPhoto.url
       if (this.currentPhoto.fileId) {
-        return this.thumbUrlMap[this.currentPhoto.fileId] || ''
+        const key = this.thumbCacheKey(this.currentPhoto)
+        return this.thumbUrlMap[key] || ''
       }
       return ''
     },
@@ -184,37 +185,61 @@ export default {
      */
     preloadThumbnails () {
       if (!this.checkItems || !this.injectedServiceName) return
+      this.thumbUrlMap = {}
+      this.thumbStateMap = {}
       this.checkItems.forEach(category => {
         if (!category.items) return
         category.items.forEach(item => {
           if (!item.photos) return
           item.photos.forEach(photo => {
-            if (photo.fileId && !this.thumbStateMap[photo.fileId]) {
-              this.loadThumb(photo.fileId)
-            }
+            if (photo.fileId) this.loadThumb(photo)
           })
         })
       })
     },
 
-    async loadThumb (fileId) {
-      this.$set(this.thumbStateMap, fileId, 'loading')
+    /**
+     * 缩略图缓存必须用字符串键。若用对象作 fileId，JS 会统一变成 "[object Object]"，导致所有缩略图共用一张图。
+     * 优先使用业务侧已生成的 photo.id，其次从 fileId 上解析 id。
+     */
+    thumbCacheKey (photo) {
+      if (!photo) return ''
+      if (photo.id != null && photo.id !== '') return String(photo.id)
+      const raw = photo.fileId
+      if (raw == null || raw === '') return ''
+      if (typeof raw !== 'object') return String(raw)
+      const id = raw.id ?? raw.f_id
+      if (id != null && typeof id !== 'object') return String(id)
+      return JSON.stringify(raw)
+    },
+
+    async loadThumb (photo) {
+      const key = this.thumbCacheKey(photo)
+      if (!key || !photo.fileId) return
+      if (this.thumbStateMap[key] === 'loading' || this.thumbStateMap[key] === 'done') return
+      this.$set(this.thumbStateMap, key, 'loading')
       try {
         const svc = createFileImageService({ serviceName: this.injectedServiceName })
-        const url = await svc.getImageUrl(fileId)
-        this.$set(this.thumbUrlMap, fileId, url)
-        this.$set(this.thumbStateMap, fileId, 'done')
-      } catch {
-        this.$set(this.thumbStateMap, fileId, 'error')
+        const url = await svc.getImageUrl(photo.fileId)
+        if (this.thumbStateMap[key] === 'loading') {
+          this.$set(this.thumbUrlMap, key, url)
+          this.$set(this.thumbStateMap, key, 'done')
+        }
+      } catch (e) {
+        console.warn(`[CheckItems] 加载缩略图失败 key=${key}:`, e.message)
+        if (this.thumbStateMap[key] === 'loading') {
+          this.$set(this.thumbStateMap, key, 'error')
+        }
       }
     },
 
-    getThumbState (fileId) {
-      return this.thumbStateMap[fileId] || 'loading'
+    getThumbState (photo) {
+      const key = this.thumbCacheKey(photo)
+      return this.thumbStateMap[key] || 'loading'
     },
 
     getPhotoKey (photo, index) {
-      return photo.fileId || photo.id || index
+      return this.thumbCacheKey(photo) || photo.id || index
     },
 
     /**

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

@@ -112,6 +112,7 @@
 
 <script>
 import { FileImageGroup } from '@vue2-client/base-client/components/common/FileImage'
+import { getConfigByNameAsync } from '@vue2-client/services/api/common'
 
 export default {
   name: 'HazardPhotos',
@@ -127,7 +128,51 @@ export default {
       default: () => []
     }
   },
+  data () {
+    return {
+      hazardLevelConfig: []
+    }
+  },
   methods: {
+    /**
+     * 加载隐患等级配置
+     */
+    async loadHazardLevelConfig () {
+      try {
+        const config = await getConfigByNameAsync('riskLevelConfig', 'af-system')
+        this.hazardLevelConfig = config?.riskLevel || []
+      } catch (e) {
+        console.warn('[HazardPhotos] 加载隐患等级配置失败:', e)
+        this.hazardLevelConfig = []
+      }
+    },
+
+    /**
+     * 获取隐患等级文本
+     * 优先使用 hazardLevelConfig（格式: [{value: "紧急隐患", result: "级别4"}, ...]）
+     * 如果配置为空则使用默认映射
+     */
+    getHazardLevelText (level) {
+      // 优先使用配置的映射
+      if (this.hazardLevelConfig && this.hazardLevelConfig.length > 0) {
+        const item = this.hazardLevelConfig.find(r => r.value === level)
+        if (item) return item.result || level
+      }
+      // 配置为空时使用默认映射
+      const textMap = {
+        紧急隐患: '紧急隐患',
+        重大隐患: '重大隐患',
+        中等隐患: '中等隐患',
+        一般隐患: '一般隐患',
+        其他隐患: '其他隐患',
+        urgent: '紧急隐患',
+        major: '重大隐患',
+        medium: '中等隐患',
+        minor: '一般隐患'
+      }
+      return textMap[level] || '其他隐患'
+    },
+
     /**
      * 获取Ant Design Vue Tag颜色
      */
@@ -161,32 +206,16 @@ export default {
         minor: 'info-circle'
       }
       return iconMap[level] || 'warning'
-    },
-
-    /**
-     * 获取隐患等级文本
-     */
-    getHazardLevelText (level) {
-      const textMap = {
-        紧急隐患: '紧急隐患',
-        重大隐患: '重大隐患',
-        中等隐患: '中等隐患',
-        一般隐患: '一般隐患',
-        其他隐患: '其他隐患',
-        urgent: '紧急隐患',
-        major: '重大隐患',
-        medium: '中等隐患',
-        minor: '一般隐患'
-      }
-      return textMap[level] || '其他隐患'
     }
+  },
+  mounted() {
+    this.loadHazardLevelConfig()
   }
 }
 </script>
 
 <style lang="less" scoped>
 .hazard-photos {
-  border: 1px solid #f0f0f0;
   border-radius: 8px;
   background: white;
   height: 100%;

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

@@ -424,9 +424,10 @@ class InspectionService {
       if (Array.isArray(item.value)) {
         item.value.forEach((pd, i) => {
           if (typeof pd === 'object' && (pd.id || pd.url)) {
+            const fileId = pd.id || pd
             photos.push({
               id: pd.id || `${item.itemname}_files_${i + 1}`,
-              fileId: pd,
+              fileId,
               url: pd.url,
               title: item.itemname,
               description: pd.f_real_name || `${item.itemname} (${i + 1}/${item.value.length})`
@@ -436,9 +437,10 @@ class InspectionService {
       }
     } else if (Array.isArray(item.f_defect_paths) && item.f_defect_paths.length) {
       item.f_defect_paths.forEach((pd, i) => {
+        const fileId = typeof pd === 'object' ? (pd.id || pd) : pd
         photos.push({
-          id: typeof pd === 'object' ? pd.id : pd,
-          fileId: pd,
+          id: typeof pd === 'object' ? (pd.id || i) : pd,
+          fileId,
           title: item.itemname,
           description: `${item.itemname} - 隐患照片 ${i + 1}`
         })