af-mobile-client-vue3 1.6.21 → 1.6.22

package/src/components/data/UserDetail/recordEntries.ts

@@ -1,178 +1,178 @@
-// 记录入口默认配置
-// 此处如果导入getConfigByNameAsync，则项目无法启动且无法提交
-// import { getConfigByNameAsync } from '@af-mobile-client-vue3/services/api/common'
-// import { ref } from 'vue'
-
-export interface RecordEntry {
-  id: string
-  title: string
-  icon: string
-  bgColor: string
-  textColor: string
-  dateLabel: string
-  route: string
-  path: string
-  forMeterTypes: string[]
-}
-
-// 默认记录入口配置（静态默认值，用于插件初始化等场景）
-export const defaultRecordEntries: RecordEntry[] = [
-  {
-    id: 'OperateRecords',
-    title: '操作记录',
-    icon: 'i-fa-solid-list',
-    bgColor: 'bg-gray-100',
-    textColor: 'text-gray-500',
-    dateLabel: '操作记录',
-    route: 'OperateRecords',
-    path: '/OperateRecords',
-    forMeterTypes: ['气量卡表', '金额卡表', '物联网表', '机表'],
-  },
-  {
-    id: 'payment',
-    title: '缴费记录',
-    icon: 'i-fa6-solid-money-bill-wave',
-    bgColor: 'bg-blue-100',
-    textColor: 'text-blue-500',
-    dateLabel: '缴费',
-    route: 'PaymentRecords',
-    path: '/PaymentRecords',
-    forMeterTypes: ['气量卡表', '金额卡表', '物联网表', '机表'],
-  },
-  {
-    id: 'meter',
-    title: '抄表记录',
-    icon: 'i-fa6-solid-chart-line',
-    bgColor: 'bg-green-100',
-    textColor: 'text-green-500',
-    dateLabel: '抄表',
-    route: 'MeterRecords',
-    path: '/MeterRecords',
-    forMeterTypes: ['物联网表', '机表'],
-  },
-  {
-    id: 'transfer',
-    title: '过户记录',
-    icon: 'i-fa-solid-exchange-alt',
-    bgColor: 'bg-purple-100',
-    textColor: 'text-purple-500',
-    dateLabel: '过户',
-    route: 'TransferRecords',
-    path: '/TransferRecords',
-    forMeterTypes: ['气量卡表', '金额卡表', '物联网表', '机表'],
-  },
-  {
-    id: 'replacement',
-    title: '换表记录',
-    icon: 'i-fa-solid-sync-alt',
-    bgColor: 'bg-orange-100',
-    textColor: 'text-orange-500',
-    dateLabel: '换表',
-    route: 'ReplacementRecords',
-    path: '/ReplacementRecords',
-    forMeterTypes: ['气量卡表', '金额卡表', '物联网表', '机表'],
-  },
-  {
-    id: 'otherCharge',
-    title: '其他收费记录',
-    icon: 'i-fa-solid-receipt',
-    bgColor: 'bg-indigo-100',
-    textColor: 'text-indigo-500',
-    dateLabel: '其他收费',
-    route: 'OtherChargeRecords',
-    path: '/OtherChargeRecords',
-    forMeterTypes: ['气量卡表', '金额卡表', '物联网表', '机表'],
-  },
-  {
-    id: 'abnormalAlarm',
-    title: '异常报警记录',
-    icon: 'i-fa-solid-exclamation-triangle',
-    bgColor: 'bg-red-100',
-    textColor: 'text-red-500',
-    dateLabel: '异常报警',
-    route: 'AbnormalAlarmRecords',
-    path: '/AbnormalAlarmRecords',
-    forMeterTypes: ['物联网表', '机表'],
-  },
-  {
-    id: 'cardReplacement',
-    title: '补卡记录',
-    icon: 'i-fa-solid-sync-alt',
-    bgColor: 'bg-orange-100',
-    textColor: 'text-orange-500',
-    dateLabel: '补卡',
-    route: 'CardReplacementRecords',
-    path: '/CardReplacementRecords',
-    forMeterTypes: ['气量卡表', '金额卡表', '机表'],
-  },
-  {
-    id: 'change',
-    title: '变更记录',
-    icon: 'i-fa-solid-exchange-alt',
-    bgColor: 'bg-purple-100',
-    textColor: 'text-purple-500',
-    dateLabel: '变更',
-    route: 'ChangeRecords',
-    path: '/ChangeRecords',
-    forMeterTypes: ['气量卡表', '金额卡表', '物联网表', '机表'],
-  },
-  {
-    id: 'commandView',
-    title: '指令查看',
-    icon: 'i-fa-solid-eye',
-    bgColor: 'bg-blue-100',
-    textColor: 'text-blue-500',
-    dateLabel: '指令查看',
-    route: 'CommandViewRecords',
-    path: '/CommandViewRecords',
-    forMeterTypes: ['物联网表', '机表'],
-  },
-  {
-    id: 'gasCompensation',
-    title: '补气记录',
-    icon: 'i-fa-solid-plus',
-    bgColor: 'bg-green-100',
-    textColor: 'text-green-500',
-    dateLabel: '流水',
-    route: 'GasCompensationRecords',
-    path: '/GasCompensationRecords',
-    forMeterTypes: ['气量卡表', '金额卡表', '物联网表', '机表'],
-  },
-  {
-    id: 'instrumentCollection',
-    title: '表具采集记录',
-    icon: 'i-fa-solid-list',
-    bgColor: 'bg-gray-100',
-    textColor: 'text-gray-500',
-    dateLabel: '表具采集',
-    route: 'InstrumentCollectionRecords',
-    path: '/InstrumentCollectionRecords',
-    forMeterTypes: ['物联网表', '机表'],
-  },
-  {
-    id: 'priceAdjustment',
-    title: '价格调整记录',
-    icon: 'i-fa-solid-dollar-sign',
-    bgColor: 'bg-red-100',
-    textColor: 'text-red-500',
-    dateLabel: '价格调整',
-    route: 'PriceAdjustmentRecords',
-    path: '/PriceAdjustmentRecords',
-    forMeterTypes: ['气量卡表', '金额卡表', '物联网表', '机表'],
-  },
-]
-
-// 响应式记录入口配置，可被 API 数据更新
-// export const recordEntries = ref<RecordEntry[]>([...defaultRecordEntries])
-
-/**
- * 从 API 获取记录入口配置并更新 recordEntries
- * @returns API 返回的配置数据
- */
-// export async function initRecordEntries() {
-//   const data = await getConfigByNameAsync('userInfoAndListConfig', 'af-revenue')
-//   if (data) {
-//     recordEntries.value = data?.records as RecordEntry[]
-//   }
-//   return data
-// }
+// 记录入口默认配置
+// 此处如果导入getConfigByNameAsync，则项目无法启动且无法提交
+// import { getConfigByNameAsync } from '@af-mobile-client-vue3/services/api/common'
+// import { ref } from 'vue'
+
+export interface RecordEntry {
+  id: string
+  title: string
+  icon: string
+  bgColor: string
+  textColor: string
+  dateLabel: string
+  route: string
+  path: string
+  forMeterTypes: string[]
+}
+
+// 默认记录入口配置（静态默认值，用于插件初始化等场景）
+export const defaultRecordEntries: RecordEntry[] = [
+  {
+    id: 'OperateRecords',
+    title: '操作记录',
+    icon: 'i-fa-solid-list',
+    bgColor: 'bg-gray-100',
+    textColor: 'text-gray-500',
+    dateLabel: '操作记录',
+    route: 'OperateRecords',
+    path: '/OperateRecords',
+    forMeterTypes: ['气量卡表', '金额卡表', '物联网表', '机表'],
+  },
+  {
+    id: 'payment',
+    title: '缴费记录',
+    icon: 'i-fa6-solid-money-bill-wave',
+    bgColor: 'bg-blue-100',
+    textColor: 'text-blue-500',
+    dateLabel: '缴费',
+    route: 'PaymentRecords',
+    path: '/PaymentRecords',
+    forMeterTypes: ['气量卡表', '金额卡表', '物联网表', '机表'],
+  },
+  {
+    id: 'meter',
+    title: '抄表记录',
+    icon: 'i-fa6-solid-chart-line',
+    bgColor: 'bg-green-100',
+    textColor: 'text-green-500',
+    dateLabel: '抄表',
+    route: 'MeterRecords',
+    path: '/MeterRecords',
+    forMeterTypes: ['物联网表', '机表'],
+  },
+  {
+    id: 'transfer',
+    title: '过户记录',
+    icon: 'i-fa-solid-exchange-alt',
+    bgColor: 'bg-purple-100',
+    textColor: 'text-purple-500',
+    dateLabel: '过户',
+    route: 'TransferRecords',
+    path: '/TransferRecords',
+    forMeterTypes: ['气量卡表', '金额卡表', '物联网表', '机表'],
+  },
+  {
+    id: 'replacement',
+    title: '换表记录',
+    icon: 'i-fa-solid-sync-alt',
+    bgColor: 'bg-orange-100',
+    textColor: 'text-orange-500',
+    dateLabel: '换表',
+    route: 'ReplacementRecords',
+    path: '/ReplacementRecords',
+    forMeterTypes: ['气量卡表', '金额卡表', '物联网表', '机表'],
+  },
+  {
+    id: 'otherCharge',
+    title: '其他收费记录',
+    icon: 'i-fa-solid-receipt',
+    bgColor: 'bg-indigo-100',
+    textColor: 'text-indigo-500',
+    dateLabel: '其他收费',
+    route: 'OtherChargeRecords',
+    path: '/OtherChargeRecords',
+    forMeterTypes: ['气量卡表', '金额卡表', '物联网表', '机表'],
+  },
+  {
+    id: 'abnormalAlarm',
+    title: '异常报警记录',
+    icon: 'i-fa-solid-exclamation-triangle',
+    bgColor: 'bg-red-100',
+    textColor: 'text-red-500',
+    dateLabel: '异常报警',
+    route: 'AbnormalAlarmRecords',
+    path: '/AbnormalAlarmRecords',
+    forMeterTypes: ['物联网表', '机表'],
+  },
+  {
+    id: 'cardReplacement',
+    title: '补卡记录',
+    icon: 'i-fa-solid-sync-alt',
+    bgColor: 'bg-orange-100',
+    textColor: 'text-orange-500',
+    dateLabel: '补卡',
+    route: 'CardReplacementRecords',
+    path: '/CardReplacementRecords',
+    forMeterTypes: ['气量卡表', '金额卡表', '机表'],
+  },
+  {
+    id: 'change',
+    title: '变更记录',
+    icon: 'i-fa-solid-exchange-alt',
+    bgColor: 'bg-purple-100',
+    textColor: 'text-purple-500',
+    dateLabel: '变更',
+    route: 'ChangeRecords',
+    path: '/ChangeRecords',
+    forMeterTypes: ['气量卡表', '金额卡表', '物联网表', '机表'],
+  },
+  {
+    id: 'commandView',
+    title: '指令查看',
+    icon: 'i-fa-solid-eye',
+    bgColor: 'bg-blue-100',
+    textColor: 'text-blue-500',
+    dateLabel: '指令查看',
+    route: 'CommandViewRecords',
+    path: '/CommandViewRecords',
+    forMeterTypes: ['物联网表', '机表'],
+  },
+  {
+    id: 'gasCompensation',
+    title: '补气记录',
+    icon: 'i-fa-solid-plus',
+    bgColor: 'bg-green-100',
+    textColor: 'text-green-500',
+    dateLabel: '流水',
+    route: 'GasCompensationRecords',
+    path: '/GasCompensationRecords',
+    forMeterTypes: ['气量卡表', '金额卡表', '物联网表', '机表'],
+  },
+  {
+    id: 'instrumentCollection',
+    title: '表具采集记录',
+    icon: 'i-fa-solid-list',
+    bgColor: 'bg-gray-100',
+    textColor: 'text-gray-500',
+    dateLabel: '表具采集',
+    route: 'InstrumentCollectionRecords',
+    path: '/InstrumentCollectionRecords',
+    forMeterTypes: ['物联网表', '机表'],
+  },
+  {
+    id: 'priceAdjustment',
+    title: '价格调整记录',
+    icon: 'i-fa-solid-dollar-sign',
+    bgColor: 'bg-red-100',
+    textColor: 'text-red-500',
+    dateLabel: '价格调整',
+    route: 'PriceAdjustmentRecords',
+    path: '/PriceAdjustmentRecords',
+    forMeterTypes: ['气量卡表', '金额卡表', '物联网表', '机表'],
+  },
+]
+
+// 响应式记录入口配置，可被 API 数据更新
+// export const recordEntries = ref<RecordEntry[]>([...defaultRecordEntries])
+
+/**
+ * 从 API 获取记录入口配置并更新 recordEntries
+ * @returns API 返回的配置数据
+ */
+// export async function initRecordEntries() {
+//   const data = await getConfigByNameAsync('userInfoAndListConfig', 'af-revenue')
+//   if (data) {
+//     recordEntries.value = data?.records as RecordEntry[]
+//   }
+//   return data
+// }

