1

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

@@ -106,7 +106,12 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
             queryWrapper.eq("plan_type",1);
         }
         if(deptId!=null){
-            queryWrapper.eq("station_id",deptId);
+            //获取获取下级部门列表
+            List<Department> departmentList = departmentMapper.selectList(new QueryWrapper<Department>().eq("superior_id", deptId));
+            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));
         }
         if(!StringUtils.isEmpty(date)){
             LocalDate parse = LocalDate.parse(date,df);
@@ -184,6 +189,11 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
                     rs.setPlanProcedureTotals(totals);
                 }
             }
+            if(rs.getPlanType()==1){
+                BigDecimal bigDecimal=new BigDecimal(String.valueOf(rs.getMoneyOfJob()));
+                bigDecimal=bigDecimal.multiply(new BigDecimal(String.valueOf(rs.getPlanWorkHour())));
+                rs.setTotalMoney(bigDecimal.doubleValue());
+            }
         });
         Map map=new HashMap();
         map.put("total",planIPage.getTotal());
@@ -223,6 +233,12 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
                     return msg;
                 }
             }
+            if(plan.getTaskChangeNoticeNum()!=null){
+                if(count(new QueryWrapper<Plan>().eq("task_change_notice_num",plan.getTaskChangeNoticeNum()))>0){
+                    msg.setError("当前任务变更通知号已存在");
+                    return msg;
+                }
+            }
             if(!StringUtils.isEmpty(plan.getSteelStampNumberStart())&&!StringUtils.isEmpty(plan.getSteelStampNumberEnd()!=null)){
                 QueryWrapper<Plan> cutQueryWrapper=new QueryWrapper();
             }

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

@@ -1305,7 +1305,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                         .setRoleId(roleId)
                         .setRoleName(sysRoleMapper.selectById(roleId).getRolename())
                         .setWorkTypeId(workTypeId)
-                        .setWorkType(workTypeMapper.selectById(workTypeId).getName())
+                        .setWorkType(workTypeId!=null?workTypeMapper.selectById(workTypeId).getName():null)
                         .setMonthCost(monthCostValue)
                         .setCost(costValue)
                         .setPosition(position)
@@ -1902,24 +1902,24 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             //headCell.setCellValue("部门");
             headCell.setCellValue(MessageUtils.message("excel.department"));
             headCell.setCellStyle(headStyle);
+//            headCell = headRow.createCell(6);
+//            //headCell.setCellValue("月薪");
+//            headCell.setCellValue(MessageUtils.message("excel.MonSalary"));
+//            headCell.setCellStyle(headStyle);
+//            headCell = headRow.createCell(7);
+//            //headCell.setCellValue("时薪");
+//            headCell.setCellValue(MessageUtils.message("excel.hourlyWage"));
+//            headCell.setCellStyle(headStyle);
             headCell = headRow.createCell(6);
-            //headCell.setCellValue("月薪");
-            headCell.setCellValue(MessageUtils.message("excel.MonSalary"));
-            headCell.setCellStyle(headStyle);
-            headCell = headRow.createCell(7);
-            //headCell.setCellValue("时薪");
-            headCell.setCellValue(MessageUtils.message("excel.hourlyWage"));
-            headCell.setCellStyle(headStyle);
-            headCell = headRow.createCell(8);
             //headCell.setCellValue("证书");
             headCell.setCellValue(MessageUtils.message("excel.certificate"));
             headCell.setCellStyle(headStyle);
             for (int i = 0; i < userCustomList.size(); i++) {
-                headCell = headRow.createCell(8+i);
+                headCell = headRow.createCell(6+i);
                 headCell.setCellValue(userCustomList.get(i).getName());
                 headCell.setCellStyle(headStyle);
             }
-            headCell = headRow.createCell(8+userCustomList.size());
+            headCell = headRow.createCell(6+userCustomList.size());
             //headCell.setCellValue("状态");
             headCell.setCellValue(MessageUtils.message("leave.status"));
             headCell.setCellStyle(headStyle);
@@ -1964,8 +1964,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 }else {
                     row.createCell(5).setCellValue(item.getDepartmentName());
                 }
-                row.createCell(6).setCellValue(item.getMonthCost()==null? 0 : item.getMonthCost().intValue());
-                row.createCell(7).setCellValue(item.getCost() == null?0.0 : item.getCost().doubleValue());
+//                row.createCell(6).setCellValue(item.getMonthCost()==null? 0 : item.getMonthCost().intValue());
+//                row.createCell(7).setCellValue(item.getCost() == null?0.0 : item.getCost().doubleValue());
                 List<UserCert> certList = userCertList.stream().distinct().filter(uc -> uc.getUserId().equals(item.getId())).collect(Collectors.toList());
                 if(certList.size()>0){
                     String s="";
@@ -1976,9 +1976,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                             s+=certList.get(i).getCertName()+" "+certList.get(i).getCertDate();
                         }
                     }
-                    row.createCell(8).setCellValue(s);
+                    row.createCell(6).setCellValue(s);
                 }else {
-                    row.createCell(8).setCellValue("");
+                    row.createCell(6).setCellValue("");
                 }
                 for (int i = 0; i < userCustomList.size(); i++) {
                     String value="";
@@ -1994,9 +1994,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                         case 4:value=item.getPlate5()==null?"":item.getPlate5();
                             break;
                     }
-                    row.createCell(8+i).setCellValue(value);
+                    row.createCell(6+i).setCellValue(value);
                 }
