Browse Source

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

Lijy 2 years ago
parent
commit
a52014b7f7
1 changed files with 10 additions and 2 deletions
  1. 10 2
      fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

+ 10 - 2
fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -245,7 +245,7 @@
         </div>
 
         <!-- 填写日报的dialog -->
-        <el-dialog :title="editTitle[isBatch]" :visible.sync="dialogVisible" width="60%" :close-on-click-modal="false" @closed="guanbi()">
+        <el-dialog :title="editTitle[isBatch]" :visible.sync="dialogVisible" width="60%" style="height:95%" :close-on-click-modal="false" @closed="guanbi()" custom-class="editReportDialog" ref="editReportDialog">
             <el-form ref="workForm" :model="workForm" :rules="workRules" label-width="120px">
                 <el-form-item label="选择人员" v-if="isSubstitude">
                     <el-input @focus="showChooseMembTree" v-model="workForm.userNames"
@@ -590,7 +590,8 @@
                     </p>
                     <el-divider v-if="workForm.domains.length>1" style="margin-bottom:10px;"></el-divider>
                 </div>
-                <el-link v-if="showAddMore" type="primary" :underline="false" @click="addDomain(reportTimeType.type)" style="margin-left:40px">添加更多</el-link>
+                <span id="workFormsItemBottom"></span>
+                <el-link v-if="showAddMore" type="primary" :underline="false" @click="addDomain(reportTimeType.type)" style="margin-left:40px;position:sticky;bottom:70px;background:#fff;">添加更多</el-link>
             </el-form>
             <span slot="footer" class="dialog-footer">
                 <el-button @click="cancel(workForm.domains,true)" v-if="canCancelInDialog" style="float:left;">撤回</el-button>
@@ -4959,6 +4960,7 @@
                     addItem.basecostId = this.timeBasecostList[0].id;
                 }
                 this.workForm.domains.push(addItem);
+                document.getElementById('workFormsItemBottom').scrollIntoView()
                 this.canEdit = true
                 if (this.reportTimeType.type == 0) {
                     //全天上下午模式下,检测时间段数量,达到2个,不能再加了
@@ -5770,6 +5772,12 @@
             padding-top: 10px;
         }
     }
+    .editReportDialog .el-dialog__footer{
+        position: sticky;
+        bottom: 0;
+        background: #fff;
+        height: 70px;
+    }
 </style>
 
 <style scoped>