提交文件

fhKeeper/formulahousekeeper/timesheet-workshop/src/views/statistic/index.vue

@@ -38,16 +38,16 @@
           <!-- 部门筛选 -->
           <el-cascader v-model="departmentIdArray" :options="departmentList" :placeholder="$t('qing-xuan-ze-bu-men')"
             :props="{ checkStrictly: true,expandTrigger: 'hover',multiple: ins == 6 ? true : false }" collapse-tags :show-all-levels="false" clearable
-            @change="selcts()" size="small" style="margin-bottom: 10px"
+            @change="selcts()" size="small" style="margin-bottom: 10px;width:180px"
           ></el-cascader>
 
           <!-- 人员筛选 -->
-          <el-select v-if="ins!=4" v-model="userId" :placeholder="$t('pleaseselectpersonnel')" @change="selcts()" clearable filterable size="small" style="width:200px">
+          <el-select v-if="ins!=4" v-model="userId" :placeholder="$t('pleaseselectpersonnel')" @change="selcts()" clearable filterable size="small" style="width:120px">
             <el-option v-for="(item, index) in selUserList" :key="index" :label="item.name" :value="item.id"></el-option>
           </el-select>
 
           <!-- 产品筛选 -->
-          <el-select v-if="ins == 2"  v-model="productId" :placeholder="'请选择'" @change="selcts()" clearable filterable size="small" style="width:200px">
+          <el-select v-if="ins == 2"  v-model="productId" :placeholder="'请选择'" @change="selcts()" clearable filterable size="small" style="width:140px">
             <el-option v-for="(item, index) in productList" :key="index" :label="item.name" :value="item.id"></el-option>
           </el-select>
 
@@ -57,23 +57,23 @@
               <span class="demonstration" style="color:#999;padding:0 10px">
                 {{ ins == 15 ? $t('xiang-mu-chuang-jian-shi-jian-duan') : $t('message.period') }}
               </span>
-              <el-date-picker v-model="rangeDatas" type="daterange" value-format="yyyy-MM-dd" :placeholder="$t('selectstartdate')" @change="picks()" :range-separator="$t('other.to')" :start-placeholder="$t('time.startDate')" :end-placeholder="$t('time.endDate')" style="width:300px" :clearable="ins == 15" size="small"> </el-date-picker>
+              <el-date-picker v-model="rangeDatas" type="daterange" value-format="yyyy-MM-dd" :placeholder="$t('selectstartdate')" @change="picks()" :range-separator="$t('other.to')" :start-placeholder="$t('time.startDate')" :end-placeholder="$t('time.endDate')" style="width:240px" :clearable="ins == 15" size="small"> </el-date-picker>
             </span>
           </template>
 
           <br />
           <!-- 车辆序号 -->
-          <el-input v-if="ins == 2" v-model="vehicleNum" placeholder="请输入车辆序号" @change="selcts()"  size="small" style="width:200px"></el-input>
+          <el-input v-if="ins == 2" v-model="vehicleNum" placeholder="请输入车辆序号" @change="selcts()"  size="small" style="width:140px"></el-input>
 
           <!-- 钢印号-->
-          <el-input v-if="ins == 2" v-model="steelNum" placeholder="请输入钢印号" @change="selcts()" size="small" style="width:200px"></el-input>
+          <el-input v-if="ins == 2" v-model="steelNum" placeholder="请输入钢印号" @change="selcts()" size="small" style="width:140px"></el-input>
           
       </div>
       <p :style="`${ins == 9 ? 'width:20%' : ins == 14 ? 'width: 20%' : 'width: 10%'}`" class="tableRightBtn">
         <el-button type="primary" @click="exportExcel" size="mini">{{ $t('reporderived') }}</el-button>
       </p>
     </div>
-    <div ref="staff" style="margin: 5px 0px 0px 10px; width: 98%">
+    <div ref="staff" style="margin: 5px;">
         <div class="staff" ref="tabless" :style="'width:'+(windowWidth - 430)+'px'">
             <!-- 人员工时工价表 -->
             <el-table v-if="ins == 0"  key="1" border :data="personWorkHoursWagesList" highlight-current-row v-loading="listLoading" :height="+tableHeight - 1" style="width: 100%;">
@@ -1107,8 +1107,8 @@ export default {
         this.$refs.sid.style.left = '201px'
         this.$refs.side.style.left = '1px'
         this.$refs.sideI.className = 'el-icon-arrow-right'
-        this.$refs.staff.style.margin = '5px 0px 0px 5px'
-        this.$refs.staff.style.width = '100%'
+        // this.$refs.staff.style.margin = '5px 0px 0px 5px'
+        // this.$refs.staff.style.width = '100%'
         this.$refs.headHe.style.paddingLeft = '10px'
         this.$refs.headine.style.width = (this.windowWidth - 200)+'px'
         this.$refs.tabless.style.width = (this.windowWidth - 200)+'px'
@@ -1117,8 +1117,8 @@ export default {
         this.$refs.sid.style.left = '400px'
         this.$refs.side.style.left = '-19px'
         this.$refs.sideI.className = 'el-icon-arrow-left'
-        this.$refs.staff.style.margin = '5px 0px 0px 10px'
-        this.$refs.staff.style.width = '98%'
+        // this.$refs.staff.style.margin = '5px 0px 0px 10px'
+        // this.$refs.staff.style.width = '98%'
         this.$refs.headHe.style.paddingLeft = '10px'
         this.$refs.headine.style.width = (this.windowWidth - 400)+'px'
         this.$refs.tabless.style.width = (this.windowWidth - 400)+'px'
@@ -1222,9 +1222,9 @@ export default {
   margin-left: 15px !important;
 }
 .headConCon {
-  position: fixed;
+  // position: fixed;
   /* width: 99%; */
-  top: 60px;
+  // top: 60px;
 }
 .headine {
   /* width: 100%; */
@@ -1323,8 +1323,8 @@ export default {
   border-top: 1px solid #fff;
   border-right: 1px solid #fff;
   background: #fff;
-  position: fixed;
-  top: 110px;
+  // position: fixed;
+  // top: 110px;
 }
 
 .colorText {
@@ -1397,7 +1397,7 @@ export default {
 
 /* 右边整体页面 */
 .contents {
-  height: 100%;
+  height: 100vh;
   width: 100%;
   /* padding: 30px; */
   background: #F7F7F7;