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

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

@@ -47,7 +47,8 @@ public class TaskGroupServiceImpl extends ServiceImpl<TaskGroupMapper, TaskGroup
     private UserMapper userMapper;
     @Resource
     private TaskExecutorService taskExecutorService;
-
+    @Resource
+    private ProjectMapper projectMapper;
     @Override
     public void saveGroupIncharger(TaskGroup taskGroup) {
         if (StringUtils.isEmpty(taskGroup.getInchargerId())) {
@@ -65,6 +66,9 @@ public class TaskGroupServiceImpl extends ServiceImpl<TaskGroupMapper, TaskGroup
         User user = userMapper.selectById(token);
         List<GroupTemplate> groupTemplates = JSONArray.parseArray(templateJson, GroupTemplate.class);
         List<TaskGroup> list=new ArrayList<>();
+        Project project = projectMapper.selectById(projectId);
+        String inchargerId = project.getInchargerId();
+        User inchargerUser = userMapper.selectById(inchargerId);
         for(GroupTemplate template:groupTemplates){
             TaskGroup taskGroup = new TaskGroup();
             taskGroup.setName(template.getName());
@@ -101,6 +105,9 @@ public class TaskGroupServiceImpl extends ServiceImpl<TaskGroupMapper, TaskGroup
                     task.setCreaterId(user.getId());
                     task.setCreaterName(user.getName());
                     task.setCreatorColor(user.getColor());
+                    task.setExecutorId(inchargerUser.getId());
+                    task.setExecutorName(inchargerUser.getName());
+                    task.setExecutorColor(inchargerUser.getColor());
                     taskList.add(task);
                 });
                 taskService.saveBatch(taskList);
@@ -109,9 +116,9 @@ public class TaskGroupServiceImpl extends ServiceImpl<TaskGroupMapper, TaskGroup
                     //当为里程碑任务时
                     if(tl.getTaskType()==1){
                         taskExecutor.setTaskId(tl.getId());
-                        taskExecutor.setExecutorId(user.getId());
-                        taskExecutor.setExecutorName(user.getName());
-                        taskExecutor.setExecutorColor(user.getColor());
+                        taskExecutor.setExecutorId(inchargerUser.getId());
+                        taskExecutor.setExecutorName(inchargerUser.getName());
+                        taskExecutor.setExecutorColor(inchargerUser.getColor());
                         taskExecutor.setProjectId(projectId);
                         taskExecutorList.add(taskExecutor);
                     }

fhKeeper/formulahousekeeper/timesheet/config/index.js

@@ -2,8 +2,8 @@ var path = require('path')
 
 //  var ip = '127.0.0.1'
 // var ip = '192.168.2.39'
-var ip = '192.168.2.2'
-// var ip = '192.168.2.39'
+// var ip = '192.168.2.2'
+var ip = '192.168.2.39'
 // var ip = '192.168.2.12'// var ip = '47.100.37.243' 
 
 // var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip

fhKeeper/formulahousekeeper/timesheet/src/views/project/projectInside.vue

@@ -159,7 +159,7 @@
                                                     <span v-if="element.endDate >= times || element.taskStatus == 1"><i v-if="element.endDate != null" class="el-icon-date" style="margin-left:5px">&nbsp;&nbsp;{{element.endDate}}</i></span>
                                                     <span v-else><em v-if="element.endDate != null" style="display: inline-block;padding:3px 5px"><i v-if="element.endDate != null" class="el-icon-date"><span  class="element_span"> &nbsp;&nbsp;{{element.endDate}} 截止</span></i></em></span>
                                                     <span v-if="element.executorName">
-                                                    <span v-for="(exeItem, exeIndex) in element.executorName.split(',')" :key="exeIndex" :style="'background:'+element.executorColor.split(',')[exeIndex]" class="user_name_icon">{{exeItem.length>2?exeItem.substring(exeItem.length-2, exeItem.length):exeItem}}</span>
+                                                    <span v-for="(exeItem, exeIndex) in element.executorName.split(',')" :key="exeIndex" :style="element.executorColor ? 'background:' + element.executorColor.split(',')[exeIndex] : ''" class="user_name_icon">{{exeItem.length>2?exeItem.substring(exeItem.length-2, exeItem.length):exeItem}}</span>
                                                     </span>
                                                     <el-button v-if="!element.executorName" type="primary" @click.stop.native="addAsMyTask(element)" size="mini" style="float:right;width:38px;padding:5px;position: absolute;z-index: 5;right: 5px;">认领</el-button>
                                                 </div>
@@ -2382,6 +2382,7 @@ import delete$ from 'dingtalk-jsapi/api/biz/cspace/delete';
                 this.displayTable = true;
             } ,
             groupChange(index, indexPath) {
+                console.log('店家了')
                 this.groupType = 0;
                 this.order = "seq";
                 this.isDesc = false;
@@ -2462,10 +2463,17 @@ import delete$ from 'dingtalk-jsapi/api/biz/cspace/delete';
                 //     return 
                 // }
                 var param = JSON.parse(JSON.stringify(this.groupTemplateList.filter(g=>g.selected)))
-                console.log(param)
+                console.log(param, '你看看啊')
                 for(var i in param) {
                     delete param[i].stagesList
                 }
+                if(param.length < 1) {
+                    this.$message({
+                        message: '请选择模板',
+                        type: "error"
+                    });
+                    return
+                }
                 console.log(this.groupList)
                 var s = null
                 var k = ''