Ver Fonte

到达时间修改为进入时间

xujie há 1 ano atrás
pai
commit
aab3f93c17

+ 1 - 1
src/views/menu/iot/add.vue

@@ -172,7 +172,7 @@ export default {
         return
       }
       if(!this.formData.arrivalTime){
-        this.$toast('请选择到达时间');
+        this.$toast('请选择进入时间');
         return
       }
       let data = {

+ 2 - 2
src/views/menu/visitRecord/add.vue

@@ -62,7 +62,7 @@
                 <uploader :maxCount="2" v-model="formData.checkImage"/>
               </van-cell>
             </div>
-            <date-cell required title="到达时间" :min-date="selectedUser.minDate"  :max-date="maxDate" v-model="formData.arrivalTime" date-type="datetime" />
+            <date-cell required title="进入时间" :min-date="selectedUser.minDate"  :max-date="maxDate" v-model="formData.arrivalTime" date-type="datetime" />
 <!--            <date-cell title="离开时间" :max-date="maxData" v-model="formData.departureTime" date-type="datetime" />-->
           </div>
           <div class="big-btn-box" >
@@ -208,7 +208,7 @@ export default {
         return
       }
       if(!this.formData.arrivalTime){
-        this.$toast('请选择到达时间');
+        this.$toast('请选择进入时间');
         return
       }
       let data = {

+ 4 - 4
src/views/menu/visitRecord/detail.vue

@@ -60,7 +60,7 @@
               </van-cell>
             </div>
             <van-cell v-if="selectedUser.accompanyingPerson" title="陪同人员" :value="selectedUser.accompanyingPerson"></van-cell>
-            <!-- <date-cell v-if="selectedUser.approveStatus==1 && !selectedUser.accompanyingPerson" required title="到达时间" :max-date="maxData" :min-date='minDate' :is-row="true"  v-model="formData.arrivalTime" date-type="datetime" /> -->
+            <!-- <date-cell v-if="selectedUser.approveStatus==1 && !selectedUser.accompanyingPerson" required title="进入时间" :max-date="maxData" :min-date='minDate' :is-row="true"  v-model="formData.arrivalTime" date-type="datetime" /> -->
             <van-field
               v-if="canRecord() && !selectedUser.accompanyingPerson"
               v-model="formData.accompanyingPerson"
@@ -70,7 +70,7 @@
               :maxlength="200"
               placeholder="请输入陪同人员姓名"
               label="陪同人员"></van-field>
-            <van-cell title="到达时间" v-if="selectedUser.arrivalTime" :value="dayjs(selectedUser.arrivalTime).format('YYYY-MM-DD HH:mm')"></van-cell>
+            <van-cell title="进入时间" v-if="selectedUser.arrivalTime" :value="dayjs(selectedUser.arrivalTime).format('YYYY-MM-DD HH:mm')"></van-cell>
             <van-cell title="离开时间" v-if="selectedUser.departureTime" :value="dayjs(selectedUser.departureTime).format('YYYY-MM-DD HH:mm')"></van-cell>
             <div class="upload-box" v-if="selectedUser.submitSign">
               <span>登记签名</span>
@@ -83,7 +83,7 @@
                 </div>
               </van-cell>
             </div>
-            <date-cell v-if="canRecord() && !selectedUser.arrivalTime" required title="到达时间" :max-date="maxData" :min-date='minDate' :is-row="true"  v-model="formData.arrivalTime" date-type="datetime" />
+            <date-cell v-if="canRecord() && !selectedUser.arrivalTime" required title="进入时间" :max-date="maxData" :min-date='minDate' :is-row="true"  v-model="formData.arrivalTime" date-type="datetime" />
             <date-cell v-if="canRecord() && selectedUser.arrivalTime && !selectedUser.departureTime" required title="离开时间" :max-date="maxData" :min-date='minDate' :is-row="true"  v-model="formData.departureTime" date-type="datetime" />
           </div>
 
@@ -173,7 +173,7 @@ export default {
       }
 
       if(!this.selectedUser.arrivalTime && !arrivalTime){
-        this.$toast('请选择到达时间');
+        this.$toast('请选择进入时间');
         return
       }
 

+ 5 - 5
src/views/menu/visitRecord/index.vue

@@ -68,13 +68,13 @@
                        {{v.approveTime? dayjs(v.approveTime).format('YYYY-MM-DD HH:mm') : '暂无'}}
                       </div>
                   </div>
-                
+
                   <div class="info-item">
                     <div class="item-label">人员姓名</div>
                     <div class="item-value"> {{v.userName}}</div>
                   </div>
                   <div class="info-item">
-                    <div class="item-label">到达时间</div>
+                    <div class="item-label">进入时间</div>
                     <div class="item-value">
                       <!-- {{ dayjs(v.arrivalTime).format('YYYY-MM-DD HH:mm')}} -->
                       {{v.arrivalTime? dayjs(v.arrivalTime).format('YYYY-MM-DD HH:mm') : '暂无'}}
@@ -112,7 +112,7 @@
 <!--&lt;!&ndash;                  <div class="item-value">{{v.idCard}}</div>&ndash;&gt;-->
 <!--&lt;!&ndash;                </div>&ndash;&gt;-->
 <!--                <div class="info-item">-->
-<!--                  <div class="item-label">到达时间:</div>-->
+<!--                  <div class="item-label">进入时间:</div>-->
 <!--                  <div class="item-value">-->
 <!--                    {{ dayjs(v.arrivalTime).format('YYYY-MM-DD HH:mm')}}-->
 <!--                  </div>-->
@@ -135,7 +135,7 @@
 <!--          </card>-->
         </Scroll>
       </div>
-     
+
     </div>
     <!-- <drag-button @btnClick="clickAdd"></drag-button> -->
   </div>
@@ -156,7 +156,7 @@ import dayjs from "dayjs";
 export default {
   name: 'visitRecord',
   components: {
-   
+
     DragButton,
     NavBar,
     OrgTree,