diff --git a/src/util/util.js b/src/util/util.js index a121416..df218e4 100644 --- a/src/util/util.js +++ b/src/util/util.js @@ -94,6 +94,21 @@ const formattedTime = (dateTime) =>{ return `${year}-${month}-${day} ${hour}:${minute}:${second}`; } +const formattedDate = (dateTime) =>{ + const date = new Date(dateTime); + const year = date.getFullYear(); + const month = ("0" + (date.getMonth() + 1)).slice(-2); + const day = ("0" + date.getDate()).slice(-2); + const hour = ("0" + date.getHours()).slice(-2); + const minute = ("0" + date.getMinutes()).slice(-2); + const second = ("0" + date.getSeconds()).slice(-2); + if(hour==="00" && minute==="00" && second==="00"){ + return `${year}-${month}-${day}`; + }else{ + return `${year}-${month}-${day} ${hour}:${minute}:${second}`; + } +} + /** * 格式化用户名称为两个字的姓名 * @param {*} name @@ -118,4 +133,4 @@ const getDeviceType = () =>{ } } -export { setGoodsNum, isObject, comparisonObject, isElementHidden ,formattedTimeYYYYmmdd,formattedTime,getDeviceType}; +export { setGoodsNum, isObject, comparisonObject, isElementHidden ,formattedTimeYYYYmmdd,formattedTime,getDeviceType,formattedDate}; diff --git a/src/views/enforce/historyCheck.vue b/src/views/enforce/historyCheck.vue index 4c786ca..5227ff4 100644 --- a/src/views/enforce/historyCheck.vue +++ b/src/views/enforce/historyCheck.vue @@ -57,7 +57,7 @@
-

执法时间:{{ formattedTimeYYYYmmdd(item.enforcementTime) }}

+

执法时间:{{ formattedDate(item.enforcementTime) }}

未扫码 @@ -89,7 +89,7 @@

{{ item.enterpriseName }}

-
+
编辑 @@ -122,7 +122,7 @@ import {queryRegistrationList, getAttr} from '../../api/enforce'; import {queryLinkage, queryLinkageById, queryLinkageDictByValueAndParentId} from "@/api/linkage"; import {nameCorrect,encryptPhone} from'@/util/fileUpload'; - import { formattedTimeYYYYmmdd } from'@/util/util'; + import { formattedDate } from'@/util/util'; const {useCommon, useShopCard} = $globalStore; const router = useRouter(); @@ -225,19 +225,6 @@ } // data.dataList = success.data; data.dataList.push(...success.rows); - // for (var i = 0; i < success.data.length; i++) { - // var itemTxt = success.data[i].lawEnforcementItem; - // console.log(itemTxt); - // for (var j=0; j { }) diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue index 7af24e1..c18be60 100644 --- a/src/views/enforce/sign.vue +++ b/src/views/enforce/sign.vue @@ -192,7 +192,7 @@ { data.overlayShow = false; // 遮罩层 //跳转首页 diff --git a/src/views/enterprise/registrationDetail.vue b/src/views/enterprise/registrationDetail.vue index 90d685d..81a57f6 100644 --- a/src/views/enterprise/registrationDetail.vue +++ b/src/views/enterprise/registrationDetail.vue @@ -111,7 +111,7 @@ @@ -526,7 +526,7 @@ import { getDict } from "@/api/Home"; import { queryLinkageById } from "@/api/linkage"; import { nameCorrect } from "@/util/fileUpload"; import { selectRegistrationList } from "@/api/enterprise"; -import { formattedTimeYYYYmmdd } from "@/util/util"; +import { formattedDate } from "@/util/util"; import { baseUrl } from "@/config/env"; //用户筛选弹窗 // import Popup from './userFilter.vue'; @@ -780,7 +780,7 @@ const queryRegById = () => { // 执法类别 submitData.lawEnforceCategoryText=success.data.lawEnforceCategoryText; // 执法时间 - submitData.enforcementTime = formattedTimeYYYYmmdd( + submitData.enforcementTime = formattedDate( success.data.enforcementTime ); //评价信息 @@ -1007,7 +1007,7 @@ const convertReg = (regs) => { obj.lawFieldText = dt.lawFieldText; obj.checkCategoryText = dt.checkCategoryText; obj.lawEnforceCategoryText = dt.lawEnforceCategoryText; - obj.enforcementTime = formattedTimeYYYYmmdd(dt.enforcementTime); + obj.enforcementTime = formattedDate(dt.enforcementTime); obj.lawEnforcementBasis = dt.lawEnforcementBasis; obj.lawEnforcementBasisText = dt.lawEnforcementBasisText; @@ -1114,7 +1114,7 @@ const convertLaw = (laws) => { obj.lawFieldText = dt.lawFieldText; obj.checkCategoryText = dt.checkCategoryText; obj.lawEnforceCategoryText = dt.lawEnforceCategoryText; - obj.enforcementTime = formattedTimeYYYYmmdd(dt.checkTime); + obj.enforcementTime = formattedDate(dt.checkTime); obj.lawEnforcementBasis = dt.lawEnforcementBasis; obj.lawEnforcementBasisText = dt.lawEnforcementBasisText; diff --git a/src/views/enterprise/registrationEdit.vue b/src/views/enterprise/registrationEdit.vue index ae22964..d003370 100644 --- a/src/views/enterprise/registrationEdit.vue +++ b/src/views/enterprise/registrationEdit.vue @@ -278,7 +278,7 @@