diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/util/util.js b/zdxt-web-client/zdxt-efcode-enforcement-app/src/util/util.js index 3312cd39..27aee9ca 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/util/util.js +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/util/util.js @@ -109,6 +109,24 @@ const formattedDate = (dateTime) =>{ } } +/** + * iOS 兼容的时间格式化 + * 将 YYYY-MM-DD 中的 - 替换为 / 避免 iOS Safari 解析为 NaN + * @param {*} dateStr 日期字符串 + * @returns 格式化后的日期时间字符串 YYYY-MM-DD HH:mm:ss + */ +const formatTime = (dateStr) => { + if (!dateStr) return '-'; + const d = new Date(String(dateStr).replace(/-/g, '/')); + if (isNaN(d.getTime())) return dateStr; + const y = d.getFullYear(); + const m = String(d.getMonth() + 1).padStart(2, '0'); + const day = String(d.getDate()).padStart(2, '0'); + const h = String(d.getHours()).padStart(2, '0'); + const min = String(d.getMinutes()).padStart(2, '0'); + return `${y}-${m}-${day} ${h}:${min}:00`; +}; + /** * 格式化用户名称为两个字的姓名 * @param {*} name @@ -164,4 +182,4 @@ const formatEnforcer = (item) => { return enforcers; }; -export { setGoodsNum, isObject, comparisonObject, isElementHidden, formattedTimeYYYYmmdd, formattedTime, getDeviceType, formattedDate, formatEnforcer }; +export { setGoodsNum, isObject, comparisonObject, isElementHidden, formattedTimeYYYYmmdd, formattedTime, getDeviceType, formattedDate, formatEnforcer, formatTime }; diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementEvaluateDetail.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementEvaluateDetail.vue index 6a44bba5..bea16b24 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementEvaluateDetail.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementEvaluateDetail.vue @@ -59,13 +59,13 @@
执法时间 - {{ detail.enforcementTime }} + {{ formatTime(detail.enforcementTime) }}
- 受委托执法 + 受委托执法 是 @@ -74,7 +74,7 @@
- 委托行政机关 + 委托行政机关 {{ detail.entrustDeptName }}
@@ -199,7 +199,7 @@ import { } from '@/api/enforcement'; import { loadDict, getDictText } from '@/util/dictUtil'; import { baseUrl } from '@/config/env'; -import { formatEnforcer } from '@/util/util'; +import { formatEnforcer, formatTime } from '@/util/util'; const router = useRouter(); const route = useRoute(); @@ -494,7 +494,6 @@ const onSubmit = () => { font-size: 14px; width: 60px; } - .info-value { color: #999; flex: 1; @@ -516,7 +515,9 @@ const onSubmit = () => { font-size: 14px; width: 60px; } - + .has-auto-label{ + width: 70px; + } .info-value { color: #999; flex: 1; diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementRegister.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementRegister.vue index e4cea58e..2e64d2a2 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementRegister.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementRegister.vue @@ -32,7 +32,7 @@
- 保存 + 保存 提交 提交并转办案
@@ -450,7 +450,7 @@ const handleSave = () => { sessionStorage.removeItem('enterpriseScanData'); sessionStorage.removeItem('outOfCityEnterprise'); sessionStorage.removeItem('scanReason'); - router.push('/enforcement/enforcementList'); + router.replace('/enforcement/enforcementList'); } else { showToast(res.msg || '保存失败'); } diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/notice/cp_notice_tab_content.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/notice/cp_notice_tab_content.vue index 87b64857..9b595808 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/notice/cp_notice_tab_content.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/notice/cp_notice_tab_content.vue @@ -18,14 +18,14 @@
{{ getStatusText(item.status) }}
-
{{ formatDate(item.createTime) }}
+
{{ formatTime(item.createTime) }}
{{ item.enforceContent || '暂无执法事项' }}
执法日期:
-
{{ item.enforceDate || '-' }} {{ getTimeText(item.enforceTime) }}
+
{{ formatTime(item.enforceDate) }} {{ getTimeText(item.enforceTime) }}
@@ -89,6 +89,7 @@