qymljy 2 vuotta sitten
vanhempi
commit
f9cbcccc74

+ 4 - 4
src/HManagement/personalTarget/target/modules/addPersonal.vue

@@ -57,7 +57,7 @@
                 <p style="float: right">总共{{leftData.list.length}}人</p>
 
               </div>
-              <div  class="container normal-panel"  style="float: right;">
+<!--              <div  class="container normal-panel"  style="float: right;">
                 <el-pagination
                     background
                     small
@@ -68,7 +68,7 @@
                     layout="total,sizes, prev, pager, next, jumper"
                     :total="leftData.total">
                 </el-pagination>
-              </div>
+              </div>-->
             </div>
           </el-col>
           <el-col :span="2">
@@ -90,7 +90,7 @@
                 <p style="float: right">总共{{rightData.list.length}}人</p>
 
               </div>
-              <div  class="container normal-panel"  style="float: right;">
+<!--              <div  class="container normal-panel"  style="float: right;">
                 <el-pagination
                     background
                     small
@@ -101,7 +101,7 @@
                     layout="total,sizes, prev, pager, next, jumper"
                     :total="rightData.total">
                 </el-pagination>
-              </div>
+              </div>-->
             </div>
 
           </el-col>

+ 8 - 6
src/HManagement/personalTarget/target/modules/edit/components/table.vue

@@ -2,8 +2,11 @@
   <div>
     <el-table
       :data="tableData"
-      style="width: 100%"
-      height="500"
+      border
+      style="width: 100%;min-height: 700px"
+      :header-cell-style="{height:'50px',color:'#606266',fontWeight:'400',fontSize:'14px'}"
+      :cell-style="{height:'33px',color:'#666666',fontWeight:'400'}"
+      height="960px"
       size="small">
       <el-table-column
         prop="depfullname"
@@ -11,7 +14,7 @@
         width="120"
         fixed>
         <template slot-scope="scope">
-          <p :style="{textIndent:scope.row.level === 0?'10px':''}">{{scope.row.level === 0?'--':scope.row.depfullname}}</p>
+          <p :style="{textIndent:scope.row.level === 0?'10px':''}">{{scope.row.depfullname}}</p>
         </template>
       </el-table-column>
       <el-table-column
@@ -240,12 +243,11 @@
     <div  class="container normal-panel" style="text-align:right">
       <el-pagination
           background
-          small
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
           :current-page="currentPage"
           :page-sizes="[20, 50, 100, 200]"
-          layout="total,sizes, prev, pager, next, jumper"
+          :page-size="100"
           :total="total">
       </el-pagination>
     </div>
@@ -265,7 +267,7 @@ export default {
         "content": {
           "sa_salestargetbillid": this.$route.query.id,
           "pageNumber": 1,
-          "pageSize": 20,
+          "pageSize": 999,
           "where":{
             "condition":""
           }

+ 4 - 4
src/HManagement/projectTarget/target/modules/addProject.vue

@@ -57,7 +57,7 @@
                 <p style="float: right">总共{{leftData.list.length}}人</p>
 
               </div>
-              <div  class="container normal-panel"  style="float: right;">
+<!--              <div  class="container normal-panel"  style="float: right;">
                 <el-pagination
                     background
                     small
@@ -68,7 +68,7 @@
                     layout="total,sizes, prev, pager, next, jumper"
                     :total="leftData.total">
                 </el-pagination>
-              </div>
+              </div>-->
             </div>
           </el-col>
           <el-col :span="2">
@@ -90,7 +90,7 @@
                 <p style="float: right">总共{{rightData.list.length}}人</p>
 
               </div>
-              <div  class="container normal-panel"  style="float: right;">
+<!--              <div  class="container normal-panel"  style="float: right;">
                 <el-pagination
                     background
                     small
@@ -101,7 +101,7 @@
                     layout="total,sizes, prev, pager, next, jumper"
                     :total="rightData.total">
                 </el-pagination>
-              </div>
+              </div>-->
             </div>
 
           </el-col>

+ 6 - 5
src/HManagement/projectTarget/target/modules/edit/components/table.vue

@@ -3,7 +3,9 @@
     <el-table
       :data="tableData"
       style="width: 100%"
-      height="500"
+      :header-cell-style="{height:'50px',color:'#606266',fontWeight:'400',fontSize:'14px'}"
+      :cell-style="{height:'33px',color:'#666666',fontWeight:'400'}"
+      height="960px"
       size="small">
       <el-table-column
         prop="depfullname"
@@ -11,7 +13,7 @@
         width="120"
         fixed>
         <template slot-scope="scope">
-          <p :style="{textIndent:scope.row.level === 0?'10px':''}">{{scope.row.level === 0?'--':scope.row.depfullname}}</p>
+          <p :style="{textIndent:scope.row.level === 0?'10px':''}">{{scope.row.depfullname}}</p>
         </template>
       </el-table-column>
       <el-table-column
@@ -271,12 +273,11 @@
     <div  class="container normal-panel" style="text-align:right">
       <el-pagination
           background
-          small
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
           :current-page="currentPage"
           :page-sizes="[20, 50, 100, 200]"
-          layout="total,sizes, prev, pager, next, jumper"
+          :page-size="100"
           :total="total">
       </el-pagination>
     </div>
@@ -295,7 +296,7 @@ export default {
         "id": 20220909152802,
         "content": {
           "pageNumber": 1,
-          "pageSize": 20,
+          "pageSize": 999,
           "sa_salestargetbillid": this.$route.query.id,
           "where":{
             "condition":""

+ 1 - 1
src/components/dynamic-table/index.vue

@@ -2,7 +2,7 @@
   <div>
     <!-- :header-cell-style="{background:'#EEEEEE',color:'#333'}" -->
     <el-table ref="table" :row-class-name="tableClassName" highlight-current-row :data="data"  size="mini"  :height="height" @row-click="rowClick" style="width:100%;min-height:910px;" :header-cell-style="{height:'50px',color:'#606266',fontWeight:'400',fontSize:'14px'}"
-              :cell-style="{height:'50px',color:'#666666',fontWeight:'400'}" border @selection-change="selectionChange">
+              :cell-style="{height:'40px',color:'#666666',fontWeight:'400'}" border @selection-change="selectionChange">
       <el-table-column
           type="selection"
           width="35" fixed v-if="checkbox">