1

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ExpenseSheetServiceImpl.java

@@ -145,6 +145,10 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
                 } else if (auditSetting.getAuditType() == 1) {
                     //项目经理审核，默认为待审核状态
                     sheet.setStatus(1);
+                }else if (auditSetting.getAuditType() == 2) {
+                    if (sheet.getStatus() == null) {
+                        sheet.setStatus(1);//默认提交时为待审核状态
+                    }
                 }
             }
         }

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

@@ -189,17 +189,18 @@
 
             <!-- 车间工位计划表 -->
             <el-table v-if="ins == 6"  key="7" border :data="planDataWithStationDatas" highlight-current-row v-loading="listLoading" :height="+tableHeight - 1" style="width: 100%;">
-                <el-table-column align="center" prop="departmentCascade" label="部门名称" min-width="150" fixed="left">
+                <el-table-column align="center" prop="departmentCascade" label="部门名称"   min-width="150"  fixed="left">
                   <template slot-scope="scope">
-                    {{scope.row.departmentCascade}}
+                    <!-- <span class="colorText" @click="showReportDetail(scope.row,item)" >{{scope.row.departmentCascade}}</span> -->
+                    <span class="colorText" >{{scope.row.departmentCascade}}</span>
                   </template>
                 </el-table-column>
                 <el-table-column v-for="(item, index) in planDataWithStationHead" :key="index" :label="item" align="center" min-width="150">
                     <template slot-scope="scope">
-                        <div v-for="(items, indexs) in scope.row.deptList" :key="indexs" @click="showReportDetail(scope.row,item)" class="colorText">
+                        <div v-for="(items, indexs) in scope.row.deptList" :key="indexs" >
                             <div v-if="items.startDate == item">
-                                计划数:{{items.planNum}}  {{items.cost}}分钟  {{items.cost}}元 
-                                实际数:{{items.nowNum}}  {{items.cost}}分钟  {{items.cost}}元
+                                计划数:{{items.planNum}}  {{items.planHour}}分钟  {{items.planCost}}元 
+                                实际数:{{items.nowNum}}  {{items.nowHour}}分钟  {{items.nowCost}}元
                                 进度:{{items.progress}}
                             </div>
                         </div>
@@ -207,7 +208,9 @@
                 </el-table-column>
                 <el-table-column align="center" prop="totalResult" label="合计" min-width="150">
                    <template slot-scope="scope">
-                    {{scope.row.totalResult}}
+                                计划数:{{scope.row.totalPlanNum}}  {{scope.row.totalPlanHour}}分钟  {{scope.row.totalPlanCost}}元 
+                                实际数:{{scope.row.totalNowNum}}  {{scope.row.totalNowHour}}分钟  {{scope.row.totalNowCost}}元
+                                进度:{{scope.row.totalProgress}}
                   </template>
                 </el-table-column>
             </el-table>

fhKeeper/formulahousekeeper/timesheet_h5/src/views/expense/index.vue

@@ -257,8 +257,10 @@
                                 :to="{ name: 'expenseDetails', params: { id: item.id, canEdit: false, isAudit:true } }">审核</van-button>
                             </div>
                             <div class="operation" v-if="auditTypeItem.auditType == 2">
-                                <van-button size="small" type="info"
-                                :to="{ name: 'expenseDetails', params: { id: item.id, canEdit: false, isAudit:true } }">审核</van-button>
+                                <van-button size="small" type="info" :loading="item.approveLoading"
+                                    @click.stop="approve(item)">通过</van-button>
+                                <van-button style="margin-left:15px" size="small" type="danger"
+                                    @click.stop="denyToReason(item.id)">驳回</van-button>
                             </div>
                         </template>
                         <div class="wrapper">