暂存

src/HManagement/addressList/addressBook/detail/index.vue

@@ -9,6 +9,9 @@
       :pageChange="true"
       :tabs="['详细信息','关联客户','关联项目']"
       >
+    <template slot="customOperation">
+
+    </template>
     <div slot="slot0" >
       <detailed :detailData="mainData"></detailed>
     </div>
@@ -25,6 +28,7 @@
 import detailed from '../modules/detailsData'
 import customerData from '../modules/customerData'
 import projectData from '../modules/projectData'
+
 export default {
   name: "index",
   components:{detailed,customerData,projectData},

src/HManagement/addressList/mycontact/modules/group.vue

@@ -22,21 +22,23 @@
         <p class="container normal-title">自定义群组</p>
         <div style="margin-right:16px"><slot name="addGroup"></slot></div>
       </div>
-      <ul>
-        <li @click="clickGroup(item)" v-for="item in myGroup" :key="item.index" :class="active === item.rowindex?'act':''" class="pd-t-b flex-align-center flex-between">
-          <div class="flex-align-stretch">
-            <img width="50" src="../../../../assets/icons/my_group.png" alt="">
-            <div class="r_flex">
-              <p class="groupname">{{item.groupname}}</p>
-              <small class="color-grey">已有{{item.count}} 人</small>
+      <div style="overflow: auto;max-height: calc(100vh - 662px)">
+        <ul>
+          <li @click="clickGroup(item)" v-for="item in myGroup" :key="item.index" :class="active === item.rowindex?'act':''" class="pd-t-b flex-align-center flex-between">
+            <div class="flex-align-stretch">
+              <img width="50" src="../../../../assets/icons/my_group.png" alt="">
+              <div class="r_flex">
+                <p class="groupname">{{item.groupname}}</p>
+                <small class="color-grey">已有{{item.count}} 人</small>
+              </div>
             </div>
-          </div>
-          <div style="display:flex">
-            <slot name="edit" :data="item"></slot>
-            <slot name="del" :data="item"></slot>
-          </div>
-        </li>
-      </ul>
+            <div style="display:flex">
+              <slot name="edit" :data="item"></slot>
+              <slot name="del" :data="item"></slot>
+            </div>
+          </li>
+        </ul>
+      </div>
     </div>
   </div>
 </template>
@@ -111,7 +113,7 @@ export default {
   font-size: 14px;
 }
 .scroll-panel{
-  height: calc(100vh - 182px);
+  height: calc(100vh - 254px);
   overflow-y: scroll;
 }
 .scroll-panel::-webkit-scrollbar{

src/components/normal-basic-layout/modules/table.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="bs-table" style="height:calc(100vh - 330px)">
+  <div class="bs-table" :style="{height:height?height:'calc(100vh - 330px)'}">
     <el-table border stripe ref="tables" :row-class-name="tableClassName" :header-cell-style="{background:'#fafafafa',height:'40px','color':'#000000'}" highlight-current-row :data="data" size="mini" @row-click="rowClick" height="100%" style="width:100%;" @selection-change="handleSelectionChange" >
       <!-- <div slot="empty">
         <el-empty :image="require('../../../assets/empty.svg')" :image-size="250">
@@ -13,7 +13,7 @@
       </el-table-column>
       <el-table-column show-overflow-tooltip v-for="(col) in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :width="col.width ? col.width : 0" :min-width="col.width === 0 ? 150 : col.width" :fixed="checkFixed(col.columnname)">
         <template slot-scope="scope">
-        
+
           <slot v-if="col.columnname !== 'operation'" name="customcol" :column="{data:scope.row,columnname:col.columnname}"></slot>
 
           <slot v-if="col.columnname === 'operation'" name="opreation" :data="scope.row"></slot>
@@ -21,12 +21,12 @@
       </el-table-column>
       <!-- <el-table-column  v-for="(col) in layout" :key="col.tablecolid">
         <template #header>
-          
+
           <el-input v-if="col.filter === 1" size="mini" v-model="col.value" @change="inputChange" @keyup.native.enter="headerSearch(col.columnname)" @clear="headerSearch(col.columnname)" clearable/>
 
-          
+
         <slot v-if="col.filter === 2" name="temp" :data="col.columnname"></slot>
-          
+
         </template>
         <el-table-column :prop="col.columnname" :label="col.title" :width="col.width ? col.width : 0" :min-width="col.width === 0 ? 150 : col.width" :fixed="checkFixed(col.columnname)">
           <template slot-scope="scope">
@@ -34,8 +34,8 @@
             <slot v-if="col.columnname === 'operation'" name="opreation" :data="scope.row"></slot>
           </template>
         </el-table-column>
-        
-        
+
+
       </el-table-column> -->
     </el-table>
   </div>
@@ -50,7 +50,7 @@ export default {
     custom:是否启用自定义结构;
     opwidth:操作列宽度
   */
-  props:['data','tableName','custom','layout','fixRightData','fixLeftData'],
+  props:['data','tableName','custom','layout','fixRightData','fixLeftData','height'],
   data () {
     return {
       list:[],
@@ -79,7 +79,7 @@ export default {
       row.index = rowIndex
     },
     handleSelectionChange(val) {
-      this.$emit('checkboxCallBack',val)      
+      this.$emit('checkboxCallBack',val)
     },
     checkFixed (columnname) {
       let isRight = this.fixRightData.some(item=>item === columnname)
@@ -127,4 +127,4 @@ export default {
 /deep/.el-table .el-table__cell {
   padding: 0 !important;
 }
-</style>
+</style>

src/components/normal-basic-layout/normalBook.vue

@@ -47,7 +47,7 @@
         <div style="display: flex;">
           <slot name="tableLeft"></slot>
           <div style="flex: 1;width: 70%" v-if="listType === 'table' && refreshTable">
-            <tableTemp ref="table" :layout="tableLayout" :tableName="tableName" :custom="true" :data="list" :fixRightData="fixRightData" :fixLeftData="fixLeftData" @headerSearch="onHeaderSearch" @checkboxCallBack="checkboxCallBack">
+            <tableTemp height="calc(100vh - 315px)" ref="table" :layout="tableLayout" :tableName="tableName" :custom="true" :data="list" :fixRightData="fixRightData" :fixLeftData="fixLeftData" @headerSearch="onHeaderSearch" @checkboxCallBack="checkboxCallBack">
               <template v-slot:temp="scope">
                 <slot name="tempChild" :data="scope.data"></slot>
               </template>
@@ -70,7 +70,7 @@
               </template>
             </tableTemp>
             <div style="display:flex;align-items:center;flex-direction:row-reverse;justify-content:space-between">
-              <div v-if="!hidePagination" class="container normal-panel" style="text-align:right">
+              <div v-if="!hidePagination" class="normal-panel" style="text-align:right;padding-top: 16px">
                 <el-pagination
                     background
                     @size-change="handleSizeChange"