2022.6.2

fhKeeper/formulahousekeeper/timesheet/src/views/corpreport/list.vue

@@ -323,24 +323,6 @@
                 </div>
               </div>
               <el-table v-if="ins == 6" :key="ins" border :data="overTimeList" highlight-current-row v-loading="listLoading" :height="tableHeight - 30" style="width: 100%;">
-                <!-- <el-table-column prop="projectCode" label="序号" width="180">
-                  <template slot-scope="scope">
-                    <div>
-                      {{scope.$index + 1}}
-                    </div>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="projectCode" label="项目编号" width="180"></el-table-column> 
-                <el-table-column prop="username" label="姓名" width="180"></el-table-column> 
-                <el-table-column prop="overtimeHours" label="加班时长" width="180"></el-table-column> 
-                <el-table-column prop="cost" label="成本" width="180" v-if="permissions.reportCost"></el-table-column> 
-                <el-table-column label="操作" width="180">
-                    <template slot-scope="scope">
-                      <div>
-                        <el-button icon="el-icon-search" size="mini" circle @click="costBtn(scope.row)"></el-button>
-                      </div>
-                    </template>  
-                </el-table-column>  -->
                 <el-table-column prop="projectCode" label="序号" width="80">
                   <template slot-scope="scope">
                     <div>
@@ -354,9 +336,21 @@
                 <el-table-column prop="username" label="姓名" width="120"></el-table-column>
                 <el-table-column prop="departmentName" label="部门" width="140"></el-table-column>
                 <el-table-column prop="createDate" label="工作日期" width="120"></el-table-column>
-                <el-table-column prop="workingTime" label="工作时长(h)" width="100"></el-table-column>
-                <el-table-column prop="overtimeHours" label="加班时长(h)" width="100" fixed="right"></el-table-column>
-                <el-table-column prop="cost" label="加班成本" width="80" v-if="permissions.reportCost" fixed="right"></el-table-column>
+                <el-table-column prop="workingTime" label="工作时长(h)" width="100" align="right">
+                  <template slot-scope="scope">
+                    <span style="padding-right: 15px;">{{scope.row.workingTime.toFixed(1)}}h</span>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="overtimeHours" label="加班时长(h)" width="100" fixed="right" align="right">
+                  <template slot-scope="scope">
+                    <span style="padding-right: 15px;">{{scope.row.overtimeHours.toFixed(1)}}h</span>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="cost" label="加班成本" width="100" v-if="permissions.reportCost" fixed="right" align="right">
+                  <template slot-scope="scope">
+                    <span>￥{{scope.row.cost | numberToCurrency}}</span>
+                  </template>
+                </el-table-column>
               </el-table>
             </div>
             

fhKeeper/formulahousekeeper/timesheet/src/views/project/project_gantt.vue

@@ -57,11 +57,15 @@
       </div>
       <!-- 资源需求导入/导出 -->
       <div class="head_files" v-if="!isDataLoaded">
-        <el-link type="primary" style="margin-left:10px;float:left;" :underline="false" href="./upload/资源需求导入模板.xlsx" download="资源需求导入模板.xlsx">模板下载</el-link>
+        <div style="margin-left:10px;float:left;">
+        <el-link type="primary" :underline="false" href="./upload/资源需求导入模板.xlsx" download="资源需求导入模板.xlsx">模板下载</el-link>
+        </div>
         <el-upload ref="upload" style="margin-left:10px;float:left;" action="#" :limit="1" :http-request="importProject" :show-file-list="false">
           <el-link type="primary" :underline="false" >导入需求</el-link>
         </el-upload>
-        <el-link type="primary" style="margin-left:10px;float:left;" :underline="false" @click="exportProjectData" download="资源需求导出.xlsx">导出需求</el-link>
+        <div style="margin-left:10px;float:left;">
+        <el-link type="primary" :underline="false" @click="exportProjectData" download="资源需求导出.xlsx">导出需求</el-link>
+        </div>
       </div>
     </div>
 

fhKeeper/formulahousekeeper/timesheet/src/views/task/list.vue

@@ -72,7 +72,7 @@
                         </template>
                     </el-table-column>
                     
-                    <el-table-column prop="createDate" label="开始时间" sortable width="180"></el-table-column>
+                    <el-table-column prop="startDate" label="开始时间" sortable width="180"></el-table-column>
                     <el-table-column prop="endDate" label="截止时间" width="260" fixed="right" sortable>
                         <template slot-scope="scope">
                             <div style="display: flex;justify-content: space-between;padding-right: 40px">