1

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

@@ -4184,12 +4184,16 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 List<Map<String,Object>> theData=new ArrayList<>();
                 for (String id : creatorId) {
                     Map<String, Object> nameItem = mapMap.get(id);
-                    theData.add(nameItem);
+                    Optional<User> first = userList.stream().filter(u -> u.getId().equals(id)).findFirst();
+                    //没有查看全部的权限就只能查看自己负责的数据
+                    if(canViewAll?true:(targetDeptIds.size()>0&&targetDeptIds.contains(first.get().getDepartmentId()))){
+                        theData.add(nameItem);
+                    }
                 }
                 if(checkStatus==1){
                     List<User> users = userList.stream().filter(ul -> !theData.stream().anyMatch(td -> td.get("creatorId").equals(ul.getId()))).collect(Collectors.toList());
                     for (User u : users) {
-                        if(canViewAll?(targetDeptIds.size()>0):(targetDeptIds.size()>0&&targetDeptIds.contains(u.getDepartmentId()))){
+                        if(canViewAll?true:(targetDeptIds.size()>0&&targetDeptIds.contains(u.getDepartmentId()))){
                             Map<String, Object> nameItem =new HashMap<>();
                             nameItem.put("working_time", 0);
                             nameItem.put("creatorName",u.getName());

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

@@ -133,14 +133,14 @@
           <el-form-item label="排产工单号" style="width: 100%" prop="productSchedulingNum">
             <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" @change="setProductCode">
-              <el-option v-for="item in productList" :key="item.id" :label="item.code" :value="item.id">
+          <el-form-item label="产品名称" style="width: 100%" prop="productId">
+            <el-select :disabled="todayPlanForm.id==null?false:true" v-model="todayPlanForm.productId" placeholder="请选择" class="w100" @change="setProductCode" filterable>
+              <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="productName">
-            <el-input v-model="todayPlanForm.productName" maxlength="50" readonly></el-input>
+          <el-form-item label="项目代码" style="width: 100%" prop="projectCode">
+            <el-input :disabled="todayPlanForm.id==null?false:true" v-model="todayPlanForm.projectCode" maxlength="50" readonly></el-input>
           </el-form-item>
 
           <div v-for="(item, index) in todayPlanForm.steelStampNumberList" style="width: 100%;margin-bottom: 10px;">