|
@@ -60,7 +60,7 @@
|
|
|
</van-cell>
|
|
</van-cell>
|
|
|
</div>
|
|
</div>
|
|
|
<van-cell v-if="selectedUser.accompanyingPerson" title="陪同人员" :value="selectedUser.accompanyingPerson"></van-cell>
|
|
<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
|
|
<van-field
|
|
|
v-if="canRecord() && !selectedUser.accompanyingPerson"
|
|
v-if="canRecord() && !selectedUser.accompanyingPerson"
|
|
|
v-model="formData.accompanyingPerson"
|
|
v-model="formData.accompanyingPerson"
|
|
@@ -70,7 +70,7 @@
|
|
|
:maxlength="200"
|
|
:maxlength="200"
|
|
|
placeholder="请输入陪同人员姓名"
|
|
placeholder="请输入陪同人员姓名"
|
|
|
label="陪同人员"></van-field>
|
|
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>
|
|
<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">
|
|
<div class="upload-box" v-if="selectedUser.submitSign">
|
|
|
<span>登记签名</span>
|
|
<span>登记签名</span>
|
|
@@ -83,7 +83,7 @@
|
|
|
</div>
|
|
</div>
|
|
|
</van-cell>
|
|
</van-cell>
|
|
|
</div>
|
|
</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" />
|
|
<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>
|
|
</div>
|
|
|
|
|
|
|
@@ -173,7 +173,7 @@ export default {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if(!this.selectedUser.arrivalTime && !arrivalTime){
|
|
if(!this.selectedUser.arrivalTime && !arrivalTime){
|
|
|
- this.$toast('请选择到达时间');
|
|
|
|
|
|
|
+ this.$toast('请选择进入时间');
|
|
|
return
|
|
return
|
|
|
}
|
|
}
|
|
|
|
|
|