2022.6.17

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

@@ -64,6 +64,19 @@
           </el-option>
         </el-select>
       </div>
+      <div v-if="ins == 6 || ins == 8" class="headScreen">
+          <el-select v-if="ins == 6" v-model="proJuctId" placeholder="请选择项目" @change="selcts()" clearable filterable size="small">
+            <el-option v-for="(item, index) in proListOvertime" :key="index" :label="item.projectName + (item.projectCode ? item.projectCode : '')" :value="item.id">
+              <span style="float: left;color: #8492a6;">{{ item.projectCode }}</span>
+              <span style="float: right;font-size: 13px;margin-left: 20px">{{ item.projectName }}</span>
+            </el-option>
+          </el-select>
+          <span class="demonstration" style="color:#999;padding:0 10px">时间段</span>
+          <el-date-picker v-model="rangeDatas" type="daterange" value-format="yyyy-MM-dd" placeholder="选择开始日期" @change="picks()" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width:350px" :clearable="false" size="small"> </el-date-picker>
+          <el-select v-model="userId" placeholder="请选择人员" @change="selcts()" clearable filterable size="small" style="margin-left:10px">
+            <el-option v-for="(item, index) in userList" :key="index" :label="item.name" :value="item.id"></el-option>
+          </el-select>
+      </div>
       <p style="float: right;margin-right: 25px;" ><el-button type="primary" @click="exportExcel" size="mini">报表导出</el-button></p>
     </div>
     <div ref="staff" style="margin: 5px 0px 0px 200px; width: 84%">
@@ -310,30 +323,9 @@
             </el-table>
 
             <!-- 项目加班情况统计报表 -->
-            <div v-if="ins == 6 || ins == 8" style="padding: 0 20px">
-              <div class="flsx">
-                <div v-if="ins == 6">
-                  <!-- <el-select v-model="proJuctId" placeholder="请选择项目" @change="selcts()" clearable filterable>
-                    <el-option v-for="(item, index) in proList" :key="index" :label="item.projectName" :value="item.id" @change="selscts(item)"></el-option>
-                  </el-select> -->
-                  <el-select v-model="proJuctId" placeholder="请选择项目" @change="selcts()" clearable filterable>
-                    <el-option v-for="(item, index) in proListOvertime" :key="index" :label="item.projectName + (item.projectCode ? item.projectCode : '')" :value="item.id">
-                      <span style="float: left;color: #8492a6;">{{ item.projectCode }}</span>
-                      <span style="float: right;font-size: 13px;margin-left: 20px">{{ item.projectName }}</span>
-                    </el-option>
-                  </el-select>
-                </div>
-                <div class="bianju">
-                    <span class="demonstration">时间段</span>
-                    <el-date-picker v-model="rangeDatas" type="daterange" value-format="yyyy-MM-dd" placeholder="选择开始日期" @change="picks()" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width:350px" :clearable="false"> </el-date-picker>
-                </div>
-                <div style="margin-left: 30px">
-                  <el-select v-model="userId" placeholder="请选择人员" @change="selcts()" clearable filterable>
-                    <el-option v-for="(item, index) in userList" :key="index" :label="item.name" :value="item.id"></el-option>
-                  </el-select>
-                </div>
-              </div>
-              <el-table v-if="ins == 6" key="6" border :data="overTimeList" highlight-current-row v-loading="listLoading" :height="tableHeight - 30" style="width: 100%;">
+            <div v-if="ins == 6 || ins == 8">
+              
+              <el-table v-if="ins == 6" key="6" border :data="overTimeList" highlight-current-row v-loading="listLoading" :height="tableHeight" style="width: 100%;">
                 <el-table-column prop="projectCode" label="序号" width="80">
                   <template slot-scope="scope">
                     <div>
@@ -1125,7 +1117,7 @@ export default {
         parameter.userId = this.userId
       }
       this.listLoading = true
-      this.http.post('project/getUserWorkingTimeList',parameter,
+      this.http.post('/project/getUserWorkingTimeList',parameter,
       res => {
         this.listLoading = false
         if(res.code == 'ok'){
@@ -1515,7 +1507,7 @@ export default {
   margin: 20px 0;
 }
 .bianju {
-  margin-left: 40px;
+
 }
 .bianju span {
   display: inline-block;

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

@@ -221,7 +221,7 @@
                             batchIds += this.selectArr[m].id + ','
                         }
                         batchIds = batchIds.substring(0,batchIds.length - 1)
-                        this.http.post('customer-info/batchDelete',{
+                        this.http.post('/customer-info/batchDelete',{
                             batchIds
                         },res => {
                             this.delLoading = false