af-mobile-client-vue3 1.5.88 → 1.5.90

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "af-mobile-client-vue3",
   "type": "module",
-  "version": "1.5.88",
+  "version": "1.5.90",
   "packageManager": "pnpm@10.13.1",
   "description": "Vue + Vite component lib",
   "engines": {

package/src/components/data/UserDetail/index.vue

@@ -121,11 +121,11 @@ const filteredRecordEntries = computed(() => {
   if (!user.value?.f_meter_type)
     return []
 
-  return props?.recordEntries || props?.recordEntries?.length === 0
-    ? allRecords.value.filter(entry =>
+  return props?.recordEntries && props?.recordEntries?.length > 0
+    ? props.recordEntries.filter(entry =>
         entry.forMeterTypes.includes(user.value!.f_meter_type),
       )
-    : props.recordEntries.filter(entry =>
+    : allRecords.value.filter(entry =>
         entry.forMeterTypes.includes(user.value!.f_meter_type),
       )
 })

package/src/views/SafeInspection/SecurityCertificate/AddDevice/index.vue

@@ -6,10 +6,10 @@ import type {
   DeviceTypeAction,
 } from './types/device'
 
-import SecurityFormItem from '@af-mobile-client-vue3/views/SafeInspection/SecurityFormItem/index.vue'
 import XForm from '@af-mobile-client-vue3/components/data/XForm/index.vue'
 import { getConfigByName } from '@af-mobile-client-vue3/services/api/common'
 import { useUserStore } from '@af-mobile-client-vue3/stores/modules/user'
+import SecurityFormItem from '@af-mobile-client-vue3/views/SafeInspection/SecurityFormItem/index.vue'
 import {
   showConfirmDialog,
   showToast,

package/src/views/SafeInspection/SecurityCertificate/OverallHiddenDangers/index.vue

@@ -2,14 +2,14 @@
 import XForm from '@af-mobile-client-vue3/components/data/XForm/index.vue'
 import { getPhotosFromAny } from '@af-mobile-client-vue3/utils/PhotoClean'
 import {
+  showConfirmDialog,
+  showToast,
   Button as VanButton,
   Cell as VanCell,
   CellGroup as VanCellGroup,
   Empty as VanEmpty,
   Icon as VanIcon,
   List as VanList,
-  showConfirmDialog,
-  showToast,
 } from 'vant'
 import { defineEmits, defineExpose, defineProps, inject, onMounted, ref, watch } from 'vue'
 

package/src/views/SafeInspection/SecurityCertificate/contractSign/index.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import XForm from '@af-mobile-client-vue3/components/data/XForm/index.vue'
 import { runLogic } from '@af-mobile-client-vue3/services/api/common'
-import { Popup as VanPopup, showToast } from 'vant'
+import { showToast, Popup as VanPopup } from 'vant'
 import { defineEmits, defineExpose, ref } from 'vue'
 
 const emit = defineEmits(['signSuccess'])

package/src/views/SafeInspection/SecurityCertificate/photoAiRecognition/components/PhotoCaptureCard.vue

@@ -12,7 +12,7 @@
  */
 import { mobileUtil } from '@af-mobile-client-vue3/utils/mobileUtil'
 import { Icon } from '@iconify/vue'
-import { Button as VanButton, Icon as VanIcon, showFailToast } from 'vant'
+import { showFailToast, Button as VanButton, Icon as VanIcon } from 'vant'
 import { inject } from 'vue'
 
 /**

package/src/views/SafeInspection/SecurityCertificate/photoAiRecognition/components/PhotoRecognitionInfo.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import ImageUploader from '@af-mobile-client-vue3/components/core/ImageUploader/index.vue'
-import { Button as VanButton, Cell as VanCell, CellGroup as VanCellGroup, Empty as VanEmpty, Field as VanField } from 'vant'
+import { Button as VanButton, Cell as VanCell, Empty as VanEmpty, Field as VanField } from 'vant'
 import { computed } from 'vue'
 
 interface StepItem {

package/src/views/SafeInspection/SecurityCertificate/photoAiRecognition/components/PhotoStepHeader.vue

@@ -10,7 +10,7 @@
  * - 支持点击切换到指定步骤
  * ========================================
  */
-import { Progress, Tab as VanTab, Tabs as VanTabs } from 'vant'
+import { Progress } from 'vant'
 
 /**
  * 步骤项接口

package/src/views/SafeInspection/SecurityCertificate/photoAiRecognition/index.vue

@@ -12,9 +12,9 @@
  */
 import { getConfigByName, runLogic } from '@af-mobile-client-vue3/services/api/common'
 import { Icon } from '@iconify/vue'
-import { showFailToast } from 'vant'
+import { showFailToast, Loading as VanLoading, Tab as VanTab, Tabs as VanTabs } from 'vant'
 import { computed, onMounted, ref } from 'vue'
-import { Loading as VanLoading, Tab as VanTab, Tabs as VanTabs } from 'vant'
+
 import PhotoCaptureCard from './components/PhotoCaptureCard.vue'
 import PhotoRecognitionInfo from './components/PhotoRecognitionInfo.vue'
 import PhotoStepHeader from './components/PhotoStepHeader.vue'

package/src/views/SafeInspection/SecurityCertificate/photoSignature/SignatureComponent/SignatureComponent.vue

@@ -0,0 +1,285 @@
+<script setup lang="ts">
+import type { SignatureCompleteData, SignatureComponentExpose, SignatureComponentProps } from './signature'
+import { mobileUtil } from '@af-mobile-client-vue3/utils/mobileUtil'
+import {
+  showImagePreview,
+  showToast,
+  Button as VanButton,
+  Field as VanField,
+  Icon as VanIcon,
+  Image as VanImage,
+} from 'vant'
+import { computed, defineEmits, defineProps, inject, ref } from 'vue'
+
+const props = withDefaults(defineProps<SignatureComponentProps>(), {
+  label: '用户签字',
+  required: false,
+  disabled: false,
+  uploadMode: 'server',
+  imageList: Array<any>,
+  formReadonly: false,
+})
+
+const emit = defineEmits<{
+  signatureComplete: [data: SignatureCompleteData]
+}>()
+
+const signatureImage = ref<string>('')
+const rawBase64Data = ref<string>('') // 保存原始base64数据
+const hasSignature = ref(false)
+const parentData: any = inject('provideParent')
+const imageList = ref<Array<any>>(props.imageList ?? [])
+const signatureFormData: any = inject('getSignatureData')
+const isRequired = computed(() => {
+  const isSignature = signatureFormData?.getSignatureData()
+  return !(isSignature?.f_signature && isSignature?.f_signature !== '现场签字')
+})
+
+// 处理签字后的上传
+function getImageMimeType(fileName: string): string {
+  const ext = fileName.split('.').pop()?.toLowerCase()
+  if (ext === 'jpg' || ext === 'jpeg')
+    return 'image/jpeg'
+  if (ext === 'png')
+    return 'image/png'
+  if (ext === 'gif')
+    return 'image/gif'
+  return 'image/png' // 默认
+}
+
+function handleSignature() {
+  if (props.disabled)
+    return
+  if (!isRequired.value) {
+    showToast('只有现场签字才需要签字')
+    return
+  }
+
+  mobileUtil.execute({
+    funcName: 'showSignaturePad',
+    param: {},
+    callbackFunc: (result: any) => {
+      console.log('签字结果:', result)
+      if (result.status === 'success') {
+        const mimeType = getImageMimeType(result.data.filePath)
+        // 保存原始base64数据
+        rawBase64Data.value = result.data.base64
+        // 添加base64图片前缀用于显示
+        signatureImage.value = `data:${mimeType};base64,${result.data.base64}`
+        hasSignature.value = true
+        const tempFile = {
+          uid: Date.now() + Math.random().toString(36).substr(2, 5),
+          name: result.data.filePath.split('/').pop(),
+          status: 'uploading',
+          message: '上传中...',
+          url: `data:${mimeType};base64,${result.data.base64}`,
+          isImage: true,
+          type: mimeType,
+        }
+        if (imageList.value) {
+          imageList.value = [tempFile]
+        }
+
+        const param = {
+          resUploadMode: props.uploadMode,
+          pathKey: 'Default',
+          formType: 'image',
+          useType: 'Default',
+          resUploadStock: '1',
+          filename: tempFile.name,
+          // 暂无size
+          // filesize: photoData.size,
+          f_operator: 'server',
+          imgPath: result.data.filePath,
+          urlPath: `/api/${import.meta.env.VITE_APP_SYSTEM_NAME}/resource/upload`,
+          commonId: parentData.commonId.value ?? '',
+        }
+
+        // 添加上传队列
+        mobileUtil.execute({
+          funcName: 'queueUpload',
+          param,
+          callbackFunc: (res: any) => {
+            console.warn('上传结果', res)
+            // 成功
+            if (res.data && res.data.enqueued) {
+              const index = imageList.value.findIndex(item => item.uid === tempFile.uid)
+              if (index !== -1) {
+                delete imageList.value[index].message
+                imageList.value[index].status = 'done'
+                imageList.value[index].photo_name = tempFile.name
+                imageList.value[index].type = mimeType
+              }
+              else {
+                if (index !== -1) {
+                  imageList.value[index].status = 'failed'
+                  imageList.value[index].message = '上传失败'
+                }
+              }
+            }
+          },
+        })
+        emit('signatureComplete', {
+          base64: result.data.base64,
+          status: result.data.status,
+        })
+      }
+    },
+  })
+}
+
+function clearSignature() {
+  signatureImage.value = ''
+  rawBase64Data.value = ''
+  hasSignature.value = false
+  imageList.value = []
+  emit('signatureComplete', {
+    base64: '',
+    status: 'cleared',
+  })
+}
+
+// 预览签字照片
+function previewSignature() {
+  if (imageList.value) {
+    showImagePreview(imageList.value.map(item => item.url))
+  }
+}
+
+// 暴露方法供父组件调用
+defineExpose<SignatureComponentExpose>({
+  clearSignature,
+  hasSignature: () => hasSignature.value,
+  getSignatureData: () => rawBase64Data.value, // 返回原始base64数据
+  previewSignature,
+  getSignatureList: () => imageList.value.map(item => item.photo_name),
+})
+</script>
+
+<template>
+  <VanField
+    center
+    name="signature"
+    :label="label"
+    :required="required"
+  >
+    <template #input>
+      <div class="signature-container">
+        <!-- 签字照片预览 -->
+        <div v-if="imageList.length > 0 || hasSignature" class="signature-preview">
+          <VanImage
+            v-for="(item, index) in imageList"
+            :key="`${item}_${index}`"
+            :src="item.url"
+            alt="签字照片"
+            class="signature-image"
+            fit="contain"
+            :show-loading="true"
+            :show-error="true"
+            loading-icon="photo-o"
+            error-icon="warning-o"
+            @click="previewSignature"
+          />
+        </div>
+
+        <!-- 按钮行 -->
+        <div class="button-row">
+          <!-- 签字按钮 -->
+          <VanButton
+            v-if="!props.formReadonly"
+            :disabled="disabled"
+            type="default"
+            size="small"
+            class="signature-btn dashed-btn"
+            @click="handleSignature"
+          >
+            <VanIcon :name="hasSignature ? 'edit' : 'edit'" class="btn-icon" />
+            {{ imageList.length > 0 || hasSignature ? '重签' : '点击签字' }}
+          </VanButton>
+
+          <!-- 清除按钮 -->
+          <VanButton
+            v-if="(imageList.length > 0 || hasSignature) && !props.formReadonly"
+            type="default"
+            size="small"
+            class="dashed-btn clear-btn"
+            @click="clearSignature"
+          >
+            <VanIcon name="delete" class="btn-icon" />
+            清除
+          </VanButton>
+        </div>
+      </div>
+    </template>
+  </VanField>
+</template>
+
+<style scoped lang="less">
+.signature-container {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+  width: 100%;
+}
+
+.signature-preview {
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 8px;
+
+  .signature-image {
+    max-width: 200px;
+    max-height: 120px;
+    border: 1px solid #e8e8e8;
+    border-radius: 4px;
+    cursor: pointer;
+    transition: all 0.2s ease;
+  }
+}
+
+// 按钮行样式
+.button-row {
+  display: flex;
+  gap: 12px;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.signature-btn {
+  flex-shrink: 0;
+  margin-right: auto;
+}
+
+// 虚线按钮样式
+.dashed-btn {
+  border: 1px dashed #1989fa !important;
+  background-color: transparent !important;
+  color: #1989fa !important;
+  border-radius: 4px !important;
+
+  &:hover {
+    border-color: #0570d9 !important;
+    color: #0570d9 !important;
+  }
+
+  &:active {
+    border-color: #0366d6 !important;
+    color: #0366d6 !important;
+    background-color: rgba(25, 137, 250, 0.1) !important;
+  }
+
+  &:disabled {
+    border-color: #c8c9cc !important;
+    color: #c8c9cc !important;
+    background-color: transparent !important;
+  }
+}
+
+// 按钮图标样式
+.btn-icon {
+  margin-right: 4px;
+  font-size: 14px;
+}
+</style>

package/src/views/SafeInspection/SecurityCertificate/photoSignature/index.vue

@@ -1,12 +1,13 @@
 <script setup lang="ts">
-import type { SignatureCompleteData, SignatureComponentExpose } from '@af-mobile-client-vue3/views/SafeInspection/SecurityFormItem/SignatureComponent/signature'
+import type { SignatureCompleteData, SignatureComponentExpose } from './SignatureComponent/signature'
 import XForm from '@af-mobile-client-vue3/components/data/XForm/index.vue'
 import { runLogic } from '@af-mobile-client-vue3/services/api/common'
 import { useUserStore } from '@af-mobile-client-vue3/stores/modules/user'
 import { getPhotosFromAny } from '@af-mobile-client-vue3/utils/PhotoClean'
+import contractSign from '@af-mobile-client-vue3/views/SafeInspection/SecurityCertificate/contractSign/index.vue'
 import { Icon as VanIcon } from 'vant'
 import { defineExpose, inject, onBeforeMount, provide, ref, watch } from 'vue'
-import contractSign from '@af-mobile-client-vue3/views/SafeInspection/SecurityCertificate/contractSign/index.vue'
+import SignatureComponent from './SignatureComponent/SignatureComponent.vue'
 
 // 定义组件属性
 interface Props {

package/src/views/SafeInspection/SecurityCertificate/userInfo/upaddress.vue

@@ -3,11 +3,11 @@ import XSelect from '@af-mobile-client-vue3/components/core/XSelect/index.vue'
 import { getConfigByName, runLogic } from '@af-mobile-client-vue3/services/api/common'
 import { useUserStore } from '@af-mobile-client-vue3/stores/modules/user'
 import {
+  showToast,
   ActionSheet as VanActionSheet,
   Button as VanButton,
   CellGroup as VanCellGroup,
   Field as VanField,
-  showToast,
 } from 'vant'
 import { defineEmits, defineExpose, defineProps, onBeforeMount, ref, watch } from 'vue'
 

package/src/views/SafeInspection/SecurityFormItem/FormItem.vue

@@ -1,9 +1,9 @@
 <script setup lang="ts">
-import CameraView from '@af-mobile-client-vue3/views/SafeInspection/SecurityFormItem/CameraView/index.vue'
-import XMultiSelect from '@af-mobile-client-vue3/views/SafeInspection/SecurityFormItem/XMultiSelect/index.vue'
 import XSelect from '@af-mobile-client-vue3/components/core/XSelect/index.vue'
 import XSignature from '@af-mobile-client-vue3/components/data/XSignature/index.vue'
 import { executeStrFunctionByContext } from '@af-mobile-client-vue3/utils/runEvalFunction'
+import CameraView from '@af-mobile-client-vue3/views/SafeInspection/SecurityFormItem/CameraView/index.vue'
+import XMultiSelect from '@af-mobile-client-vue3/views/SafeInspection/SecurityFormItem/XMultiSelect/index.vue'
 import dayjs from 'dayjs/esm/index'
 import { debounce } from 'lodash-es'
 import {

package/src/views/SafeInspection/SecurityFormItem/index.vue

@@ -1,9 +1,9 @@
 <script setup lang="ts">
-import CameraView from '@af-mobile-client-vue3/views/SafeInspection/SecurityFormItem/CameraView/index.vue'
-import SecurityFormItem from '@af-mobile-client-vue3/views/SafeInspection/SecurityFormItem/FormItem.vue'
 import XDatePicker from '@af-mobile-client-vue3/components/core/XDatePicker/index.vue'
 import XSelect from '@af-mobile-client-vue3/components/core/XSelect/index.vue'
 import { getConfigByName } from '@af-mobile-client-vue3/services/api/common'
+import CameraView from '@af-mobile-client-vue3/views/SafeInspection/SecurityFormItem/CameraView/index.vue'
+import SecurityFormItem from '@af-mobile-client-vue3/views/SafeInspection/SecurityFormItem/FormItem.vue'
 import moment from 'moment'
 import { Field as VanField } from 'vant'
 import { defineEmits, defineProps, inject, onBeforeMount, ref } from 'vue'