Merge remote-tracking branch 'origin/master'

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

@@ -321,7 +321,15 @@
                 </el-select>
               </el-form-item>
               <!-- 填报日期 -->
-              <div style="display: inline-block;padding-left: 15px">
+              <div style="display: inline-block;">
+                <el-form-item :label="'项目'">
+                  <el-select v-model="selectProject" size="small" style="width: 162px" clearable>
+                    <el-option v-for="item in projectList" :label="item.projectName" :value="item.id">
+                      <span style="float: left">{{ item.projectName }}</span>
+                      <span style="float: right; color: #8492a6;">{{ item.projectCode }}</span>
+                    </el-option>
+                  </el-select>
+                </el-form-item>
                 <el-form-item :label="$t('fillinthedate')">
                   <el-date-picker v-model="date" type="daterange" value-format="yyyy-MM-dd" size="small"
                     :range-separator="$t('other.to')" :start-placeholder="$t('time.startDate')"
@@ -1192,6 +1200,8 @@ export default {
       }, // 发放数据
       sendStateList: [], // 发放状态列表
       dialogVisibleRelease: false, // 发放弹出框
+
+      selectProject: null, // 项目选择
     };
   },
   computed: {
@@ -1915,6 +1925,7 @@ export default {
         endDate: end,
         ownerId: this.ownerId,
         type: this.queryExpenseMainType,
+        projectId: this.selectProject ? this.selectProject : null,
       };
       if (this.isAuditList) {
         param.status = 1;
@@ -2033,7 +2044,10 @@ export default {
 
     // 获取查看单据的数据
     getParticulars(id) {
-      this.http.post('/expense-sheet/getDetail', { id: id },
+      this.http.post('/expense-sheet/getDetail', { 
+        id: id,
+        projectId: this.selectProject ? this.selectProject : '',
+      },
         res => {
           if (res.code == "ok") {
             this

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

@@ -133,7 +133,7 @@
                                     </span>
                                 </span>
                                 <span style="float:right;">
-                                    <el-link type="primary" v-if="user.timeType.enableNewWeeklyfill != 1" style="margin-right:10px;" :underline="false" @click="isSubstitude=false;fillInReport(-1,0)">{{$t('textLink.fillInTheWork')}}</el-link>
+                                    <el-link type="primary" v-if="user.timeType.enableNewWeeklyfill != 1 && user.companyId != '4374'" style="margin-right:10px;" :underline="false" @click="isSubstitude=false;fillInReport(-1,0)">{{$t('textLink.fillInTheWork')}}</el-link>
                                     <el-link v-if="reportTimeType.type != 0 && user.companyId != yuzhongCompId && user.timeType.enableNewWeeklyfill != 1 && user.companyId != 3092" type="primary" style="margin-right:10px;" :underline="false" @click="isSubstitude=false;fillInReportss()">{{$t('textLink.fillInAWeek')}}</el-link>
                                     <el-link v-if="user.timeType.enableNewWeeklyfill == 1" type="primary" style="margin-right:10px;" :underline="false" @click="isSubstitude=false;fillInReportCustom()">按周填报</el-link>
                                     <!-- <el-link type="primary" style="margin-right:10px;" :underline="false" @click="isSubstitude=false;fillInReportCustom()">按周填报</el-link> -->

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

@@ -186,7 +186,7 @@
                 for (var i in list) {
                     if(list[i].name == '工时报告') {
                         this.routers.push({name: '查看日报',url: '/calendar',icon: 'description'})
-                        if(this.user.timeType.enableNewWeeklyfill != 1) { // 针对新版按周填报去掉填写日报
+                        if(this.user.timeType.enableNewWeeklyfill != 1 && this.user.companyId != 4374) { // 针对新版按周填报去掉填写日报
                             this.routers.push({name: '填写日报',url: '/edit',icon: 'edit'})
                         }
                         if (this.user.companyId != 3092) {