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

fhKeeper/formulahousekeeper/inva_4_tivo/index.html

@@ -374,9 +374,7 @@
                         <img src="./image/ions/bjsg.png" alt="">
                     </div>
                     <div class="conImgFiz">
-                        工时管家能够根据员工的报销情况以及员工的考勤，来核算出整个项目的成本投入，<br/>
-                        也能够从侧面上对员工进行绩效考核，通过甘特图查看各个项目组成员的忙闲情况，<br/>
-                        这样可以对员工进行合理的工作安排。
+                        公司有3000多人使用工时管家，每年上百万份日报，运行一直很稳定，并且与集团的其他应用系统对接，提供工时数据。
                     </div>
                     <div class="conIngFoot">
                         <p>北京首钢集团</p>

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

@@ -2759,7 +2759,9 @@
                     if (res.code == "ok") {
                         if(this.user.userNameNeedTranslate == 1) {
                             for(var i in res.data.subTaskList) {
-                                res.data.subTaskList[i].executorName = res.data.subTaskList[i].executorName.split(',')
+                                if(res.data.subTaskList[i].executorName) {
+                                    res.data.subTaskList[i].executorName = res.data.subTaskList[i].executorName.split(',')
+                                }
                             }
                         }
                         this.addForm = res.data;

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

@@ -1643,11 +1643,11 @@
             <div style="padding:20px 40px 20px 0">
                 <el-timeline :reverse="false">
                     <el-timeline-item v-for="item in approvalProcessData" :key="item.id" :timestamp="item.operateDate">
-                        {{item.msg}}
-                        <span v-if="user.userNameNeedTranslate != 1">{{msg}}</span>
+                        <!-- {{item.msg}} -->
+                        <span v-if="user.userNameNeedTranslate != 1">{{item.msg}}</span>
                         <span v-if="user.userNameNeedTranslate == 1">
-                            <span><ww-open-data type='userName' :openid='msgCon.one'></ww-open-data></span>
-                            <span>{{msgCon.two}}</span>
+                            <span><ww-open-data type='userName' :openid='item.msgCon.one'></ww-open-data></span>
+                            <span>{{item.msgCon.two}}</span>
                         </span>
                     </el-timeline-item>
                 </el-timeline>
@@ -2129,6 +2129,7 @@
                             }
                         }
                         this.approvalProcessData = res.data
+                        console.log(this.approvalProcessData, '数据卡看')
                     }else{
                         this.$message({
                             message: res.msg,