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

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

@@ -15,8 +15,8 @@
             </el-form>
         </el-col> -->
         <div style="padding: 20px;background:#fff;border-bottom:1px solid #ddd;font-weight:500;font-size:15px;">
-            <span @click="viewFolder(null)">文件库</span>
-            <span v-for="path in pathList" :key="path.id" @click="viewFolder(path)"> / {{path.documentName}}</span>
+            <span @click="viewFolder(null)" style="color: #409EFF;cursor: pointer;">文件库</span>
+            <span v-for="path in pathList" :key="path.id" @click="viewFolder(path)" class="mianbaoxie"> <i class="el-icon-arrow-right jianto"></i> {{path.documentName}}</span>
             <span style="float:right;">
                     <el-link type="primary" :underline="false" @click="createFolder"><i class="el-icon-folder-add"></i><span style="margin-left:5px;">创建文件夹</span></el-link>
                     <el-upload ref="upload" action="#" :http-request="uploadFile" :show-file-list="false" :limit="1" style="display:inline-block;">
@@ -118,6 +118,16 @@
 .fileTypeIcon {
     color:#20a0ff;font-size:20px;
 }
+.mianbaoxie {
+    color: #909399;
+}
+.mianbaoxie:hover {
+    color: #409EFF;
+    cursor: pointer;
+}
+.mianbaoxie:hover .jianto {
+    color: #909399;
+}
 </style>
 <script>
     import util from "../../common/js/util";

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

@@ -1318,10 +1318,10 @@
                 var find = false;
                 this.project.participationList = [];
                 this.addForm.userId.forEach(u=>{
-                    var findUser = this.users.filter(au=>au.id == u)[0];
+                    // var findUser = this.users.filter(au=>au.id == u)[0];
+                    var findUser = this.users.filter(au=>au.id == u);
                     this.project.participationList.push(findUser);
                 })
-                
             },
             getUsers() {
                 // this.http.post(this.port.manage.list, {
@@ -1375,6 +1375,8 @@
                         });
                         this.pVisible = false;
                         this.getProjectInfo();
+                        // 子调父方法 getDetail（）
+                        this.$parent.$parent.$parent.getDetail()
                     } else {
                         this.$message({
                             message: res.msg,

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

@@ -25,7 +25,7 @@
                 </div>
                 <div style="display:flex;">
                 <div class="grand flex">
-                    <div class="left-laowang" style="flex: 0 0 210px;overflow: hidden;">
+                    <div class="left-laowang" style="flex: 0 0 210px;overflow: hidden;" v-if="permissions.reportsCompany || user.manageDeptId != 0 || permissions.reportsDept">
                         <div v-if="permissions.reportsCompany || user.manageDeptId != 0 || permissions.reportsDept" :style="'overflow-x:hidden;overflow-y:auto;height:' + tableHeight + 'px;'">
                             <div style="width: 100%;box-sizing: border-box;padding-right: 10px;">
                                 <el-select v-model="selectState" size="small" @change="stateChange" style="100%">
@@ -44,7 +44,7 @@
                                             {{ node.label }}<span v-if="data.membCount != null && data.isUser == null">({{data.membCount}})</span>
                                         </span>
                                         
-                                        <div style="position: absolute;right: 6px;">
+                                        <div style="position: absolute;right: 15px;">
                                         <span v-if="data.isUser == 1 && data.state == null && !data.leaveDays && !data.leaveTimes" style="color:red;font-size:13px">
                                         未填报
                                         </span>
@@ -70,7 +70,7 @@
                         </div>
                     </div>
 
-                    <div class="line line-second" style="display:flex;justify-content: center;align-items: center;position: relative;left: -9px;">
+                    <div class="line line-second" style="display:flex;justify-content: center;align-items: center;position: relative;left: -9px;" v-if="permissions.reportsCompany || user.manageDeptId != 0 || permissions.reportsDept">
                         <div style="line-height: 5px;text-align: center;color: rgb(151 151 151);">
                         -
                         -