|
@@ -65,7 +65,7 @@
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
</template>
|
|
</template>
|
|
|
- <div class="form_text">
|
|
|
|
|
|
|
+ <div class="form_text" v-if="user.timeType.onlyShowPercent == 0">
|
|
|
<span style="margin-right:20px;margin-left:5px;font-size:14px;">
|
|
<span style="margin-right:20px;margin-left:5px;font-size:14px;">
|
|
|
总填报：
|
|
总填报：
|
|
|
<span>{{ parseFloat(item.reportTime).toFixed(1) }}h</span>
|
|
<span>{{ parseFloat(item.reportTime).toFixed(1) }}h</span>
|
|
@@ -73,7 +73,6 @@
|
|
|
</div>
|
|
</div>
|
|
|
<div v-if="user.timeType.enableNewWeeklyfill == 1 && item.summary != null" style="margin-left:20px;"
|
|
<div v-if="user.timeType.enableNewWeeklyfill == 1 && item.summary != null" style="margin-left:20px;"
|
|
|
v-html="'<b>' + item.summaryTitle + '</b><br>' + item.summary.replace(/\r\n/g, '<br>')">
|
|
v-html="'<b>' + item.summaryTitle + '</b><br>' + item.summary.replace(/\r\n/g, '<br>')">
|
|
|
-
|
|
|
|
|
</div>
|
|
</div>
|
|
|
<div v-for="(item1, index1) in item.data" class="one_report_data" :key="index1">
|
|
<div v-for="(item1, index1) in item.data" class="one_report_data" :key="index1">
|
|
|
<div class="project_title" style="font-weight:bold;">项目：{{ item1.project }} <span
|
|
<div class="project_title" style="font-weight:bold;">项目：{{ item1.project }} <span
|
|
@@ -151,7 +150,7 @@
|
|
|
<div class="project_title" v-if="item1.taskId">任务：{{ item1.taskName }}</div>
|
|
<div class="project_title" v-if="item1.taskId">任务：{{ item1.taskName }}</div>
|
|
|
<!--根据类型选择使用的模板 -->
|
|
<!--根据类型选择使用的模板 -->
|
|
|
<div v-if="item1.multiWorktime == 0">
|
|
<div v-if="item1.multiWorktime == 0">
|
|
|
- <div class="project_time">时长：
|
|
|
|
|
|
|
+ <div class="project_time" v-if="user.timeType.onlyShowPercent==0">时长：
|
|
|
<span v-if="item1.reportTimeType == 0" style="margin-right:10px;">{{
|
|
<span v-if="item1.reportTimeType == 0" style="margin-right:10px;">{{
|
|
|
fullDayTxt[item1.timeType] }}</span>
|
|
fullDayTxt[item1.timeType] }}</span>
|
|
|
<span v-if="item1.reportTimeType == 2" style="margin-right:10px;">{{ item1.startTime + '-' +
|
|
<span v-if="item1.reportTimeType == 2" style="margin-right:10px;">{{ item1.startTime + '-' +
|
|
@@ -159,6 +158,10 @@
|
|
|
<div class="button" v-if="item1.isOvertime == 1">加班<span v-if="item1.overtimeHours">{{
|
|
<div class="button" v-if="item1.isOvertime == 1">加班<span v-if="item1.overtimeHours">{{
|
|
|
item1.overtimeHours.toFixed(1) }}h</span></div>
|
|
item1.overtimeHours.toFixed(1) }}h</span></div>
|
|
|
</div>
|
|
</div>
|
|
|
|
|
+ <div class="project_time" v-else>用时占比：
|
|
|
|
|
+ {{ item1.progress }}%
|
|
|
|
|
+ </div>
|
|
|
|
|
+
|
|
|
<div class="project_content">事项：<span v-html="item1.content"></span></div>
|
|
<div class="project_content">事项：<span v-html="item1.content"></span></div>
|
|
|
|
|
|
|
|
</div>
|
|
</div>
|
