From baa79615425b71521e67ec8a9344b88ce53fc5de Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Fri, 12 Mar 2021 13:47:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-user.html | 62 +++++++++++++++++++++++-------
1 files changed, 47 insertions(+), 15 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-user.html b/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-user.html
index cd94f2b..ba2d9d7 100644
--- a/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-user.html
+++ b/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-user.html
@@ -22,6 +22,14 @@
</script>
<script type="text/javascript" charset="utf-8"
th:src="@{/plugin/beditor/lang/zh-cn/zh-cn.js}"></script>
+ <style>
+ .paginationStyle{
+ background: #ffffff;
+ padding: 10px 10px;
+ margin: 0px 0px 10px 0px;
+ text-align: right;
+ }
+ </style>
</head>
<body>
@@ -31,7 +39,7 @@
<el-tab-pane label="分销员管理" name="first">
<el-row style="display:flex;align-items: center;">
<el-col>
- <el-button type="primary" @click="submits()">新增分销员</el-button>
+ <el-button type="primary" @click="addSaleMan()">新增分销员</el-button>
</el-col>
<el-col>
<el-form ref="form" :model="form" inline >
@@ -51,21 +59,16 @@
</el-form>
</el-col>
</el-row>
+ <el-row>
<template>
<el-table id="proj" :data="fxyList.rows" :height="height" stripe @sort-change="sortChange">
- <el-table
- ref="multipleTable"
- :data="fxy"
- tooltip-effect="dark"
- style="width: 100%"
- @selection-change="handleSelectionChange">
<el-table-column
type="selection"
width="55">
</el-table-column>
<el-table-column
- prop="nickname"
- label="分销员姓名"
+ prop="userId"
+ label="id"
width="180">
</el-table-column>
<el-table-column
@@ -79,6 +82,18 @@
</el-table-column>
</el-table>
</template>
+ </el-row>
+ <el-row class="paginationStyle" >
+ <el-pagination background
+ @size-change="changePageSize"
+ @current-change="changeCurrentPage"
+ :current-page="fxyList.currentPage"
+ :page-sizes="[10, 20, 30, 50]"
+ :page-size="fxyList.pageSize"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="fxyList.total">
+ </el-pagination>
+ </el-row>
</el-tab-pane>
<el-tab-pane label="分佣方案" name="second">
<template>
@@ -165,7 +180,6 @@
<script>
//百度编辑器
MUI.initImgUpload(".upload-input");
-
var ue = {};
var app = new Vue({
el: '#app',
@@ -189,9 +203,9 @@
//条件查询审核状态
shenheStateList:[
{value:'',label:'全部'},
- {value:'1',label:'已审核'},
- {value:'2',label:'未审核'},
- {value:'3',label:'未通过'}
+ {value:1,label:'未审核'},
+ {value:2,label:'通过'},
+ {value:3,label:'未通过'}
],
fxyList:{
rows:[],
@@ -239,8 +253,8 @@
loadParamSetting() {
let _this = this;
let data=_this.getRequestParam();
- data.limit=_this.fxyList.pageSize;
- data.offset=_this.fxyList.pageSize
+ data.pageSize=_this.fxyList.pageSize;
+ data.pageNum=_this.fxyList.currentPage;
AjaxProxy.requst({
app: _this,
data:data,
@@ -282,6 +296,24 @@
this.loadInfo();
}
},
+ changePageSize(val) {
+ this.table.pageSize = val;
+ this.loadData();
+ },
+ changeCurrentPage(val) {
+ this.table.currentPage = val;
+ this.loadData();
+ },
+ //新增分销员页面
+ addSaleMan(){
+ layer.full(layer.open({
+ type: 2,
+ title: "选择会员",
+ maxmin: true,
+ area: [MUI.SIZE_L, '500px'],
+ content : [ basePath + '/admin/redirect/fenxiao/fenxiao-apply']
+ }));
+ },
submit() {
}
--
Gitblit v1.9.1