瀏覽代碼

经销商管理页面优化

chenrui 1 年之前
父節點
當前提交
bf4941d63a

+ 1 - 1
src/views/dealerManagement/businessOwnerSettings/list.vue

@@ -189,7 +189,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 275
+      this.tableHeight = window.innerHeight - tableSearchH - 265
     }
   },
   watch: {

+ 1 - 1
src/views/dealerManagement/businessOwnerSettings/settingsIndex.vue

@@ -346,7 +346,7 @@ export default {
     },
     setTableH () {
       const headHeight = this.$refs.headerBar.offsetHeight
-      this.tableHeight = window.innerHeight - headHeight - 230
+      this.tableHeight = window.innerHeight - headHeight - 210
     }
   },
   watch: {

+ 72 - 68
src/views/dealerManagement/dealerAccountManagement/list.vue

@@ -1,6 +1,6 @@
 <template>
-  <a-card size="small" :bordered="false" class="dealerAccountList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
+  <div>
+    <a-card size="small" :bordered="false" class="dealerAccountList-wrap searchBottomSpace">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -27,71 +27,75 @@
           </a-row>
         </a-form>
       </div>
-      <!-- 操作按钮 -->
-      <div class="table-operator">
-        <a-button id="dealerAccountList-add" type="primary" v-if="$hasPermissions('B_dealerAccount_add')" class="button-error" @click="handleEdit()">新增</a-button>
-      </div>
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
-        size="small"
-        :rowKey="(record) => record.id"
-        :columns="columns"
-        :data="loadData"
-        :scroll="{ y: tableHeight }"
-        :defaultLoadData="false"
-        bordered>
-        <!-- 账号状态 -->
-        <template slot="loginFlag" slot-scope="text, record">
-          <a-switch
-            id="dealerAccountList-enable"
-            v-if="$hasPermissions('B_dealerAccount_enable')"
-            checkedChildren="启用"
-            unCheckedChildren="禁用"
-            @change="changeStatus(record)"
-            :checked="record.loginFlag == 1 ? true : false" />
-          <span v-else :style="{color:(record.loginFlag==1?'#00aa00':'#999')}"> {{ record.loginFlag==1? '已启用': '已禁用' }} </span>
-        </template>
-        <!-- 操作 -->
-        <template slot="action" slot-scope="text, record">
-          <a-button
-            size="small"
-            type="link"
-            v-if="$hasPermissions('B_dealerAccount_edit')"
-            class="button-info"
-            @click="handleEdit(record)"
-            id="dealerAccountList-edit-btn">编辑</a-button>
-          <a-button
-            size="small"
-            type="link"
-            v-if="$hasPermissions('B_dealerAccount_detail')"
-            class="button-success"
-            @click="handleDetail(record)"
-            id="dealerAccountList-detail-btn">详情</a-button>
-          <a-button
-            size="small"
-            type="link"
-            v-if="$hasPermissions('B_dealerAccount_reset')"
-            class="button-warning"
-            @click="handleReset(record)"
-            id="dealerAccountList-reset-btn">重置密码</a-button>
-          <span v-if="!$hasPermissions('B_dealerAccount_edit') && !$hasPermissions('B_dealerAccount_detail') && !$hasPermissions('B_dealerAccount_reset')">--</span>
-        </template>
-      </s-table>
-    </a-spin>
-    <!-- 新增/编辑 -->
-    <dealer-account-edit-modal
-      v-drag
-      :openModal="openModal"
-      :nowData="nowData"
-      :itemId="itemId"
-      @ok="$refs.table.refresh(true)"
-      @close="closeModal" />
-    <!-- 查看 -->
-    <dealer-account-detail-modal v-drag :openModal="openDetailModal" :itemId="itemId" @close="closeDetailModal" />
-  </a-card>
+    </a-card>
+    <a-card size="small" :bordered="false">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <!-- 操作按钮 -->
+        <div class="table-operator">
+          <a-button id="dealerAccountList-add" type="primary" v-if="$hasPermissions('B_dealerAccount_add')" class="button-error" @click="handleEdit()">新增</a-button>
+        </div>
+        <!-- 列表 -->
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+84.5+'px' }"
+          size="small"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :data="loadData"
+          :scroll="{ y: tableHeight }"
+          :defaultLoadData="false"
+          bordered>
+          <!-- 账号状态 -->
+          <template slot="loginFlag" slot-scope="text, record">
+            <a-switch
+              id="dealerAccountList-enable"
+              v-if="$hasPermissions('B_dealerAccount_enable')"
+              checkedChildren="启用"
+              unCheckedChildren="禁用"
+              @change="changeStatus(record)"
+              :checked="record.loginFlag == 1 ? true : false" />
+            <span v-else :style="{color:(record.loginFlag==1?'#00aa00':'#999')}"> {{ record.loginFlag==1? '已启用': '已禁用' }} </span>
+          </template>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record">
+            <a-button
+              size="small"
+              type="link"
+              v-if="$hasPermissions('B_dealerAccount_edit')"
+              class="button-info"
+              @click="handleEdit(record)"
+              id="dealerAccountList-edit-btn">编辑</a-button>
+            <a-button
+              size="small"
+              type="link"
+              v-if="$hasPermissions('B_dealerAccount_detail')"
+              class="button-success"
+              @click="handleDetail(record)"
+              id="dealerAccountList-detail-btn">详情</a-button>
+            <a-button
+              size="small"
+              type="link"
+              v-if="$hasPermissions('B_dealerAccount_reset')"
+              class="button-warning"
+              @click="handleReset(record)"
+              id="dealerAccountList-reset-btn">重置密码</a-button>
+            <span v-if="!$hasPermissions('B_dealerAccount_edit') && !$hasPermissions('B_dealerAccount_detail') && !$hasPermissions('B_dealerAccount_reset')">--</span>
+          </template>
+        </s-table>
+      </a-spin>
+      <!-- 新增/编辑 -->
+      <dealer-account-edit-modal
+        v-drag
+        :openModal="openModal"
+        :nowData="nowData"
+        :itemId="itemId"
+        @ok="$refs.table.refresh(true)"
+        @close="closeModal" />
+      <!-- 查看 -->
+      <dealer-account-detail-modal v-drag :openModal="openDetailModal" :itemId="itemId" @close="closeDetailModal" />
+    </a-card>
+  </div>
 </template>
 
 <script>
