|
|
@@ -113,9 +113,9 @@
|
|
|
</span>
|
|
|
</span>
|
|
|
<span style="float:right;">
|
|
|
- <el-link type="primary" style="margin-right:10px;" :underline="false" @click="isSubstitude=false;fillInReport(-1,0)">{{$t('textLink.fillInTheWork')}}</el-link>
|
|
|
+ <!-- <el-link type="primary" style="margin-right:10px;" :underline="false" @click="isSubstitude=false;fillInReport(-1,0)">{{$t('textLink.fillInTheWork')}}</el-link> -->
|
|
|
<el-link type="primary" v-if="permissions.reportsFillOut" style="margin-right:10px;" :underline="false" @click="isSubstitude=true; fillInReport(-1,2)">{{$t('textLink.helpToFillIn')}}</el-link>
|
|
|
- <el-link type="primary" v-if="permissions.reportSettings" style="margin-right:10px;" :underline="false" @click="fillInReport(-1,2)">补报设置</el-link>
|
|
|
+ <!-- <el-link type="primary" v-if="permissions.reportSettings" style="margin-right:10px;" :underline="false" @click="fillInReport(-1,2)">补报设置</el-link> -->
|
|
|
<el-link type="primary" style="margin-right:10px;" :underline="false" @click="showExportDialog" v-if="permissions.reportExport">{{$t('textLink.exportWork')}}</el-link>
|
|
|
<el-link type="primary" style="margin-right:10px;" :underline="false" @click="showWorkTime" >查看报工记录</el-link>
|
|
|
<!--部门负责人给个导出工时的功能 -->
|
|
|
@@ -138,7 +138,7 @@
|
|
|
<!-- 工作总时长： -->
|
|
|
{{$t('other.totalWorkingHours')}}
|
|
|
<!-- <span :style="parseFloat(item1.reportTime)>parseFloat(item1.calculateTime)+0.5?'color:red':''">{{item1.reportTime}}h</span> -->
|
|
|
- <span >{{item1.reportTime | amounts}}</span>h
|
|
|
+ <span style="color:goldenrod;font-weight:bold;">{{item1.reportTime | amounts}}</span> 分钟
|
|
|
</span>
|
|
|
<span class="approvalProcessBox" v-if="user.timeType.showFillauditTime == 1">
|
|
|
<i class="iconfont firerock-iconliucheng1"></i>
|
|
|
@@ -158,7 +158,7 @@
|
|
|
<el-card shadow="never">
|
|
|
<p v-if="item2.planType == 0">排产工单号：<b>{{item2.productSchedulingNum}}</b></p>
|
|
|
<p v-if="item2.planType == 1">任务变更通知号：<b>{{item2.taskChangeNoticeNum}}</b></p>
|
|
|
- <p>工作时长：<b>{{item2.workingTime.toFixed(2)}} h</b></p>
|
|
|
+ <p>工作时长：<b style="color:goldenrod">{{item2.workingTime.toFixed(2)}} </b>分钟</p>
|
|
|
<p v-if="item2.planType == 0">产品名称：<b>{{item2.productName}}</b></p>
|
|
|
<p v-if="item2.planType == 0">工序名称：<b>{{item2.procedureName}}</b></p>
|
|
|
<p v-if="item2.planType == 1">任务名称：<b>{{item2.taskName}}</b></p>
|
