Browse Source

时间格式化修改

dev-V1.10.2-temp
wangmingyong@163.com 3 months ago
parent
commit
206e7ad3ea
  1. 20
      zdxt-web-client/zdxt-efcode-enforcement-app/src/util/util.js
  2. 13
      zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementEvaluateDetail.vue
  3. 4
      zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementRegister.vue
  4. 5
      zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/notice/cp_notice_tab_content.vue

20
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 * @param {*} name
@ -164,4 +182,4 @@ const formatEnforcer = (item) => {
return enforcers; return enforcers;
}; };
export { setGoodsNum, isObject, comparisonObject, isElementHidden, formattedTimeYYYYmmdd, formattedTime, getDeviceType, formattedDate, formatEnforcer }; export { setGoodsNum, isObject, comparisonObject, isElementHidden, formattedTimeYYYYmmdd, formattedTime, getDeviceType, formattedDate, formatEnforcer, formatTime };

13
zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementEvaluateDetail.vue

@ -59,13 +59,13 @@
</div> </div>
<div class="info-row"> <div class="info-row">
<span class="info-label">执法时间</span> <span class="info-label">执法时间</span>
<span class="info-value">{{ detail.enforcementTime }}</span> <span class="info-value">{{ formatTime(detail.enforcementTime) }}</span>
</div> </div>
</div> </div>
<div class="info-card"> <div class="info-card">
<div class="info-has-auto"> <div class="info-has-auto">
<span class="info-label">受委托执法</span> <span class="info-label has-auto-label">受委托执法</span>
<span class="info-value"> <span class="info-value">
<van-radio-group v-model="detail.hasAuto" direction="horizontal" disabled> <van-radio-group v-model="detail.hasAuto" direction="horizontal" disabled>
<van-radio :name="1" shape="square">是</van-radio> <van-radio :name="1" shape="square">是</van-radio>
@ -74,7 +74,7 @@
</span> </span>
</div> </div>
<div class="info-row" v-if="detail.hasAuto"> <div class="info-row" v-if="detail.hasAuto">
<span class="info-label">委托行政机关</span> <span class="info-label has-auto-label">委托行政机关</span>
<span class="info-value">{{ detail.entrustDeptName }}</span> <span class="info-value">{{ detail.entrustDeptName }}</span>
</div> </div>
</div> </div>
@ -199,7 +199,7 @@ import {
} from '@/api/enforcement'; } from '@/api/enforcement';
import { loadDict, getDictText } from '@/util/dictUtil'; import { loadDict, getDictText } from '@/util/dictUtil';
import { baseUrl } from '@/config/env'; import { baseUrl } from '@/config/env';
import { formatEnforcer } from '@/util/util'; import { formatEnforcer, formatTime } from '@/util/util';
const router = useRouter(); const router = useRouter();
const route = useRoute(); const route = useRoute();
@ -494,7 +494,6 @@ const onSubmit = () => {
font-size: 14px; font-size: 14px;
width: 60px; width: 60px;
} }
.info-value { .info-value {
color: #999; color: #999;
flex: 1; flex: 1;
@ -516,7 +515,9 @@ const onSubmit = () => {
font-size: 14px; font-size: 14px;
width: 60px; width: 60px;
} }
.has-auto-label{
width: 70px;
}
.info-value { .info-value {
color: #999; color: #999;
flex: 1; flex: 1;

4
zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/enforce/enforcementRegister.vue

@ -32,7 +32,7 @@
<!-- 底部按钮 --> <!-- 底部按钮 -->
<div class="bottom-buttons"> <div class="bottom-buttons">
<van-button v-if="!isNonEnforcement" class="btn-save" @click="handleSave">保存</van-button> <van-button v-if="!isNonEnforcement && !editId" class="btn-save" @click="handleSave">保存</van-button>
<van-button class="btn-submit" type="primary" native-type="submit">提交</van-button> <van-button class="btn-submit" type="primary" native-type="submit">提交</van-button>
<van-button v-if="showTransferButton && !isNonEnforcement" class="btn-transfer" @click="handleSubmitAndTransfer">提交并转办案</van-button> <van-button v-if="showTransferButton && !isNonEnforcement" class="btn-transfer" @click="handleSubmitAndTransfer">提交并转办案</van-button>
</div> </div>
@ -450,7 +450,7 @@ const handleSave = () => {
sessionStorage.removeItem('enterpriseScanData'); sessionStorage.removeItem('enterpriseScanData');
sessionStorage.removeItem('outOfCityEnterprise'); sessionStorage.removeItem('outOfCityEnterprise');
sessionStorage.removeItem('scanReason'); sessionStorage.removeItem('scanReason');
router.push('/enforcement/enforcementList'); router.replace('/enforcement/enforcementList');
} else { } else {
showToast(res.msg || '保存失败'); showToast(res.msg || '保存失败');
} }

5
zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/notice/cp_notice_tab_content.vue

@ -18,14 +18,14 @@
<div class="status-tag" :class="'status-' + item.status"> <div class="status-tag" :class="'status-' + item.status">
{{ getStatusText(item.status) }} {{ getStatusText(item.status) }}
</div> </div>
<div class="card-date">{{ formatDate(item.createTime) }}</div> <div class="card-date">{{ formatTime(item.createTime) }}</div>
</div> </div>
<div class="notice-title">{{ item.enforceContent || '暂无执法事项' }}</div> <div class="notice-title">{{ item.enforceContent || '暂无执法事项' }}</div>
<div class="info-row"> <div class="info-row">
<div class="label">执法日期:</div> <div class="label">执法日期:</div>
<div class="value">{{ item.enforceDate || '-' }} {{ getTimeText(item.enforceTime) }}</div> <div class="value">{{ formatTime(item.enforceDate) }} {{ getTimeText(item.enforceTime) }}</div>
</div> </div>
<div class="info-row"> <div class="info-row">
@ -89,6 +89,7 @@
<script setup> <script setup>
import { getMyNoticeList } from '@/api/enforcement/notice'; import { getMyNoticeList } from '@/api/enforcement/notice';
import { formatTime } from '@/util/util';
const props = defineProps({ const props = defineProps({
status: { type: Number, required: true }, status: { type: Number, required: true },

Loading…
Cancel
Save