@@ -229,7 +233,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 235
+      this.tableHeight = window.innerHeight - tableSearchH - 265
     }
   },
   watch: {

+ 84 - 85
src/views/dealerManagement/dealerRelationshipBinding/list.vue

@@ -1,6 +1,6 @@
 <template>
-  <a-card size="small" :bordered="false" class="relationshipBindingList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
+  <div>
+    <a-card size="small" :bordered="false" class="relationshipBindingList-wrap searchBottomSpace">
       <!-- 搜索条件 -->
       <div class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="getList()">
@@ -17,74 +17,81 @@
           </a-row>
         </a-form>
       </div>
-      <!-- 列表 -->
-      <a-tabs type="card" @change="tabChange" v-model="tabInd" class="relationshipBindingList-tabs">
-        <a-tab-pane key="1" tab="省市级关系绑定"></a-tab-pane>
-        <a-tab-pane key="2" tab="特约店关系绑定"></a-tab-pane>
-      </a-tabs>
-      <a-table
-        class="sTable"
-        ref="table"
-        size="small"
-        :rowKey="(record) => record.dealerSn"
-        :columns="columns"
-        :pagination="false"
-        :data-source="list"
-        @expand="expand"
-        :expandedRowKeys="expandedRowKeys"
-        :expandRowByClick="true"
-        :loading="loading"
-        :scroll="{ y: tableHeight }">
-        <a-table
-          slot="expandedRowRender"
-          :rowKey="(record) => record.dealerSn"
-          :columns="innerColumns"
-          :data-source="innerData"
-          :pagination="false">
-          <!-- 操作 -->
-          <template slot="action" slot-scope="text, record">
-            <a-button
-              type="link"
-              v-if="$hasPermissions('B_dealerRelationshipBinding_unrelation')"
-              class="button-error"
-              size="small"
-              icon="close"
-              :id="'relationshipBindingList-delSubItem'+record.id"
-              @click.stop="handleDisassociate(record)">取消关联</a-button>
-            <span v-else>--</span>
-          </template>
-        </a-table>
-        <!-- 操作 -->
-        <template slot="action" slot-scope="text, record">
-          <a-button
-            type="link"
-            v-if="$hasPermissions('B_dealerRelationshipBinding_relation')"
-            class="button-info"
+    </a-card>
+    <!-- 列表 -->
+    <a-tabs @change="tabChange" v-model="tabInd" :tabBarStyle="{'background':'#fff'}">
+      <a-tab-pane key="1" tab="省市级关系绑定"></a-tab-pane>
+      <a-tab-pane key="2" tab="特约店关系绑定"></a-tab-pane>
+    </a-tabs>
+    <div class="mainContext">
+      <a-card size="small" :bordered="false">
+        <a-spin :spinning="spinning" tip="Loading...">
+          <a-table
+            class="sTable"
+            ref="table"
             size="small"
-            icon="plus"
-            :id="'relationshipBindingList-addSubItem'+record.id"
-            @click.stop="handleAssociate(record)">关联下级</a-button>
-          <span v-else>--</span>
-        </template>
-      </a-table>
-      <!-- 分页 -->
-      <tablePagination
-        ref="tablePagination"
-        :total="paginationProps.total"
-        :current="paginationProps.current"
-        :pageSize="paginationProps.pageSize"
-        @changePageSize="changePageSize"
-        @changePage="changePage" />
-    </a-spin>
-    <!-- 关联下级 -->
-    <associate-modal
-      v-drag
-      :openModal="openModal"
-      :nowData="nowData"
-      :tabInd="tabInd"
-      @ok="addItemOk"
-      @close="openModal=false" />
-  </a-card>
+            :rowKey="(record) => record.dealerSn"
+            :columns="columns"
+            :pagination="false"
+            :data-source="list"
+            @expand="expand"
+            :expandedRowKeys="expandedRowKeys"
+            :expandRowByClick="true"
+            :loading="loading"
+            :style="{'height':tableHeight+84.5+'px' }"
+            :scroll="{ y: tableHeight +30 }">
+            <a-table
+              slot="expandedRowRender"
+              :rowKey="(record) => record.dealerSn"
+              :columns="innerColumns"
+              :data-source="innerData"
+              :pagination="false">
+              <!-- 操作 -->
+              <template slot="action" slot-scope="text, record">
+                <a-button
+                  type="link"
+                  v-if="$hasPermissions('B_dealerRelationshipBinding_unrelation')"
+                  class="button-error"
+                  size="small"
+                  icon="close"
+                  :id="'relationshipBindingList-delSubItem'+record.id"
+                  @click.stop="handleDisassociate(record)">取消关联</a-button>
+                <span v-else>--</span>
+              </template>
+            </a-table>
+            <!-- 操作 -->
+            <template slot="action" slot-scope="text, record">
+              <a-button
+                type="link"
+                v-if="$hasPermissions('B_dealerRelationshipBinding_relation')"
+                class="button-info"
+                size="small"
+                icon="plus"
+                :id="'relationshipBindingList-addSubItem'+record.id"
+                @click.stop="handleAssociate(record)">关联下级</a-button>
+              <span v-else>--</span>
+            </template>
+          </a-table>
+          <!-- 分页 -->
+          <tablePagination
+            ref="tablePagination"
+            :total="paginationProps.total"
+            :current="paginationProps.current"
+            :pageSize="paginationProps.pageSize"
+            @changePageSize="changePageSize"
+            @changePage="changePage" />
+        </a-spin>
+        <!-- 关联下级 -->
+        <associate-modal
+          v-drag
+          :openModal="openModal"
+          :nowData="nowData"
+          :tabInd="tabInd"
+          @ok="addItemOk"
+          @close="openModal=false" />
+      </a-card>
+    </div>
+  </div>
 </template>
 I
 <script>
@@ -249,30 +256,30 @@ export default {
   },
   watch: {
     '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
-      this.tableHeight = window.innerHeight - 290
+      this.tableHeight = window.innerHeight - 360
     }
   },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
