Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/timesheet-workshop/src/permissions.js

@@ -212,7 +212,7 @@ const StringUtil = {
         arr[i] == '负责项目任务分组工时' ? obj.reportGroup = true : ''
         arr[i] == '全部项目成本基线表' ? obj.reportAllOutputValue = true : ''
         arr[i] == '负责项目成本基线表' ? obj.reportOutputValue = true : ''
-        arr[i] == '日报导出' ? obj.reportExport = true : ''
+        arr[i] == '导出日报' ? obj.reportExport = true : ''
         arr[i] == '手动推送工时' ? obj.reportPush = true : ''
         arr[i] == '查看全公司数值' ? obj.customDataAll = true : ''
         arr[i] == '查看全公司' ? obj.viewAllSummary = true : ''

fhKeeper/formulahousekeeper/timesheet-workshop/src/views/workReport/daily.vue

@@ -116,7 +116,7 @@
                                     <!-- <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" 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="showExportDialog" v-if="permissions.reportExport">{{$t('textLink.exportWork')}}</el-link> -->
                                     <el-link type="primary" style="margin-right:10px;" :underline="false" @click="showWorkTime" >查看报工记录</el-link>
                                     <!--部门负责人给个导出工时的功能 -->
                                     <!-- <el-link type="primary" v-if="user.manageDeptId != 0" style="margin-right:10px;" :underline="false" @click="showExportTimeDialog">{{$t('textLink.exportingTimeStatistics')}}</el-link> -->
@@ -158,6 +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 >钢印号：<el-tag v-for="num in JSON.parse(item2.steelNumArray)" :key="num" size="small" type="info">{{num}}</el-tag></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>