qymljy 1 год назад
Родитель
Сommit
a405d20d61

+ 5 - 5
src/HManagement/siteManage/custom_option/index.vue

@@ -1,15 +1,15 @@
 <template>
-  <normalLayout style="height: calc(100vh - 130px)">
-    <div slot="content" class=" normal-panel el-row" >
+  <normalLayout >
+    <div slot="content" class=" normal-panel el-row">
       <div class="borderRight el-col el-col-12">
         <list ref="list" @rowShow="rowShow">
         </list>
       </div>
-      <div class="el-col el-col-12">
-        <div >
+      <div class="el-col el-col-12" >
+        <div class="flex-align-center flex-between mt-10">
           <add :disabled="disabled" :data="list" @addSuccess="onSuccess" style="margin-left: 2%"></add>
         </div>
-        <div>
+        <div >
           <details_list ref="listDetails" :id="optiontypeid">
             <template v-slot:edit="scope">
               <edit v-if="tool.checkAuth($route.name,'update') && scope.data.siteid"  :data="scope.data" :classname="classname" @updateSuccess="onSuccess" :type="'text'" ></edit>

+ 4 - 2
src/HManagement/siteManage/custom_option/modules/detailsList.vue

@@ -25,12 +25,14 @@
 </template>
 
 <script>
+import tableLayout from '@/components/dynamic-table/index1'
 export default {
   name: "detailsList",
+  components:{tableLayout},
   props:["id"],
   data(){
     return {
-      tableHieght:560,
+      tableHieght:'calc(100vh - 270px)',
       tablecols:[],
       list:[],
       total:0,
@@ -98,4 +100,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

+ 11 - 10
src/HManagement/siteManage/custom_option/modules/list.vue

@@ -1,12 +1,12 @@
 <template>
   <div class="container normal-panel" >
     <div class="flex-align-center flex-between mt-10">
-        <el-input 
-          style="width:200px" 
-          size="small"  
-          suffix-icon="el-icon-search" 
-          v-model="param.content.where.condition" 
-          placeholder="搜索" 
+        <el-input
+          style="width:200px"
+          size="small"
+          suffix-icon="el-icon-search"
+          v-model="param.content.where.condition"
+          placeholder="搜索"
           @keyup.enter.native="queryOptions()" @clear="queryOptions()" clearable></el-input>
       </div>
     <tableLayout ref="table" :layout="tablecols" :data="list" :opwidth="200" :custom="true" :height="tableHieght" @rowClick="rowShow">
@@ -31,6 +31,7 @@
 
 <script>
 import add from './add'
+import tableLayout from '@/components/dynamic-table/index1'
 import { log } from '@antv/g2plot/lib/utils'
 export default {
   data () {
@@ -45,7 +46,7 @@ export default {
           }
         }
       },
-      tableHieght:560,
+      tableHieght:'calc(100vh - 270px)',
       tablecols:[],
       // optionmxlist:[],
       // expands: [],
@@ -58,14 +59,14 @@ export default {
     }
   },
   components:{
-    add
+    add,tableLayout
   },
   methods:{
     async queryOptions (setRow) {
       const res = await this.$api.requested(this.param)
       this.list = res.data
       console.log(this.list);
-      
+
       this.total = res.total
       this.currentPage = res.pageNumber
       this.$nextTick(() => {
@@ -140,4 +141,4 @@ export default {
 
 </script>
 <style>
-</style>
+</style>

+ 1 - 1
src/components/normal-basic-layout/normal.vue

@@ -81,7 +81,7 @@ export default {
   padding: 16px 0;
 } */
 .basic__layout__panel{
-  height: calc(100vh - 150px);
+  height: calc(100vh - 130px);
 }
 .card__list{
   display: flex;