-      this.tableHeight = window.innerHeight - 290
+      this.tableHeight = window.innerHeight - 360
       this.resetSearchForm()
     }
   },
   activated () {
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
-      this.tableHeight = window.innerHeight - 290
+      this.tableHeight = window.innerHeight - 360
       this.resetSearchForm()
     }
     // 仅刷新列表,不重置页面
     if (this.$store.state.app.updateList) {
-      this.tableHeight = window.innerHeight - 290
+      this.tableHeight = window.innerHeight - 360
       this.resetSearchForm(true)
     }
   }
 }
 </script>
-<style lang="less">
+<style lang="less" scoped>
   .relationshipBindingList-wrap{
     position: relative;
     height: 100%;
@@ -281,16 +288,8 @@ export default {
       overflow-y: scroll;
       height: 100%;
     }
-    // tab样式
-    .relationshipBindingList-tabs.ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-nav-container{
-      height: 30px!important;
-    }
-    .relationshipBindingList-tabs.ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-tab-active{
-      height: 30px!important;
-    }
-    .relationshipBindingList-tabs.ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-tab{
-      line-height: 26px!important;
-      height: 30px!important;
-    }
+  }
+  .mainContext{
+    margin-top:-11px;
   }
 </style>

+ 3 - 3
src/views/dealerManagement/dealerZoneSearch/list.vue