package/src/utils/queryFormDefaultRangePicker.ts

@@ -1,57 +1,57 @@
-/**
- * 根据类型获取日期区间字符串
- * @param type '当年' | 'curMonth' | '当日'
- * @param show 区分实际值还是显示值, true为实际值, false为显示值
- * @returns [start, end] 例：['2024-01-01 00:00:00', '2024-12-31 23:59:59']
- */
-export function getRangeByType(type: string, show: boolean): [string, string] {
-  const now = new Date()
-  const year = now.getFullYear()
-  const month = (now.getMonth() + 1).toString().padStart(2, '0')
-  const day = now.getDate().toString().padStart(2, '0')
-
-  if (!show) {
-    if (type === 'curYear') {
-      return [
-        `${year}-01-01 00:00:00`,
-        `${year}-12-31 23:59:59`,
-      ]
-    }
-    if (type === 'curMonth') {
-      const lastDay = new Date(year, now.getMonth() + 1, 0).getDate()
-      return [
-        `${year}-${month}-01 00:00:00`,
-        `${year}-${month}-${lastDay.toString().padStart(2, '0')} 23:59:59`,
-      ]
-    }
-    if (type === 'curDay') {
-      return [
-        `${year}-${month}-${day} 00:00:00`,
-        `${year}-${month}-${day} 23:59:59`,
-      ]
-    }
-  }
-  if (show) {
-    if (type === 'curYear') {
-      return [
-        `${year}-01-01`,
-        `${year}-12-31`,
-      ]
-    }
-    if (type === 'curMonth') {
-      const lastDay = new Date(year, now.getMonth() + 1, 0).getDate()
-      return [
-        `${year}-${month}-01`,
-        `${year}-${month}-${lastDay.toString().padStart(2, '0')}`,
-      ]
-    }
-    if (type === 'curDay') {
-      return [
-        `${year}-${month}-${day}`,
-        `${year}-${month}-${day}`,
-      ]
-    }
-  }
-  // 兜底返回空字符串数组
-  return ['', '']
-}
+/**
+ * 根据类型获取日期区间字符串
+ * @param type '当年' | 'curMonth' | '当日'
+ * @param show 区分实际值还是显示值, true为实际值, false为显示值
+ * @returns [start, end] 例：['2024-01-01 00:00:00', '2024-12-31 23:59:59']
+ */
+export function getRangeByType(type: string, show: boolean): [string, string] {
+  const now = new Date()
+  const year = now.getFullYear()
+  const month = (now.getMonth() + 1).toString().padStart(2, '0')
+  const day = now.getDate().toString().padStart(2, '0')
+
+  if (!show) {
+    if (type === 'curYear') {
+      return [
+        `${year}-01-01 00:00:00`,
+        `${year}-12-31 23:59:59`,
+      ]
+    }
+    if (type === 'curMonth') {
+      const lastDay = new Date(year, now.getMonth() + 1, 0).getDate()
+      return [
+        `${year}-${month}-01 00:00:00`,
+        `${year}-${month}-${lastDay.toString().padStart(2, '0')} 23:59:59`,
+      ]
+    }
+    if (type === 'curDay') {
+      return [
+        `${year}-${month}-${day} 00:00:00`,
+        `${year}-${month}-${day} 23:59:59`,
+      ]
+    }
+  }
+  if (show) {
+    if (type === 'curYear') {
+      return [
+        `${year}-01-01`,
+        `${year}-12-31`,
+      ]
+    }
+    if (type === 'curMonth') {
+      const lastDay = new Date(year, now.getMonth() + 1, 0).getDate()
+      return [
+        `${year}-${month}-01`,
+        `${year}-${month}-${lastDay.toString().padStart(2, '0')}`,
+      ]
+    }
+    if (type === 'curDay') {
+      return [
+        `${year}-${month}-${day}`,
+        `${year}-${month}-${day}`,
+      ]
+    }
+  }
+  // 兜底返回空字符串数组
+  return ['', '']
+}

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

@@ -1335,6 +1335,7 @@ function organizeSubmitData() {
       depids: checkerInfo.depids,
       orgs: checkerInfo.orgs,
       orgid: checkerInfo.orgid,
+      ename: checkerInfo.ename,
     },
     onSiteDate: onSiteDate.value,
     safeCheckVersion: safeCheckVersion.value,