调整员工任务完成情况表的样式

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

@@ -1261,7 +1261,7 @@
                 <template slot-scope="scope">
                   <div>
                     <span v-if="user.userNameNeedTranslate == '1'">
-                      <ww-open-data type='userName' :openid='scope.row.userName'></ww-open-data>
+                      <TranslationOpenDataText type='userName' :openid='scope.row.userName'></TranslationOpenDataText>
                     </span>
                     <span v-if="user.userNameNeedTranslate != '1'">
                       <el-link type="primary" :underline="false" @click="showUserTask(scope.row.userId)">{{scope.row.userName}}</el-link>
@@ -1273,7 +1273,7 @@
                 <template slot-scope="scope">
                   <div>
                     <span v-if="user.userNameNeedTranslate == '1'">
-                      <ww-open-data type='deptName' :openid='scope.row.deptName'></ww-open-data>
+                      <TranslationOpenDataText type='deptName' :openid='scope.row.deptName'></TranslationOpenDataText>
                     </span>
                     <span v-if="user.userNameNeedTranslate != '1'">
                       {{scope.row.deptName}}
@@ -1536,39 +1536,44 @@
           title="员工任务数据"
           :visible.sync="showUserTaskDialog"
           width="80%"
+          top="8.1vh"
           :before-close="handleClose">
-          <el-table  border :data="userTaskData" highlight-current-row v-loading="userTasklistLoading" style="width: 100%;" >
-              <el-table-column align="center" prop="executorNames" label="执行人" min-width="150">
-                <template slot-scope="scope">
-                  <div>
-                    <span v-if="user.userNameNeedTranslate == '1'">
-                      <ww-open-data type='userName' :openid='scope.row.executorNames'></ww-open-data>
-                    </span>
-                    <span v-if="user.userNameNeedTranslate != '1'">
-                      {{scope.row.executorNames}}
-                    </span>
-                  </div>
-                </template>
-              </el-table-column>
-              <el-table-column align="center" prop="taskName" label="任务名称" min-width="150"></el-table-column>
-              <el-table-column align="center" prop="stateValue" label="当前状态" min-width="150"></el-table-column>
-              <el-table-column align="center" prop="startDate" label="开始日期" min-width="150"></el-table-column>
-              <el-table-column align="center" prop="endDate" label="截止日期" min-width="150"></el-table-column>
-              <el-table-column align="center" prop="finishDate" label="完成日期" min-width="150"></el-table-column>
-            </el-table>
-          <span slot="footer" class="dialog-footer">
-            <el-button type="primary" @click="showUserTaskDialog = false">关闭</el-button>
-          </span>
-          <el-pagination
-                @size-change="usertaskSizeChange"
-                @current-change="usertaskCurrentChange"
-                :current-page="userTaskPage"
-                :page-sizes="[20 , 50 , 80 , 100]"
-                :page-size="userTaskSize"
-                layout="total, sizes, prev, pager, next"
-                :total="userTaskTotal"
-                style="float:right;"
-            ></el-pagination>
+          <div>
+            <div class="pagingTable">
+              <el-table  border :data="userTaskData" highlight-current-row height="50vh" v-loading="userTasklistLoading" style="width: 100%;" >
+                <el-table-column align="center" prop="executorNames" label="执行人" min-width="150">
+                  <template slot-scope="scope">
+                    <div>
+                      <span v-if="user.userNameNeedTranslate == '1'">
+                        <TranslationOpenDataText type='userName' :openid='scope.row.executorNames'></TranslationOpenDataText>
+                      </span>
+                      <span v-if="user.userNameNeedTranslate != '1'">
+                        {{scope.row.executorNames}}
+                      </span>
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column align="center" prop="taskName" label="任务名称" min-width="150"></el-table-column>
+                <el-table-column align="center" prop="stateValue" label="当前状态" min-width="150"></el-table-column>
+                <el-table-column align="center" prop="startDate" label="开始日期" min-width="150"></el-table-column>
+                <el-table-column align="center" prop="endDate" label="截止日期" min-width="150"></el-table-column>
+                <el-table-column align="center" prop="finishDate" label="完成日期" min-width="150"></el-table-column>
+              </el-table>
+            </div>
+        
+            <div class="pagingData">
+              <el-pagination
+                  @size-change="usertaskSizeChange"
+                  @current-change="usertaskCurrentChange"
+                  :current-page="userTaskPage"
+                  :page-sizes="[20 , 50 , 80 , 100]"
+                  :page-size="userTaskSize"
+                  layout="total, sizes, prev, pager, next"
+                  :total="userTaskTotal"
+                  style="float:right;"
+              ></el-pagination>
+            </div>
+          </div>
         </el-dialog>
   </section>
 </template>
@@ -4157,6 +4162,15 @@ export default {
 };
 </script>
 <style scoped>
+.pagingTable {
+  flex: 1 1 0%;
+  overflow: hidden;
+}
+.pagingData {
+  padding-top: 10px;
+  display: flex;
+  justify-content: flex-end;
+}
 .participatingEmployee {
   display: flex;
   flex-wrap: wrap;