-                row.createCell(8+userCustomList.size()).setCellValue(item.getIsActive()==1?MessageUtils.message("excel.normal"):MessageUtils.message("access.deactivated"));
+                row.createCell(6+userCustomList.size()).setCellValue(item.getIsActive()==1?MessageUtils.message("excel.normal"):MessageUtils.message("access.deactivated"));
                 rowNum++;
             }
             //生成Excel文件

fhKeeper/formulahousekeeper/timesheet-workshop/src/views/plan/orderInsert.vue

@@ -49,7 +49,7 @@
         <el-table-column prop="planManNum" label="计划人数" width="180"> </el-table-column>
         <el-table-column prop="num" label="数量" width="180"></el-table-column>
         <el-table-column prop="planWorkHour" label="计划工时" width="180"></el-table-column>
-        <el-table-column prop="moneyOfJob" label="工钱" width="180"></el-table-column>
+        <el-table-column prop="totalMoney" label="工钱" width="180"></el-table-column>
         <el-table-column prop="foremanName" label="工长" width="180"></el-table-column>
         <el-table-column prop="startDate" label="开工时间" width="180"></el-table-column>
         <el-table-column prop="endDate" label="完工时间" width="180"></el-table-column>

fhKeeper/formulahousekeeper/timesheet-workshop/src/views/plan/planComponent.vue

@@ -92,13 +92,13 @@
             <el-input v-model="todayPlanForm.productSchedulingNum" maxlength="50"></el-input>
           </el-form-item>
           <el-form-item label="产品名称" style="width: 100%" prop="productId">
-            <el-select v-model="todayPlanForm.productId" placeholder="请选择" class="w100">
+            <el-select v-model="todayPlanForm.productId" placeholder="请选择" class="w100" @change="setProductCode">
               <el-option v-for="item in productList" :key="item.id" :label="item.name" :value="item.id">
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="项目代码" style="width: 100%" prop="projectCode">
-            <el-input v-model="todayPlanForm.projectCode" maxlength="50"></el-input>
+            <el-input v-model="todayPlanForm.projectCode" maxlength="50" readonly></el-input>
           </el-form-item>
           <el-form-item label="钢印号" style="width: 100%" prop="steelStampNumberStart">
             <el-input class="w45" v-model="todayPlanForm.steelStampNumberStart" maxlength="20"></el-input>
@@ -115,7 +115,7 @@
             <el-input v-model="todayPlanForm.num" maxlength="10"></el-input>
           </el-form-item>
           <el-form-item label="主工序" prop="mainProcess">
-            <el-input v-model="todayPlanForm.mainProcess" maxlength="50"></el-input>
+            <el-input v-model="todayPlanForm.mainProcess" maxlength="20"></el-input>
           </el-form-item>
           <el-form-item label="工位" prop="stationId">
             <!-- <el-select v-model="todayPlanForm.stationId" placeholder="请选择" class="w100" @change="getIncharger()">
@@ -279,6 +279,11 @@ export default {
       this.getProductList();
   },
   methods: {
+    setProductCode() {
+      let arrList = this.productList.filter(item => item.id == this.todayPlanForm.productId) 
+      console.log('====>', arrList)
+      this.todayPlanForm.projectCode = arrList[0].code
+    },
     today() {
       let date = new Date();
       let year = date.getFullYear();

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

@@ -169,7 +169,7 @@
             
             <el-table ref="handleSelectTable" :data="list" highlight-current-row v-loading="listLoading" :height="tableHeight" style="width: 100%;" @selection-change="handleSelectionZzjg">
                 <el-table-column type="selection" width="50"></el-table-column>
-                <el-table-column type="index" width="50">
+                <el-table-column type="index" width="50" label="序号">
                     <template slot-scope="scope" >
                         {{scope.$index+1+(page-1)*size}}
                     </template>
@@ -236,7 +236,7 @@
                     
                 <el-button size="small" type="primary" @click="handleSelectionZzjgbtn3" v-if="user.userNameNeedTranslate != 1">{{ $t('modifyingDepartments') }}</el-button>
                 <el-button size="small" type="primary" @click="handJue">{{ $t('modifyingRoles') }}</el-button>
-                <el-button size="small" type="primary" @click="workingHoursDialogClick()">修正工时所属部门</el-button>
+                <!-- <el-button size="small" type="primary" @click="workingHoursDialogClick()">修正工时所属部门</el-button> -->
                
                 
                 
@@ -459,10 +459,10 @@
                   <el-form-item label="离职日期" prop="inactiveDate" v-if="insertForm.isActive == 0">
                       <el-date-picker v-model="insertForm.inactiveDate" value-format="yyyy-MM-dd"></el-date-picker>
                   </el-form-item>
-                  <el-form-item :label="$t('postrank')" prop="phone">
+                  <!-- <el-form-item :label="$t('postrank')" prop="phone">
                       <el-input v-model="insertForm.position" :placeholder="$t('joblevel')" clearable></el-input>
-                  </el-form-item>
-
+                  </el-form-item> -->
+<!-- 
                   <div class="zhaunye"><p>{{ $t('professionalcertificate') }}</p><p><el-link type="primary" @click="addCertificateList()">{{ $t('addprofessionalcertificate') }}</el-link><el-link v-if="permissions.structureCertificate" type="primary" @click="managementDiolog = true" style="margin-left: 20px">{{ $t('professionalCertificate inManagement') }}</el-link></p></div>
                   <div class="certificateList">
                       <div class="moreList">
@@ -476,7 +476,7 @@
                               <div style="color: red;margin-left: 15px;cursor:pointer;" @click="deteFrames(index)"><i class="el-icon-delete"></i></div>
                           </div>
                       </div>
-                  </div>
+                  </div> -->
 
               </el-form>
             </div>