Merge remote-tracking branch 'origin/master'

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/controller/PlanController.java

@@ -39,8 +39,8 @@ public class PlanController {
     private PlanSteelStampNumberService planSteelStampNumberService;
 
     @RequestMapping("/list")
-    public HttpRespMsg list(String date,String steelStampNumber,@RequestParam(defaultValue = "3") Integer planType,Integer deptId,Integer pageIndex,Integer pageSize){
-        return planService.getList(date,steelStampNumber,planType,deptId,pageIndex,pageSize);
+    public HttpRespMsg list(String date,String steelStampNumber,@RequestParam(defaultValue = "3") Integer planType,Integer deptId,Integer pageIndex,Integer pageSize,Integer isMob){
+        return planService.getList(date,steelStampNumber,planType,deptId,pageIndex,pageSize,isMob);
     }
     
     @RequestMapping("/getById")

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/mapper/ReportMapper.java

@@ -186,19 +186,19 @@ public interface ReportMapper extends BaseMapper<Report> {
 
     List<Map<String, Object>> getPersonWorkHoursWagesDetail(String date, String userId, Integer companyId,String startDate,String endDate,Integer checkStatus,Integer detailStatus);
 
-    List<Map<String, Object>> getProcedureRealTimeProgressList(Integer companyId,String deptId, String userId, String startDate, String endDate, Integer pageStart, Integer pageSize);
+    List<Map<String, Object>> getProcedureRealTimeProgressList(Integer companyId,String deptId, String foremanId,String userId, String startDate, String endDate, Integer pageStart, Integer pageSize);
 
-    Integer getProcedureRealTimeProgressCount(Integer companyId, String deptId, String userId, String startDate, String endDate);
+    Integer getProcedureRealTimeProgressCount(Integer companyId, String deptId, String foremanId, String userId, String startDate, String endDate);
 
-    List<Map<String, Object>> workReportQuery(Integer companyId,Integer productId, String vehicleNum,String steelNum, Integer deptId, String userId, String startDate, String endDate,Integer pageStart, Integer pageSize);
+    List<Map<String, Object>> workReportQuery(Integer companyId,Integer productId, String vehicleNum,String steelNum, Integer deptId, String foremanId, String userId, String startDate, String endDate,Integer pageStart, Integer pageSize);
 
-    Integer selectCountForWorkQuery(Integer companyId, Integer productId, String vehicleNum, String steelNum, Integer deptId, String userId, String startDate, String endDate);
+    Integer selectCountForWorkQuery(Integer companyId, Integer productId, String vehicleNum, String steelNum, Integer deptId, String foremanId, String userId, String startDate, String endDate);
 
-    List<Map<String, Object>> getPlanRealTimeProgressList(Integer companyId, String deptId, String userId, String startDate, String endDate, Integer pageStart, Integer pageSize);
+    List<Map<String, Object>> getPlanRealTimeProgressList(Integer companyId, String deptId, String foremanId, String userId, String startDate, String endDate, Integer pageStart, Integer pageSize);
 
-    Integer getPlanRealTimeProgressCount(Integer companyId, String deptId, String userId, String startDate, String endDate);
+    Integer getPlanRealTimeProgressCount(Integer companyId, String deptId, String foremanId, String userId, String startDate, String endDate);
 
-    List<Map<String, Object>> getDpetStatisticsProgressList(Integer companyId, String deptId, String userId, String startDate, String endDate, Integer pageStart, Integer pageSize);
+    List<Map<String, Object>> getDpetStatisticsProgressList(Integer companyId, String deptId, String foremanId, String userId, String startDate, String endDate, Integer pageStart, Integer pageSize);
 
-    Integer getDpetStatisticsProgressCount(Integer companyId, String deptId, String userId, String startDate, String endDate);
+    Integer getDpetStatisticsProgressCount(Integer companyId, String deptId, String foremanId, String userId, String startDate, String endDate);
 }

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/PlanService.java

@@ -17,7 +17,7 @@ import org.springframework.web.multipart.MultipartFile;
  */
 public interface PlanService extends IService<Plan> {
 
-    HttpRespMsg getList(String date, String steelStampNumber, Integer planType,Integer deptId,Integer pageIndex,Integer pageSize);
+    HttpRespMsg getList(String date, String steelStampNumber, Integer planType,Integer deptId,Integer pageIndex,Integer pageSize,Integer isMob);
 
     HttpRespMsg addOrUpdatePlan(Plan plan);
 

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

@@ -3,6 +3,7 @@ package com.management.platform.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -99,17 +100,17 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
     private String path;
 
     @Override
-    public HttpRespMsg getList(String date, String steelStampNumber, Integer planType,Integer deptId,Integer pageIndex,Integer pageSize) {
+    public HttpRespMsg getList(String date, String steelStampNumber, Integer planType,Integer deptId,Integer pageIndex,Integer pageSize,Integer isMob) {
         HttpRespMsg msg=new HttpRespMsg();
         User user = userMapper.selectById(request.getHeader("token"));
         Integer companyId = user.getCompanyId();
-        QueryWrapper<Plan> queryWrapper=new QueryWrapper();
+        LambdaQueryWrapper<Plan> queryWrapper = new LambdaQueryWrapper<>();
         DateTimeFormatter df=DateTimeFormatter.ofPattern("yyyy-MM-dd");
-        queryWrapper.eq("company_id",companyId);
+        queryWrapper.eq(Plan::getCompanyId,companyId);
         if(planType!=2){
-            queryWrapper.eq("plan_type",0);
+            queryWrapper.eq(Plan::getPlanType,0);
         }else {
-            queryWrapper.eq("plan_type",1);
+            queryWrapper.eq(Plan::getPlanType,1);
         }
         if(deptId!=null){
             //获取获取下级部门列表
@@ -117,14 +118,22 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
             List<Integer> ids = departmentList.stream().map(Department::getDepartmentId).distinct().collect(Collectors.toList());
             ids.add(-1);
             //同时可以查看下级部门的数据
-            queryWrapper.and(wrapper->wrapper.eq("station_id",deptId).or().in("station_id",ids));
+            queryWrapper.and(wrapper->wrapper.eq(Plan::getStationId,deptId).or().in(Plan::getStationId,ids));
         }
         if(!StringUtils.isEmpty(date)){
             LocalDate parse = LocalDate.parse(date,df);
-            queryWrapper.eq("start_date",parse);
+            queryWrapper.eq(Plan::getStartDate,parse);
         }else {
             LocalDate now = LocalDate.now();
-            queryWrapper.eq("start_date",(planType==0||planType==2)?now:now.plusDays(1));
+            if(planType==0&&isMob==1){
+                queryWrapper.and(wrapper->wrapper.eq(Plan::getStartDate,now).or().inSql(Plan::getId,"select ppt1.plan_id \n" +
+                        "from  plan_procedure_total ppt1\n" +
+                        "left join prod_procedure_team  ppt on ppt.plan_procedure_id=ppt1.id\n" +
+                        "where ppt.progress<100"));
+            }else {
+                queryWrapper.eq(Plan::getStartDate,(planType==0||planType==2)?now:now.plusDays(1));
+            }
+
         }
         //判断是否有查看全部数据的权限
         boolean canViewAll=false;
@@ -139,7 +148,7 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
         if(!canViewAll){
             /*作为工长看到的数据*/
             if(count(new QueryWrapper<Plan>().eq("foreman_id",user.getId()))>0){
-                queryWrapper.and(wrapper->wrapper.and(wr->wr.eq("foreman_id",user.getId()).eq("status",1)).or().eq("create_id",user.getId()));
+                queryWrapper.and(wrapper->wrapper.and(wr->wr.eq(Plan::getForemanId,user.getId()).eq(Plan::getStatus,1)).or().eq(Plan::getCreateId,user.getId()));
             }else {
                 /*作为组员可以查看的数据*/
                 List<ProdProcedureTeam> prodProcedureTeams = prodProcedureTeamService.list(new QueryWrapper<ProdProcedureTeam>().eq("company_id", companyId).eq("user_id", user.getId()));
@@ -151,7 +160,7 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
                 }
                 collect.add(-1);
                 List<Integer> finalCollect = collect;
-                queryWrapper.and(wrapper->wrapper.in("id", finalCollect).or().eq("create_id",user.getId()));
+                queryWrapper.and(wrapper->wrapper.in(Plan::getId, finalCollect).or().eq(Plan::getCreateId,user.getId()));
             }
         }
         if(!StringUtils.isEmpty(steelStampNumber)){
@@ -160,9 +169,9 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
             List<PlanSteelStampNumber> list = planSteelStampNumberService.list(queryWrapperSSN);
             List<Integer> ids = list.stream().map(PlanSteelStampNumber::getPlanId).collect(Collectors.toList());
             ids.add(-1);
-            queryWrapper.in("id",ids);
+            queryWrapper.in(Plan::getId,ids);
         }
-        queryWrapper.orderByDesc("create_time").orderByDesc("start_date");
+        queryWrapper.orderByDesc(Plan::getCreateTime).orderByDesc(Plan::getStartDate);
         IPage<Plan> planIPage = planMapper.selectPage(new Page<>(pageIndex, pageSize), queryWrapper);
         List<Plan> records = planIPage.getRecords();
         List<Integer> ids = records.stream().map(Plan::getProductId).distinct().collect(Collectors.toList());

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

@@ -4203,6 +4203,10 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
     public HttpRespMsg getPersonWorkHoursWagesList(String deptId, String userId, String startDate, String endDate, Integer pageIndex, Integer pageSize) {
         HttpRespMsg httpRespMsg=new HttpRespMsg();
         HashMap resultMap=new HashMap();
+        Integer pageStart = null;
+        if (pageIndex!=null){
+            pageStart = (pageIndex -1) * pageSize;
+        }
         DateTimeFormatter dtf=DateTimeFormatter.ofPattern("yyyy-MM-dd");
         DateTimeFormatter dtf1=DateTimeFormatter.ofPattern("yyyyMMdd");
         List<LocalDate> dateList = getDays(LocalDate.parse(startDate, dtf), LocalDate.parse(endDate, dtf));
@@ -4237,7 +4241,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             targetUserIds.add("-1");
             queryWrapper.in("id",targetUserIds);
         }
-        IPage<User> userIPage = userMapper.selectPage(new Page<>(pageIndex, pageSize), queryWrapper);
+        IPage<User> userIPage = userMapper.selectPage(new Page<>(pageStart, pageSize), queryWrapper);
         List<User> userList = userIPage.getRecords();
         userList.forEach(u->{
             List<Map<String, Object>> mapList = personWorkHoursWagesList.stream().filter(pl -> pl.get("userId").equals(u.getId())).collect(Collectors.toList());
@@ -4423,14 +4427,25 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
     @Override
     public HttpRespMsg getProcedureRealTimeProgressList(String deptId, String userId, String startDate, String endDate, Integer pageIndex, Integer pageSize) {
         HttpRespMsg httpRespMsg=new HttpRespMsg();
+        User user = userMapper.selectById(request.getHeader("token"));
+        boolean canViewAll = sysFunctionService.hasPriviledge(user.getRoleId(), "查看全部工序实时进度");
         Integer pageStart = null;
         if (pageIndex!=null){
             pageStart = (pageIndex -1) * pageSize;
         }
         Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
         HashMap map=new HashMap();
-        List<Map<String, Object>> planRealTimeProgressList = reportMapper.getProcedureRealTimeProgressList(companyId, deptId, userId, startDate, endDate, pageStart, pageSize);
-        Integer total=reportMapper.getProcedureRealTimeProgressCount(companyId, deptId, userId, startDate, endDate);
+        List<Map<String, Object>> planRealTimeProgressList;
+        Integer total;
+        if(!canViewAll){
+            planRealTimeProgressList = reportMapper.getProcedureRealTimeProgressList(companyId, deptId,user.getId(), userId, startDate, endDate, pageStart, pageSize);
+            total=reportMapper.getProcedureRealTimeProgressCount(companyId, deptId,user.getId(), userId, startDate, endDate);
+        }else {
+            planRealTimeProgressList = reportMapper.getProcedureRealTimeProgressList(companyId, deptId,null, userId, startDate, endDate, pageStart, pageSize);
+            total=reportMapper.getProcedureRealTimeProgressCount(companyId, deptId,null, userId, startDate, endDate);
+        }
+
+
         map.put("records",planRealTimeProgressList);
         map.put("total",total);
         httpRespMsg.setData(map);
@@ -4473,14 +4488,24 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
     @Override
     public HttpRespMsg workReportQuery(Integer productId, String vehicleNum, String steelNum, Integer deptId, String userId, String startDate, String endDate,Integer pageIndex,Integer pageSize) {
         HttpRespMsg msg=new HttpRespMsg();
+        User user = userMapper.selectById(request.getHeader("token"));
+        boolean canViewAll = sysFunctionService.hasPriviledge(user.getRoleId(), "查看全部报工");
         Integer pageStart = null;
         if (pageIndex!=null){
             pageStart = (pageIndex -1) * pageSize;
         }
         Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
         Map map=new HashMap();
-        List<Map<String,Object>> mapList=reportMapper.workReportQuery(companyId,productId,vehicleNum,steelNum,deptId,userId,startDate,endDate,pageStart,pageSize);
-        Integer total = reportMapper.selectCountForWorkQuery(companyId, productId, vehicleNum, steelNum, deptId, userId, startDate, endDate);
+        List<Map<String,Object>> mapList;
+        Integer total;
+        if(!canViewAll){
+            mapList=reportMapper.workReportQuery(companyId,productId,vehicleNum,steelNum,deptId,user.getId(),userId,startDate,endDate,pageStart,pageSize);
+            total = reportMapper.selectCountForWorkQuery(companyId, productId, vehicleNum, steelNum, deptId,user.getId(), userId, startDate, endDate);
+        }else {
+            mapList=reportMapper.workReportQuery(companyId,productId,vehicleNum,steelNum,deptId,null,userId,startDate,endDate,pageStart,pageSize);
+            total = reportMapper.selectCountForWorkQuery(companyId, productId, vehicleNum, steelNum, deptId,null, userId, startDate, endDate);
+        }
+
         map.put("records",mapList);
         map.put("total",total);
         msg.setData(map);
@@ -4529,6 +4554,8 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
     @Override
     public HttpRespMsg getPlanRealTimeProgressList(String deptId, String userId, String startDate, String endDate, Integer pageIndex, Integer pageSize) {
         HttpRespMsg httpRespMsg=new HttpRespMsg();
+        User user = userMapper.selectById(request.getHeader("token"));
+        boolean canViewAll = sysFunctionService.hasPriviledge(user.getRoleId(), "查看全部计划实时进度");
         NumberFormat format = NumberFormat.getPercentInstance();
         format.setMinimumFractionDigits(2);
         Integer pageStart = null;
@@ -4536,8 +4563,16 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             pageStart = (pageIndex -1) * pageSize;
         }
         Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
+        List<Map<String, Object>> planRealTimeProgressList;
+        Integer total;
         HashMap map=new HashMap();
-        List<Map<String, Object>> planRealTimeProgressList = reportMapper.getPlanRealTimeProgressList(companyId, deptId, userId, startDate, endDate, pageStart, pageSize);
+        if(!canViewAll){
+            planRealTimeProgressList = reportMapper.getPlanRealTimeProgressList(companyId, deptId,user.getId(), userId, startDate, endDate, pageStart, pageSize);
+            total=reportMapper.getPlanRealTimeProgressCount(companyId, deptId,user.getId(), userId, startDate, endDate);
+        }else {
+            planRealTimeProgressList = reportMapper.getPlanRealTimeProgressList(companyId, deptId,null, userId, startDate, endDate, pageStart, pageSize);
+            total=reportMapper.getPlanRealTimeProgressCount(companyId, deptId,null, userId, startDate, endDate);
+        }
         planRealTimeProgressList.forEach(pt->{
             BigDecimal planWorkTime = new BigDecimal(pt.get("planWorkTime") == null ? 0 : Double.valueOf(String.valueOf(pt.get("planWorkTime"))));
             BigDecimal nowWorkTime = new BigDecimal(pt.get("nowWorkTime") == null ? 0 : Double.valueOf(String.valueOf(pt.get("nowWorkTime"))));
@@ -4546,7 +4581,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 pt.put("progress",format.format(divide.doubleValue()));
             }
         });
-        Integer total=reportMapper.getPlanRealTimeProgressCount(companyId, deptId, userId, startDate, endDate);
+
         map.put("records",planRealTimeProgressList);
         map.put("total",total);
         httpRespMsg.setData(map);
@@ -4587,6 +4622,8 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
     @Override
     public HttpRespMsg getDpetStatisticsProgressList(String deptId, String userId, String startDate, String endDate, Integer pageIndex, Integer pageSize) {
         HttpRespMsg httpRespMsg=new HttpRespMsg();
+        User user = userMapper.selectById(request.getHeader("token"));
+        boolean canViewAll = sysFunctionService.hasPriviledge(user.getRoleId(), "查看全部部门生产统计");
         NumberFormat format = NumberFormat.getPercentInstance();
         format.setMinimumFractionDigits(2);
         Integer pageStart = null;
@@ -4595,7 +4632,15 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         }
         Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
         HashMap map=new HashMap();
-        List<Map<String, Object>> dpetStatisticsProgressList = reportMapper.getDpetStatisticsProgressList(companyId, deptId, userId, startDate, endDate, pageStart, pageSize);
+        List<Map<String, Object>> dpetStatisticsProgressList;
+        Integer total;
+        if(!canViewAll){
+            dpetStatisticsProgressList = reportMapper.getDpetStatisticsProgressList(companyId, deptId,user.getId(), userId, startDate, endDate, pageStart, pageSize);
+            total=reportMapper.getDpetStatisticsProgressCount(companyId, deptId,user.getId(), userId, startDate, endDate);
+        }else {
+            dpetStatisticsProgressList = reportMapper.getDpetStatisticsProgressList(companyId, deptId,null, userId, startDate, endDate, pageStart, pageSize);
+            total=reportMapper.getDpetStatisticsProgressCount(companyId, deptId,null, userId, startDate, endDate);
+        }
         dpetStatisticsProgressList.forEach(pt->{
             BigDecimal planWorkTime = new BigDecimal(pt.get("planWorkTime") == null ? 0 : Double.valueOf(String.valueOf(pt.get("planWorkTime"))));
             BigDecimal nowWorkTime = new BigDecimal(pt.get("nowWorkTime") == null ? 0 : Double.valueOf(String.valueOf(pt.get("nowWorkTime"))));
@@ -4604,7 +4649,6 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 pt.put("progress",format.format(divide.doubleValue()));
             }
         });
-        Integer total=reportMapper.getDpetStatisticsProgressCount(companyId, deptId, userId, startDate, endDate);
         map.put("records",dpetStatisticsProgressList);
         map.put("total",total);
         httpRespMsg.setData(map);

fhKeeper/formulahousekeeper/management-workshop/src/main/resources/mapper/ReportMapper.xml

@@ -194,6 +194,9 @@
         <if test="deptId!=null and deptId!=''">
             and b.station_id=#{deptId}
         </if>
+        <if test="foremanId!=null and foremanId!=''">
+            and b.foreman_id=#{foremanId}
+        </if>
         <if test="startDate!=null and startDate!='' and endDate!=null and endDate!=''">
             and (b.start_date &gt;= #{startDate} and b.end_date &lt;= #{endDate})
         </if>
@@ -219,6 +222,9 @@
         <if test="deptId!=null and deptId!=''">
             and b.station_id=#{deptId}
         </if>
+        <if test="foremanId!=null and foremanId!=''">
+            and b.foreman_id=#{foremanId}
+        </if>
         <if test="startDate!=null and startDate!='' and endDate!=null and endDate!=''">
             and (b.start_date &gt;= #{startDate} and b.end_date &lt;= #{endDate})
         </if>
@@ -245,6 +251,9 @@
             <if test="deptId!=null and deptId!=''">
                 and pn.station_id=#{deptId}
             </if>
+            <if test="foremanId!=null and foremanId!=''">
+                and pn.foreman_id=#{foremanId}
+            </if>
             <if test="userId!=null and userId!=''">
                 and r.creator_id=#{userId}
             </if>
@@ -283,6 +292,9 @@
             <if test="deptId!=null and deptId!=''">
                 and pn.station_id=#{deptId}
             </if>
+            <if test="foremanId!=null and foremanId!=''">
+                and pn.foreman_id=#{foremanId}
+            </if>
             <if test="userId!=null and userId!=''">
                 and r.creator_id=#{userId}
             </if>
@@ -316,6 +328,9 @@
         <if test="deptId!=null and deptId!=''">
             and b.station_id=#{deptId}
         </if>
+        <if test="foremanId!=null and foremanId!=''">
+            and b.foreman_id=#{foremanId}
+        </if>
         <if test="startDate!=null and startDate!='' and endDate!=null and endDate!=''">
             and (b.start_date &gt;= #{startDate} and b.end_date &lt;= #{endDate})
         </if>
@@ -344,6 +359,9 @@
         <if test="deptId!=null and deptId!=''">
             and b.station_id=#{deptId}
         </if>
+        <if test="foremanId!=null and foremanId!=''">
+            and b.foreman_id=#{foremanId}
+        </if>
         <if test="startDate!=null and startDate!='' and endDate!=null and endDate!=''">
             and (b.start_date &gt;= #{startDate} and b.end_date &lt;= #{endDate})
         </if>
@@ -370,6 +388,9 @@
         <if test="deptId!=null and deptId!=''">
             and b.station_id=#{deptId}
         </if>
+        <if test="foremanId!=null and foremanId!=''">
+            and b.foreman_id=#{foremanId}
+        </if>
         <if test="startDate!=null and startDate!='' and endDate!=null and endDate!=''">
             and (b.start_date &gt;= #{startDate} and b.end_date &lt;= #{endDate})
         </if>
@@ -399,6 +420,9 @@
         <if test="deptId!=null and deptId!=''">
             and b.station_id=#{deptId}
         </if>
+        <if test="foremanId!=null and foremanId!=''">
+            and b.foreman_id=#{foremanId}
+        </if>
         <if test="startDate!=null and startDate!='' and endDate!=null and endDate!=''">
             and (b.start_date &gt;= #{startDate} and b.end_date &lt;= #{endDate})
         </if>

fhKeeper/formulahousekeeper/timesheet-workshop-h5/src/views/planView/todayPlan/todayPlan.vue

@@ -35,6 +35,7 @@ export default {
         pageIndex: 0,
         pageSize: 10000,
         planType: 0,
+        isMob:1
         // date: this.getNowFormatDate()
       })
       .then(res => {

fhKeeper/formulahousekeeper/timesheet/src/permissions.js

@@ -114,6 +114,7 @@ const StringUtil = {
         costFil : false, // 费用填报 //
         costAudit : false, // 费用审核 //
         costAll : false, // 查看全部报销单 //
+        costExpenseRelease: false, // 费用发放 //
 
         // 工时成本统计
         countHours: false, // 查看工时统计 //
@@ -236,6 +237,7 @@ const StringUtil = {
         arr[i] == '全部子项目工时成本' ? obj.reportAllManhourCost = true : ''
         arr[i] == '负责项目子项目工时成本' ? obj.reportResponsibleManhourCost = true : ''
         arr[i] == '修改默认文件夹' ? obj.projectEditDefaultFolder = true : ''
+        arr[i] == '费用发放' ? obj.costExpenseRelease = true : ''
     }
     return obj
   }

fhKeeper/formulahousekeeper/timesheet/src/views/expense/expense.vue

@@ -232,6 +232,12 @@
                 <el-option :label="$t('wai-bao')" :value="2"></el-option> -->
               </el-select>
             </el-form-item>
+            <el-form-item :label="'发放状态'">
+              <el-select v-model="sendState" size="small" style="width: 150px" v-if="permissions.costExpenseRelease" clearable>
+                <el-option :label="'未发放'" :value="0" ></el-option>
+                <el-option :label="'已发放'" :value="1" ></el-option>
+              </el-select>
+            </el-form-item>
             <!-- 填报日期 -->
             <div style="display: inline-block;padding-left: 15px">
               <el-form-item :label="$t('fillinthedate')" >
@@ -252,10 +258,10 @@
               <el-form-item v-if="currentClick == '2-1'">
                 <el-button @click="exportDocument()" size="small">单据导出</el-button>
               </el-form-item>
-              <el-form-item v-if="currentClick == '2-1'">
+              <el-form-item v-if="currentClick == '2-1' && permissions.costExpenseRelease">
                 <el-button @click="documentIssuance(1)" size="small">发放</el-button>
               </el-form-item>
-              <el-form-item v-if="currentClick == '2-1'">
+              <el-form-item v-if="currentClick == '2-1' && permissions.costExpenseRelease">
                 <el-button @click="documentIssuance(0)" size="small">取消发放</el-button>
               </el-form-item>
               <!-- <span>审核模式：{{ auditTypeItem.auditType }}</span> -->
@@ -308,7 +314,7 @@
                   <span style="font-size:12px;">{{scope.row.denyReason}}</span>
                 </template>
               </el-table-column> -->
-              <el-table-column prop="sendState" label="发放状态" width="80">
+              <el-table-column prop="sendState" label="发放状态" width="80" v-if="permissions.costExpenseRelease">
                 <template slot-scope="scope">
                   <span :style="`color: ${scope.row.sendState == 0 ? '#FFA500' : ''}`">{{ scope.row.sendState == 1 ? '已发放' : '未发放' }}</span>
                 </template>
@@ -941,6 +947,7 @@ export default {
       detailDialog: false,
       detaExpenseMainTypeName: '',
       multipleSelection: [],
+      sendState: '',
     };
   },
   computed: {
@@ -1654,13 +1661,16 @@ export default {
       if (this.isAuditList) {
         param.status = 1;
       }
+      if(this.permissions.costExpenseRelease) {
+        param.sendState = this.sendState
+      }
       this.list = [];
-      this.total = 0;
+      // this.total = 0;
       this.http.post('/expense-sheet/list', param,
         res => {
             if (res.code == "ok") {
                 this.list = res.data.records;
-                this.total = res.data.total; 
+                this.total = res.data.total || 0; 
             } else {
                 this.$message({
                 message: res.msg,

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

@@ -53,8 +53,9 @@
                             <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName'
                                     :openid='scope.row.projectAuditorName'></ww-open-data></span> -->
                             <span v-if="user.userNameNeedTranslate != '1'">{{ auditorNameFun(scope.row) }}</span>
-                            <span v-if="user.userNameNeedTranslate == '1'"><ww-open-data type='userName'
-                                    :openid='scope.row.projectAuditorName'></ww-open-data></span>
+                            <span v-if="user.userNameNeedTranslate == '1'">
+                                <ww-open-data type='userName' :openid='auditorNameFun(scope.row)'></ww-open-data>
+                            </span>
                         </template>
                     </el-table-column>
                     <el-table-column prop="state" label="状态" width="140" fixed="right">