修改bug

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};

src/views/enforce/historyCheck.vue

@@ -57,7 +57,7 @@
                             <van-swipe-cell class="swipe_cell">
                                 <div class="card_box">
                                     <div class="card_box_span">
-                                        <p>执法时间：{{  formattedTimeYYYYmmdd(item.enforcementTime) }}</p>
+                                        <p>执法时间：{{  formattedDate(item.enforcementTime) }}</p>
                                       <div class="act-btn">
                                         <span v-if="item.enforceReason != '' && enforceReason != null" class="remsty">未扫码</span>
                                         <!-- <span v-if="item.uniteCheck != '' && item.uniteCheck != null" class="joint-mark">联</span> -->
@@ -89,7 +89,7 @@
                                         <div class="card_box_span">
                                             <p><label class="card_box_label">企业名称：</label> <span>{{ item.enterpriseName }}</span></p>
                                         </div>
-                                        <div class="btn-list" v-if="item.isSubmit == 0">
+                                        <div class="btn-list" v-if="item.isSubmit == 0 && item.lawEnforcerId == useCommon.userId">
                                             <a @click.stop="toEditView(item)">
                                                 <van-icon name="edit"/>
                                                 编辑</a>
@@ -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<data.ga_columns.length; j++) {
-                // 		if (itemTxt == data.ga_columns[j].value) {
-                // 			success.data[i].lawEnforcementItem = data.ga_columns[j].text;
-                // 			break;
-                // 		}
-                // 	}
-                // setLinkageItem(success.data[i].lawEnforcementItem,success.data[i]);
-            // }
-
-
         }, error => {
 
         })

src/views/enforce/sign.vue

@@ -192,7 +192,7 @@
                   <view v-if="data.auth_checked===true">
                     <van-field
                             v-model="submitData.entrustDeptName"
-                            label="委托单位"
+                            label="委托行政机关"
                             placeholder="请选择"
                             is-link
                             readonly
@@ -985,7 +985,7 @@
             if(null != data.tempDate){
                 submitData.enforcementTime=submitData.enforcementTime+" 00:00:00"
             }
-            submitData.lawCertificateNumText="";
+            submitData.lawCertificateNumText=""
             editEnforcementRegistration(submitData, success => {
                 data.overlayShow = false;    // 遮罩层
                 //跳转首页

src/views/enterprise/registrationDetail.vue

@@ -111,7 +111,7 @@
               <view v-if="data.auth_checked===true">
                     <van-field
                             v-model="data.entrustDeptName"
-                            label="委托单位"
+                            label="委托行政机关"
                             readonly
                         />
                         
@@ -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;
 

src/views/enterprise/registrationEdit.vue

@@ -278,7 +278,7 @@
                   <view v-if="data.auth_checked===true">
                     <van-field
                             v-model="submitData.entrustDeptName"
-                            label="委托单位"
+                            label="委托行政机关"
                             placeholder="请选择"
                             is-link
                             readonly