1

fhKeeper/formulahousekeeper/timesheet-workshop/src/views/statistic/index.vue

@@ -192,7 +192,7 @@
                 <el-table-column align="center" prop="rounding" label="凑整件数" min-width="150">
                   <template slot-scope="scope">{{scope.row.rounding}}</template>
                 </el-table-column>
-                <el-table-column align="center" prop="converted" label="拆算件数" min-width="150">
+                <el-table-column align="center" prop="converted" label="折算件数" min-width="150">
                   <template slot-scope="scope">{{scope.row.converted}}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="total" label="总件数" min-width="150">
@@ -216,19 +216,20 @@
                 </el-table-column>
                 <el-table-column v-for="(item, index) in planDataWithStationHead" :key="index" :label="item" align="center" min-width="250">
                     <template slot-scope="scope">
-                        <div v-for="(items, indexs) in (isViewUser?scope.row.userList:scope.row.deptList)" :key="indexs" >
+                        <div  v-for="(items, indexs) in (isViewUser?scope.row.userList:scope.row.deptList)" :key="indexs" >
                             <div v-if="items.startDate == item">
-                                <div>{{items.planHour}}分钟  {{items.planCost}}元 </div>
-                                <div>{{items.nowHour}}分钟  {{items.nowCost}}元</div>
+                                <div>计划数:{{items.planNum}} {{items.planHour}}分钟  {{items.planCost}}元 </div>
+                                <div>实际数:{{items.nowNum}} {{items.nowHour}}分钟  {{items.nowCost}}元</div>
+                                <div v-if="!isViewUser">进度:{{items.progress}}</div>
                             </div>
                         </div>
                     </template>
                 </el-table-column>
-                <el-table-column align="center" prop="totalResult" label="合计" min-width="150">
+                <el-table-column align="center" prop="totalResult" label="合计" min-width="280">
                    <template slot-scope="scope">
-                                计划数:{{scope.row.totalPlanNum}}  {{scope.row.totalPlanHour}}分钟  {{scope.row.totalPlanCost}}元 
-                                实际数:{{scope.row.totalNowNum}}  {{scope.row.totalNowHour}}分钟  {{scope.row.totalNowCost}}元
-                                进度:{{scope.row.totalProgress}}
+                                <div>计划数:{{scope.row.totalPlanNum}}  {{scope.row.totalPlanHour}}分钟  {{scope.row.totalPlanCost}}元 </div>
+                                <div>实际数:{{scope.row.totalNowNum}}  {{scope.row.totalNowHour}}分钟  {{scope.row.totalNowCost}}元</div>
+                                <div>进度:{{scope.row.totalProgress}}</div>
                   </template>
                 </el-table-column>
             </el-table>