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

fhKeeper/formulahousekeeper/inva_4_tivo/css/index.css

@@ -168,7 +168,7 @@
     content:"";
     height: .125rem;
     width: 100%;
-    bottom: 0;
+    bottom: 1.3333rem;
     left: 0;
     background: #37B8FF;
     position: absolute;

fhKeeper/formulahousekeeper/timesheet/src/views/contract/index.vue

@@ -314,7 +314,7 @@ export default {
         {label:this.$t('state.approved'),color: 'color:#67c23a;'},
         {label:this.$t('state.WaitingAudit'),color: 'color:#e6a23c;'},
         {label:this.$t('state.rejected'),color: 'color:#f56c6c;'},
-        {label:this.$t('other.importWaitingForReview'),color: 'color:#e6a23c;'},
+        // {label:this.$t('other.importWaitingForReview'),color: 'color:#e6a23c;'},
       ],
       typeDialog: false,
       typeTitle: this.$t('add'),

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

@@ -104,6 +104,11 @@
                 <br/>
                 
                 <br v-if="user.companyId == 936">
+                <!-- 时间段筛选 -->
+                <el-form-item>
+                    <span style="margin-left:15px;margin-right:5px;color:#606266;">时间段</span>
+                    <el-date-picker v-model="createDate" type="daterange" :range-separator="$t('other.to')" :start-placeholder="$t('time.startDate')" :end-placeholder="$t('time.endDate')" @change="manageSelect()" value-format="yyyy-MM-dd" :placeholder="$t('optiondate')" size="small" clearable style="width:290px;margin-left:5px"></el-date-picker>
+                </el-form-item>
                 <!-- 项目经理筛选 -->
                 <el-form-item>
                     <span style="margin-left:5px;margin-right:5px;color:#606266;">{{ $t('projectmanager') }}</span>
@@ -1466,7 +1471,9 @@ a {
                 paramData1: false,
                 chosenListBackup: [], // 备份
                 searchPersonnelFlg: false,
-                searchPersonnelFlgnum: 1
+                searchPersonnelFlgnum: 1,
+
+                createDate: [], // 项目筛选时间段
             };
         },
         // 过滤器
@@ -3451,7 +3458,11 @@ a {
                     category: this.statusClf,
                     projectMainId: this.projectMainId,
                     inchagerId: this.inchagerId,
-                    participation: this.participationId
+                    participation: this.participationId,
+                }
+                if(this.createDate.length > 0) {
+                    parameter.startDate = this.createDate[0]
+                    parameter.endDate = this.createDate[1]
                 }
                 if(this.sortOrder){
                     if(this.sortProp == 'inchargerName'){