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

fhKeeper/formulahousekeeper/timesheet_h5/src/views/index/index.vue

@@ -14,7 +14,8 @@
         <!-- <div class="tip"  v-if="isCorpWX">
             工时报表统计等更多功能，请从PC端企业微信进入
         </div> -->
-        <van-icon v-if="isCorpWX" class="kefu" name="service-o" size="30" color="#20a0ff" @click="tokefu" />
+        <!-- <van-icon v-if="isCorpWX" class="kefu" name="service-o" size="30" color="#20a0ff" @click="tokefu" /> -->
+        <div class="kefu"><img src="../../assets/icon/kefu.png" alt=""></div>
         <div class="tip"  v-if="!isCorpWX">
             体验报表统计等更多功能，尽在PC端<br>
             网页用户访问http://worktime.ttkuaiban.com，钉钉用户直接从钉钉PC端进入工时管家
@@ -347,13 +348,18 @@
     }
     .kefu{
         position: fixed;
-        right: 10px;
-        bottom: 100px;
-        width: 30px;
-        height: 30px;
+        right: 35px;
+        bottom: 120px;
+        width: 36px;
+        height: 36px;
         background-color: #fff;
         z-index: 1000;
         border-radius: 50%;
+        img{
+            margin: 4px;
+            width: 28px;
+            height: 28px;
+        }
     }
 
     .tip {

fhKeeper/formulahousekeeper/timesheet_h5/src/views/project/edit.vue

@@ -3,8 +3,8 @@
     <van-nav-bar title="编辑项目" left-text="返回" @click-left="back" fixed left-arrow />
     <div class="content">
         <van-form ref="projectSubmit">
-        <van-field v-model="projectDetail.projectCode" label="项目编号"></van-field>
-        <van-field v-model="projectDetail.projectName" label="项目名称"></van-field>
+        <van-field v-model="projectDetail.projectCode" label="项目编号" :disabled="!editCodeAndName"></van-field>
+        <van-field v-model="projectDetail.projectName" label="项目名称" :disabled="!editCodeAndName"></van-field>
         <!-- 主项目 -->
         <van-field label="主项目" @click="mainProjectShow = true" readonly clickable v-if="user.timeType.mainProjectState == '1'">
             <template #input>
@@ -167,6 +167,7 @@ export default {
             minDate: new Date(2020,0,1),
             maxDate: new Date(2025,11,31),
             projectDetail: {},
+            editCodeAndName: false,
 
             mainProjectList: [],
             mainProjectShow: false,
@@ -195,6 +196,7 @@ export default {
         }else{
             this.getCategoryList()
         }
+
         
     },
     methods: {
@@ -378,6 +380,16 @@ export default {
                         ]
                         this.projectDetail.levelLabel = this.levelList[this.projectDetail.level - 1].label
                     }
+
+                    if(this.user.id == res.data.creatorId){
+                        this.editCodeAndName = true
+                        return
+                    }
+                    for(let i in this.user.functionList){
+                        if(this.user.functionList[i].name == '编辑负责项目编码和名称' || this.user.functionList[i].name == '管理全部项目'){
+                            this.editCodeAndName = true
+                        }
+                    }
                 } else {
                     this.$toast.fail('获取失败');
                 }

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

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <van-nav-bar :title="projectDetail.projectName ? projectDetail.projectName : '-'" left-text="返回" @click-left="back" fixed left-arrow :right-text="active == 1 && (projectManagement || user.id==projectDetail.inchargerId || user.id==projectDetail.creatorId) ? '编辑项目' : ''" @click-right="openProject()" />
+        <van-nav-bar :title="projectDetail.projectName ? projectDetail.projectName : '-'" left-text="返回" @click-left="back" fixed left-arrow :right-text="(active == 1 && (projectManagement || user.id==projectDetail.inchargerId || user.id==projectDetail.creatorId)) ? '编辑项目' : ''" @click-right="openProject()" />
         <div class="content">
             <!-- <van-cell><div style="width:100%;text-align:center;font-size:120%">{{projectDetail.projectName ? projectDetail.projectName : '-'}}</div></van-cell> -->
             <van-tabs v-model="active" @change="activeChange">