@@ -15,12 +15,12 @@
                 <custList id="dealerZoneSearch-dealerName" placeholder="请输入经销商名称搜索" ref="indirectDealer" @change="dealerChange" />
               </a-form-item>
             </a-col>
-            <a-col :md="8" :sm="24">
+            <a-col :md="7" :sm="24">
               <a-form-item label="客服/区域负责人/销售总监">
                 <a-input id="dealerZoneSearch-dealerName" v-model.trim="queryParam.bizUserName" allowClear placeholder="请输入客服/区域负责人/销售总监"/>
               </a-form-item>
             </a-col>
-            <a-col :md="24" :sm="24" style="margin-top: 10px;text-align:center;">
+            <a-col :md="5" :sm="24">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="dealerZoneSearch-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="dealerZoneSearch-reset">重置</a-button>
               <a-button
@@ -178,7 +178,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 235
+      this.tableHeight = window.innerHeight - tableSearchH - 220
     }
   },
   watch: {

+ 56 - 52
src/views/dealerManagement/merchantInfoManagement/list.vue

@@ -1,6 +1,6 @@
 <template>
-  <a-card size="small" :bordered="false" class="merchantInfoManagementList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
+  <div>
+    <a-card size="small" :bordered="false" class="merchantInfoManagementList-wrap searchBottomSpace">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -52,51 +52,55 @@
           </a-row>
         </a-form>
       </div>
-      <!-- 操作按钮 -->
-      <div class="table-operator">
-        <a-button id="merchantInfoManagementList-add" type="primary" v-if="$hasPermissions('B_merchantInfo_add')" class="button-error" @click="handleAdd">新增</a-button>
-      </div>
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
-        size="small"
-        :rowKey="(record) => record.id"
-        :columns="columns"
-        :data="loadData"
-        :scroll="{ y: tableHeight }"
-        :defaultLoadData="false"
-        bordered>
-        <!-- 经销商 -->
-        <template slot="dealerName" slot-scope="text, record">
-          <span v-if="$hasPermissions('B_merchantInfo_detail')" style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.dealerName }}</span>
-          <span v-else>{{ record.dealerName }}</span>
-        </template>
-        <!-- 操作 -->
-        <template slot="action" slot-scope="text, record">
-          <a-button size="small" type="link" class="button-warning" v-if="record.auditState == 'WAIT' && $hasPermissions('B_merchantInfo_audit')" @click="handleAudit(record)" >审核</a-button>
-          <a-button size="small" type="link" class="button-info" v-if="$hasPermissions('B_merchantInfo_cooperation')" @click="handleCooperation(record)" >合作设置</a-button>
-          <a-button size="small" type="link" class="button-error" v-if="record.auditState != 'WAIT' && $hasPermissions('B_merchantInfo_distribution')" @click="handleDistribution(record)">经销权</a-button>
-          <a-button size="small" type="link" class="button-primary" v-if="$hasPermissions('B_merchantInfo_level')" @click="handleLevel(record)">级别设置</a-button>
-          <a-button size="small" type="link" class="button-info" v-if="$hasPermissions('B_merchantInfo_edit')" @click="handleEdit(record)">编辑</a-button>
-          <span v-if="!(record.auditState == 'WAIT' && $hasPermissions('B_merchantInfo_audit')) && !$hasPermissions('B_merchantInfo_cooperation') && !(record.auditState != 'WAIT' && $hasPermissions('B_merchantInfo_distribution')) && !$hasPermissions('B_merchantInfo_level') && !$hasPermissions('B_merchantInfo_edit')">--</span>
-        </template>
-      </s-table>
-    </a-spin>
-    <!-- 产品详情 -->
-    <merchant-info-management-detail-modal
-      v-drag
-      :openModal="openModal"
-      :isAudit="isAudit"
-      :itemId="itemId"
-      @ok="resetForm"
-      @close="closeModal" />
-    <!-- 合作设置 -->
-    <UpdateCooperate ref="updateCooperate" v-drag :openUcModal="openUcModal" @ok="resetForm" @close="openUcModal=false"></UpdateCooperate>
-    <!-- 级别设置 -->
-    <UpdateDealerLeve ref="updateDealerLevel" v-drag :openUdModal="openUdModal" @ok="resetForm" @close="openUdModal=false"></UpdateDealerLeve>
-  </a-card>
+    </a-card>
+    <a-card size="small" :bordered="false">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <!-- 操作按钮 -->
+        <div class="table-operator">
+          <a-button id="merchantInfoManagementList-add" type="primary" v-if="$hasPermissions('B_merchantInfo_add')" class="button-error" @click="handleAdd">新增</a-button>
+        </div>
+        <!-- 列表 -->
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+84.5+'px' }"
+          size="small"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :data="loadData"
+          :scroll="{ y: tableHeight }"
+          :defaultLoadData="false"
+          bordered>
+          <!-- 经销商 -->
+          <template slot="dealerName" slot-scope="text, record">
+            <span v-if="$hasPermissions('B_merchantInfo_detail')" style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.dealerName }}</span>
+            <span v-else>{{ record.dealerName }}</span>
+          </template>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record">
+            <a-button size="small" type="link" class="button-warning" v-if="record.auditState == 'WAIT' && $hasPermissions('B_merchantInfo_audit')" @click="handleAudit(record)" >审核</a-button>
+            <a-button size="small" type="link" class="button-info" v-if="$hasPermissions('B_merchantInfo_cooperation')" @click="handleCooperation(record)" >合作设置</a-button>
+            <a-button size="small" type="link" class="button-error" v-if="record.auditState != 'WAIT' && $hasPermissions('B_merchantInfo_distribution')" @click="handleDistribution(record)">经销权</a-button>
+            <a-button size="small" type="link" class="button-primary" v-if="$hasPermissions('B_merchantInfo_level')" @click="handleLevel(record)">级别设置</a-button>
+            <a-button size="small" type="link" class="button-info" v-if="$hasPermissions('B_merchantInfo_edit')" @click="handleEdit(record)">编辑</a-button>
+            <span v-if="!(record.auditState == 'WAIT' && $hasPermissions('B_merchantInfo_audit')) && !$hasPermissions('B_merchantInfo_cooperation') && !(record.auditState != 'WAIT' && $hasPermissions('B_merchantInfo_distribution')) && !$hasPermissions('B_merchantInfo_level') && !$hasPermissions('B_merchantInfo_edit')">--</span>
+          </template>
+        </s-table>
+      </a-spin>
+      <!-- 产品详情 -->
+      <merchant-info-management-detail-modal
+        v-drag
+        :openModal="openModal"
+        :isAudit="isAudit"
+        :itemId="itemId"
+        @ok="resetForm"
+        @close="closeModal" />
+      <!-- 合作设置 -->
+      <UpdateCooperate ref="updateCooperate" v-drag :openUcModal="openUcModal" @ok="resetForm" @close="openUcModal=false"></UpdateCooperate>
+      <!-- 级别设置 -->
+      <UpdateDealerLeve ref="updateDealerLevel" v-drag :openUdModal="openUdModal" @ok="resetForm" @close="openUdModal=false"></UpdateDealerLeve>
+    </a-card>
+  </div>
 </template>
 
 <script>
