|
|
@@ -367,10 +367,9 @@
|
|
|
<!-- <van-field readonly clickable class="form_input" :value="item.workingTime" name="workingTime" label="工作时长" placeholder="请输入工作时长（单位：小时）"
|
|
|
:rules="[{ required: true, message: '请输入工作时长（单位：小时）' }]" @touchstart.native.stop="showNumberKey = true"/>
|
|
|
<van-number-keyboard v-model="item.workingTime" :show="showNumberKey" close-button-text="完成" extra-key="." :maxlength="4" @blur="showNumberKey = false" /> -->
|
|
|
-
|
|
|
<!-- 常规选择时间的方式 -->
|
|
|
<!-- 全天上下午模式 -->
|
|
|
- <div v-if="reportTimeType.multiWorktime == 0 && (hideWorkingHours && item.canEdit)">
|
|
|
+ <div v-if="reportTimeType.multiWorktime == 0 && (!hideWorkingHours || (hideWorkingHours && item.canEdit)) ">
|
|
|
<van-field v-if="reportTimeType.type < 2" readonly clickable :disabled="!item.canEdit"
|
|
|
:value="reportTimeType.type == 0 ? item.label : (parseFloat(item.workingTime).toFixed(1) + 'h')"
|
|
|
label="工作时长" placeholder="请选择工作时长(小时)" @click="clickTimePicker(index, item)"
|
|
|
@@ -428,7 +427,7 @@
|
|
|
</div>
|
|
|
|
|
|
<!-- 多个时间和工作事项的选择方式 -->
|
|
|
- <div v-if="reportTimeType.multiWorktime == 1 && (hideWorkingHours && item.canEdit)">
|
|
|
+ <div v-if="reportTimeType.multiWorktime == 1 && (!hideWorkingHours || (hideWorkingHours && item.canEdit))">
|
|
|
<div v-for="(timeItem, tindex) in item.worktimeList" :key="tindex"
|
|
|
style="position:relative;border:#ccc 0.5px solid;margin:7px;">
|
|
|
<van-tag v-if="tindex > 0 && item.canEdit"
|
|
|
@@ -480,7 +479,7 @@
|
|
|
</div>
|
|
|
|
|
|
<div class="overtime"
|
|
|
- v-if="((user.timeType.fillOvertime || (isWeekend && user.timeType.lockWorktime != 1)) || (isCorpWX && canEdit)) && (hideWorkingHours && item.canEdit)">
|
|
|
+ v-if="((user.timeType.fillOvertime || (isWeekend && user.timeType.lockWorktime != 1)) || (isCorpWX && canEdit)) && (!hideWorkingHours || (hideWorkingHours && item.canEdit))">
|
|
|
<div class="overTimeClas"
|
|
|
v-if="user.timeType.fillOvertime || (isWeekend && user.timeType.lockWorktime != 1)">
|
|
|
<van-checkbox :disabled="!item.canEdit" v-model="item.isOvertime"
|
