lilei 2 سال پیش
والد
کامیت
80210d60ad

+ 3 - 1
src/components/Table/index.js

@@ -27,6 +27,9 @@ export default {
       type: [String, Function],
       default: ''
     },
+    pagination:{
+      type: Object
+    },
     data: {
       type: Function,
       required: true
@@ -124,7 +127,6 @@ export default {
     this.localPagination = ['auto', true].includes(this.showPagination) && Object.assign({}, this.localPagination, {
       current: localPageNum,
       pageSize: this.pageSize,
-      pageSizeOptions: ['5', '10', '20', '30', '40'],
       showTotal: total => `共 ${total} 条记录`,
       showSizeChanger: this.showSizeChanger
     }) || false

+ 2 - 0
src/views/allocationManagement/transferOut/edit.vue

@@ -229,6 +229,8 @@
               @rowSelection="rowSelectionFun"
               :columns="chooseColumns"
               :data="chooseLoadData"
+              :pagination="{pageSizeOptions: ['20','50','100','200','500']}"
+              :pageSize="500"
               :scroll="{ y: 300 }"
               bordered>
               <!-- 售价 -->

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

@@ -223,7 +223,7 @@ export default {
     },
     // 经销权
     handleDistribution (row) {
-      this.$router.push({ name: `merchantInfoManagementSet`, params: { sn: row.dealerSn } })
+      this.$router.push({ name: `merchantInfoManagementSet`, params: { sn: row.dealerSn, name: row.dealerName } })
     },
     // 审核
     handleAudit (row) {

+ 1 - 0
src/views/dealerManagement/merchantInfoManagement/permissionSetting.vue

@@ -5,6 +5,7 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="permissionSetting-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+          <span style="margin-left: 20px;color: #666;">经销商:{{ $route.params.name }}</span>
         </template>
       </a-page-header>
       <a-card size="small" :bordered="false" class="permissionSetting-main">