@@ -120,9 +124,9 @@ export default {
       queryParam: { //  查询条件
         nameLike: '', //  商户名称、别名
         dealerType: undefined, //  商户类型
-        subareaArea:{
+        subareaArea: {
           subareaSn: undefined, //  区域
-          subareaAreaSn: undefined, // 分区
+          subareaAreaSn: undefined // 分区
         },
         auditState: undefined, // 审核状态
         cooperateFlag: undefined //  合作状态
@@ -176,7 +180,7 @@ export default {
     }
   },
   methods: {
-    subareaChange(val){
+    subareaChange (val) {
       this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
       this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
     },
@@ -185,7 +189,7 @@ export default {
       this.queryParam = {
         nameLike: '', //  商户名称、别名
         dealerType: undefined, //  商户类型
-        subareaArea:{
+        subareaArea: {
           subareaSn: undefined,
           subareaAreaSn: undefined
         },
@@ -286,7 +290,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 238
+      this.tableHeight = window.innerHeight - tableSearchH - 260
     }
   },
   watch: {

+ 68 - 64
src/views/dealerManagement/rebateSettings/list.vue

@@ -1,6 +1,6 @@
 <template>
-  <a-card size="small" :bordered="false" class="rebateSettingsList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
+  <div>
+    <a-card size="small" :bordered="false" class="rebateSettingsList-wrap searchBottomSpace">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -27,65 +27,69 @@
           </a-row>
         </a-form>
       </div>
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
-        size="small"
-        :rowKey="(record) => record.no"
-        rowKeyName="no"
-        :columns="columns"
-        :data="loadData"
-        :scroll="{ y: tableHeight }"
-        :defaultLoadData="false"
-        bordered>
-        <!-- 操作 -->
-        <template slot="action" slot-scope="text, record">
-          <a-button
-            size="small"
-            type="link"
-            v-if="$hasPermissions('B_rebateSettings_edit')"
-            class="button-info"
-            @click="handleEdit(record)"
-            id="rebateSettingsList-edit-btn">编辑</a-button>
-          <span v-else>--</span>
-        </template>
-        <!-- 经销商名称 -->
-        <template slot="jxs" slot-scope="text, record">
-          <span v-if="record.subDealer">{{ record.subDealer.dealerName }}</span>
-          <span v-else>--</span>
-        </template>
-        <!-- 经销商级别 -->
-        <template slot="dealerLevel" slot-scope="text, record">
-          <span v-if="record.subDealer">{{ record.subDealer.provinceName }} > {{ record.subDealer.dealerLevelDictValue }}</span>
-          <span v-else>--</span>
-        </template>
-        <!-- 差价归属 -->
-        <template slot="cjgs" slot-scope="text, record">
-          <span v-if="record.rebateDealer">{{ record.rebateDealer.dealerName }}</span>
-          <span v-else>--</span>
-        </template>
-        <!-- 归属经销商级别 -->
-        <template slot="gsjxsjb" slot-scope="text, record">
-          <span v-if="record.rebateDealer">{{ record.rebateDealer.provinceName }} > {{ record.rebateDealer.dealerLevelDictValue }}</span>
-          <span v-else>--</span>
-        </template>
-         <!-- 上级差价归属 -->
-         <template slot="sjcjgs" slot-scope="text, record">
-          <span v-if="record.supDealer">{{ record.supDealer.dealerName }}</span>
-          <span v-else>--</span>
-        </template>
-        <!-- 上级归属经销商级别 -->
-        <template slot="sjgsjxsjb" slot-scope="text, record">
-          <span v-if="record.supDealer">{{ record.supDealer.provinceName }} > {{ record.supDealer.dealerLevelDictValue }}</span>
-          <span v-else>--</span>
-        </template>
-      </s-table>
-    </a-spin>
-    <!-- 关联下级 -->
-    <associate-modal v-drag :openModal="openModal" :nowData="nowData" @ok="$refs.table.refresh(true)" @close="closeModal" />
-  </a-card>
+    </a-card>
+    <a-card size="small" :bordered="false">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <!-- 列表 -->
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+84.5+'px' }"
+          size="small"
+          :rowKey="(record) => record.no"
+          rowKeyName="no"
+          :columns="columns"
+          :data="loadData"
+          :scroll="{ y: tableHeight }"
+          :defaultLoadData="false"
+          bordered>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record">
+            <a-button
+              size="small"
+              type="link"
+              v-if="$hasPermissions('B_rebateSettings_edit')"
+              class="button-info"
+              @click="handleEdit(record)"
+              id="rebateSettingsList-edit-btn">编辑</a-button>
+            <span v-else>--</span>
+          </template>
+          <!-- 经销商名称 -->
+          <template slot="jxs" slot-scope="text, record">
+            <span v-if="record.subDealer">{{ record.subDealer.dealerName }}</span>
+            <span v-else>--</span>
+          </template>
+          <!-- 经销商级别 -->
+          <template slot="dealerLevel" slot-scope="text, record">
+            <span v-if="record.subDealer">{{ record.subDealer.provinceName }} > {{ record.subDealer.dealerLevelDictValue }}</span>
+            <span v-else>--</span>
+          </template>
+          <!-- 差价归属 -->
+          <template slot="cjgs" slot-scope="text, record">
+            <span v-if="record.rebateDealer">{{ record.rebateDealer.dealerName }}</span>
+            <span v-else>--</span>
+          </template>
+          <!-- 归属经销商级别 -->
+          <template slot="gsjxsjb" slot-scope="text, record">
+            <span v-if="record.rebateDealer">{{ record.rebateDealer.provinceName }} > {{ record.rebateDealer.dealerLevelDictValue }}</span>
+            <span v-else>--</span>
+          </template>
+          <!-- 上级差价归属 -->
+          <template slot="sjcjgs" slot-scope="text, record">
+            <span v-if="record.supDealer">{{ record.supDealer.dealerName }}</span>
+            <span v-else>--</span>
+          </template>
+          <!-- 上级归属经销商级别 -->
+          <template slot="sjgsjxsjb" slot-scope="text, record">
+            <span v-if="record.supDealer">{{ record.supDealer.provinceName }} > {{ record.supDealer.dealerLevelDictValue }}</span>
+            <span v-else>--</span>
+          </template>
+        </s-table>
+      </a-spin>
+      <!-- 关联下级 -->
+      <associate-modal v-drag :openModal="openModal" :nowData="nowData" @ok="$refs.table.refresh(true)" @close="closeModal" />
+    </a-card>
+  </div>
 </template>
 
 <script>
@@ -107,8 +111,8 @@ export default {
       },
       queryParam: {
         dealerName: '',
-        supDealerName:'',
-        rebateDealerName:''
+        supDealerName: '',
+        rebateDealerName: ''
       },
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
@@ -169,7 +173,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 195
+      this.tableHeight = window.innerHeight - tableSearchH - 225
     }
   },
   watch: {