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

fhKeeper/formulahousekeeper/timesheet/src/views/expense/expense.vue

@@ -970,7 +970,8 @@
             <div class="detail-item" v-if="auditTypeItem.auditType != 1">
               <span class="detail-item-title"> <span class="printBox">项目</span> </span>
               <span class="detail-item-content">
-                <el-select size="small" v-if="!flg" v-model="item.projectId" :placeholder="$t('other.project')"
+                {{ item.projectName }}
+                <!-- <el-select size="small" v-if="!flg" v-model="item.projectId" :placeholder="$t('other.project')"
                   style="width: 130px">
                   <el-option v-for="(item, index) in projectList" :key="index"
                     :label="item.projectName + item.projectCode" :value="item.id" @click="ok(item)">
@@ -982,7 +983,7 @@
                   <div v-for="(item, index) in projectIdName" :key="index">
                     <span v-if="item.id == item.projectId">{{ item.projectName }}</span>
                   </div>
-                </div>
+                </div> -->
               </span>
             </div>
             <div class="detail-item" v-if="auditTypeItem.auditType == 1">

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

@@ -182,6 +182,7 @@
                     });
                 }
                 var list = this.user.moduleList
+                let jurisdictionNameList = this.user.functionList.map(item => item.name)
                 for (var i in list) {
                     if(list[i].name == '工时报告') {
                         this.routers.push({name: '查看日报',url: '/calendar',icon: 'description'})
@@ -191,6 +192,9 @@
                         if (this.user.companyId != 3092) {
                             this.routers.push({name: '按周填报',url: '/weekEdit',icon: 'records'})
                         }
+                        if(jurisdictionNameList.some(item => item == '代填日报')) {
+                            this.routers.push({name: '代填日报',url: '/edit?substitute=true',icon: 'completed'})
+                        }
                     }
                     if(list[i].name == '待办任务') {
                         this.routers.push({