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

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

@@ -109,6 +109,7 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
         ExpenseAuditSetting auditSetting = expenseAuditSettingMapper.selectById(user.getCompanyId());
 
 
+        //管理员审核权限，有该权限则可以直接修改已审核通过的
         List<SysRichFunction> functionDeptList = sysFunctionMapper.getRoleFunctions(user.getRoleId(), "费用审核");
         boolean isAuditor = functionDeptList.size() > 0;
         boolean isNew = false;
@@ -279,18 +280,24 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
                 expenseItemService.remove(new QueryWrapper<ExpenseItem>().eq("expense_id", sheet.getId()));
                 expenseItemService.saveBatch(itemList);
             } else {
-                //已通过不能删除
-                QueryWrapper<ExpenseItem> queryWrapper = new QueryWrapper<ExpenseItem>().eq("expense_id", sheet.getId());
-                queryWrapper.eq("status", 0);
-                List<ExpenseItem> passList = expenseItemService.list(queryWrapper);
-                //去掉审核通过的
-                itemList = itemList.stream().filter(item->!passList.stream().anyMatch(p->p.getId().equals(item.getId()))).collect(Collectors.toList());
-                //设置为待审核状态
-                System.out.println("设置状态为待审核"+itemList.size());
-                itemList.forEach(item->item.setStatus(1));
-                expenseItemService.remove(new QueryWrapper<ExpenseItem>().eq("expense_id", sheet.getId()).ne("status", 0));
-                if (itemList.size() > 0) {
-                    expenseItemService.saveOrUpdateBatch(itemList);
+                if (isAuditor) {
+                    //有审核权限的人修改，直接修改
+                    expenseItemService.remove(new QueryWrapper<ExpenseItem>().eq("expense_id", sheet.getId()));
+                    expenseItemService.saveBatch(itemList);
+                } else {
+                    //已通过不能删除
+                    QueryWrapper<ExpenseItem> queryWrapper = new QueryWrapper<ExpenseItem>().eq("expense_id", sheet.getId());
+                    queryWrapper.eq("status", 0);
+                    List<ExpenseItem> passList = expenseItemService.list(queryWrapper);
+                    //去掉审核通过的
+                    itemList = itemList.stream().filter(item->!passList.stream().anyMatch(p->p.getId().equals(item.getId()))).collect(Collectors.toList());
+                    //设置为待审核状态
+                    System.out.println("设置状态为待审核"+itemList.size());
+                    itemList.forEach(item->item.setStatus(1));
+                    expenseItemService.remove(new QueryWrapper<ExpenseItem>().eq("expense_id", sheet.getId()).ne("status", 0));
+                    if (itemList.size() > 0) {
+                        expenseItemService.saveOrUpdateBatch(itemList);
+                    }
                 }
             }
         } else {

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

@@ -1437,7 +1437,7 @@
             :data="monthWorkDataS"
             v-el-table-infinite-scroll="listScroll"
             border
-            :height="500"
+            :height="'70vh'"
             highlight-current-row
             style="width: 100%"
             v-loading="tbload"
@@ -1466,12 +1466,16 @@
                 </template>
             </el-table-column>
             <el-table-column
-              min-width="105"
+              min-width="60"
               v-for="(item, index) in pickDateArray"
               :key="index"
-              :label="item.label"
+              :label="item"
               align="center"
             >
+              <template slot="header" slot-scope="scope">
+                <div>{{ scope.column.label.dateStr }}</div>
+                <div>{{ scope.column.label.weekStr }}</div>
+              </template>
               <template slot-scope="scope">
                 <div
                   v-if="
@@ -1613,7 +1617,7 @@
             :data="monthNotWorkDateS"
             v-el-table-infinite-scroll="notListScroll"
             border
-            :height="500"
+            :height="'70vh'"
             highlight-current-row
             style="width: 100%"
             v-loading="tbload"
@@ -1708,7 +1712,7 @@
             :data="monthWorkDataS"
             v-el-table-infinite-scroll="listScroll"
             border
-            :height="500"
+            :height="'70vh'"
             highlight-current-row
             style="width: 100%"
             v-loading="tbload"
@@ -4026,7 +4030,13 @@
         (res) => {
           if (res.code == "ok") {
             this.tbload = false;
-            this.pickDateArray = res.data.days;
+            this.pickDateArray = res.data.days.map(item => {
+                return {
+                    ...item,
+                    dateStr: item.label.split('/')[0],
+                    weekStr: item.label.split('/')[1]
+                }
+            });
             // console.log('dataarray',res.data.days);
             this.monthWorkData = res.data.list;
             // this.monthWorkDataS = this.monthWorkData