From 5d43370b99a03391c9271d04d3f351f0fd734dae Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Thu, 18 Mar 2021 20:23:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-update.html | 183 ++++++++++++++++++++++++++++-----------------
1 files changed, 113 insertions(+), 70 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-update.html b/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-update.html
index 4fe4e60..7611622 100644
--- a/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-update.html
+++ b/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-update.html
@@ -31,43 +31,57 @@
}
.el-aside {
color: #333;
- line-height: 50px;
+ line-height: 15px;
}
.el-main {
color: #333;
- line-height: 50px;
+ line-height: 15px;
+ }
+ .box-card {
+ width: 160px;
+ border-radius: 5px;
+ color: #ffffff;
+ padding: 5px 5px;
+ margin-right: 20px;
+ cursor: pointer;
+ float: right;
+ }
+ .el-card__body {
+ padding: 0px;
}
</style>
</head>
<body>
<div class="ibox-content" id="app" v-cloak>
- <el-row>
- <p class="el-big-title">个人详情</p>
- </el-row>
<el-container>
- <el-aside width="200px" style="display:flex;align-items: center;">
- <el-avatar :size="100" :src="basicdetail.avatarUrl" style="display:flex;align-items: center;margin-left: 50px"></el-avatar>
+ <el-aside width="60px" style="display:flex;align-items: center;">
+ <el-avatar :size="50" :src="basicdetail.avatarUrl" style="display:flex;align-items: center;margin-left: 10px"></el-avatar>
</el-aside>
<el-main>
- <el-row style="display:flex;align-items: center;">
- <el-col :span="3" style="display:flex;align-items: center;">
+ <el-row style="display:flex;align-items: center;padding: 10px;">
+ <el-col :span="8" style="display:flex;align-items: center;">
<span style="font-size: 20px;">{{basicdetail.nickname}} </span>
</el-col>
- <el-col :span="3">
-
+ <el-col :span="6">
<el-select v-model="basicdetail.grade" @focus="getDatalist()" @change="changeSaleManGrade(basicdetail.grade)" placeholder="请选择" filterable allow-create>
<el-option v-for="item in salemanGradeList " :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-col>
- <el-col :span="18">
+ <el-col :span="10">
</el-col>
</el-row>
- <el-row style="display:flex;">
+ <el-row style="display:flex;padding: 5px;">
<el-col>
<span>
手机号码:{{basicdetail.phone}} |
- 加入时间:{{basicdetail.createTime}} |
+ 加入时间:{{basicdetail.createTime}}
+ </span>
+ </el-col>
+ </el-row>
+ <el-row style="display:flex;padding: 5px;">
+ <el-col>
+ <span>
邀请人:{{basicdetail.parentUser}} |
来源:
<span v-if="basicdetail.applyWay == 1">自主申请</span>
@@ -82,38 +96,33 @@
</el-col>
</el-row>
</el-main>
+ <el-main>
+ <el-row>
+ <el-row style="display:flex;align-items: center;text-align: center;">
+ <el-card class="box-card" style="background-color: #0f9aef;">
+ <div style="padding:10px;font-size: 20px;">{{basicdetail.lowerLevelNum}}人</div>
+ <div>绑定客户</div>
+ </el-card >
+ <el-card class="box-card" style="background: #67C23A;">
+ <div style="padding:10px;font-size: 20px;">{{basicdetail.invitedNum}}人</div>
+ <div>邀请下级</div>
+ </el-card >
+ <el-card class="box-card" style="background: rgb(121, 187, 255);">
+ <div style="padding:10px;font-size: 20px;">{{basicdetail.totalRevenue}}元</div>
+ <div>累计收益</div>
+ </el-card >
+ <el-card class="box-card" style="background: rgb(93 191 45);">
+ <div style="padding:10px;font-size: 20px;">{{basicdetail.balance}}元</div>
+ <div>待结算</div>
+ </el-card >
+ </el-row>
+ </el-row>
+ </el-main>
</el-container>
- <el-row style="padding: 30px;">
- <el-row :gutter="100">
- <el-col class="line" :span="6" style="text-align: center">
- <el-card class="box-card" style="background-color: #eee;border-radius: 30px;">
- <div>绑定客户</div>
- <div style="padding: 5px;font-size: 18px;">{{basicdetail.lowerLevelNum}}人</div>
- </el-card >
- </el-col>
- <el-col class="line" :span="6" style="text-align: center">
- <el-card class="box-card" style="background-color: #eee;border-radius: 30px;">
- <div>邀请下级</div>
- <div style="padding: 5px;font-size: 18px;">{{basicdetail.invitedNum}}人</div>
- </el-card >
- </el-col>
- <el-col class="line" :span="6" style="text-align: center">
- <el-card class="box-card" style="background-color: #eee;border-radius: 30px;">
- <div>累计收益</div>
- <div style="padding: 5px;font-size: 18px;">{{basicdetail.totalRevenue}}元</div>
- </el-card >
- </el-col>
- <el-col class="line" :span="6" style="text-align: center">
- <el-card class="box-card" style="background-color: #eee;border-radius: 30px;">
- <div>待结算</div>
- <div style="padding: 5px;font-size: 18px;">{{basicdetail.balance}}元</div>
- </el-card >
- </el-col>
- </el-row>
- </el-row>
+
<el-row>
<el-tabs v-model="activeName" >
- <el-tab-pane label="分销员管理" name="first">
+ <el-tab-pane label="绑定客户" name="first">
<el-row style="display:flex;align-items: center;text-align: right;">
<el-col>
<el-form ref="form" :model="form" inline >
@@ -132,24 +141,17 @@
type="selection">
</el-table-column>
<el-table-column
- label="客户">
+ label="客户"
+ show-overflow-tooltip>
<template slot-scope="scope">
<img :src="scope.row.avatarUrl" width="40" height="40" class="head_pic"/>
- {{scope.row.nickName}}
+ {{scope.row.nickname}}
</template>
</el-table-column>
<el-table-column
prop="createTime"
- label="绑定时间">
- </el-table-column>
- <el-table-column
- label="绑定方式">
- <template slot-scope="scope">
- <span v-if="scope.row.applyWay == 1">自主申请</span>
- <span v-if="scope.row.applyWay == 2">自动添加</span>
- <span v-if="scope.row.applyWay == 3">上级邀请</span>
- <span v-if="scope.row.applyWay == 4">手动添加</span>
- </template>
+ label="绑定时间"
+ show-overflow-tooltip>
</el-table-column>
<el-table-column
label="客户状态">
@@ -161,7 +163,7 @@
<el-table-column label="操作" width="240">
<template slot-scope="scope">
<el-row style="display:flex;">
- <el-button type="primary" size="mini" @click="openExaminesaleMan(scope.row)">解绑</el-button>
+ <el-button type="primary" size="mini" @click="openExamineSaleMan(scope.row)">解绑</el-button>
</el-row>
</template>
</el-table-column>
@@ -202,7 +204,7 @@
label="客户">
<template slot-scope="scope">
<img :src="scope.row.avatarUrl" width="40" height="40" class="head_pic"/>
- {{scope.row.nickName}}
+ {{scope.row.nickname}}
</template>
</el-table-column>
<el-table-column
@@ -221,7 +223,7 @@
<el-table-column label="操作" width="240">
<template slot-scope="scope">
<el-row style="display:flex;">
- <el-button type="primary" size="mini" @click="openExaminesaleMan(scope.row)">解绑</el-button>
+ <el-button type="primary" size="mini" @click="openExamineSaleMan(scope.row)">解绑</el-button>
</el-row>
</template>
</el-table-column>
@@ -267,18 +269,35 @@
<el-table id="proj" :data="orderLevelList.rows" :height="height" stripe:true @sort-change="sortChange">
<el-table-column
prop="orderNo"
- label="订单编号">
+ label="订单编号"
+ show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="orderMoney"
label="实付金额">
</el-table-column>
<el-table-column
- prop="storeName"
- label="下单门店">
+ label="订单状态">
+ <template slot-scope="scope">
+ <span v-if="scope.row.orderState == 1">待付款</span>
+ <span v-if="scope.row.orderState == 2">待配送</span>
+ <span v-if="scope.row.orderState == 3">待收货</span>
+ <span v-if="scope.row.orderState == 4">待评价</span>
+ <span v-if="scope.row.orderState == 5">已评价</span>
+ <span v-if="scope.row.orderState == 6">申请退款</span>
+ <span v-if="scope.row.orderState == 7">退款成功</span>
+ <span v-if="scope.row.orderState == 8">退款拒绝</span>
+ <span v-if="scope.row.orderState == 9">已取消</span>
+ </template>
</el-table-column>
<el-table-column
- label="客户">
+ prop="storeName"
+ label="下单门店"
+ show-overflow-tooltip>
+ </el-table-column>
+ <el-table-column
+ label="客户"
+ show-overflow-tooltip>
<template slot-scope="scope">
<img :src="scope.row.avatarUrl" width="40" height="40" class="head_pic"/>
{{scope.row.nickName}}
@@ -286,7 +305,8 @@
</el-table-column>
<el-table-column
prop="createTime"
- label="时间">
+ label="时间"
+ show-overflow-tooltip>
</el-table-column>
<el-table-column
label="收益类型">
@@ -390,7 +410,7 @@
pageSize:10,
currentPage:1,
},
- height:'calc(100vh - 240px)',
+ height:'calc(100vh - 400px)',
},
created: function () {
@@ -402,6 +422,7 @@
//加载分类
loadInfo() {
let _this = this;
+ _this.loadParamSettingBasic();
_this.loadParamSetting();
_this.loadParamSettinglow();
_this.loadParamSettingOrder();
@@ -424,6 +445,22 @@
}
});
},
+ //加载基本数据信息
+ loadParamSettingBasic() {
+ let _this = this;
+ let data={
+ userId:userId,
+ applyId:applyId,
+ };
+ AjaxProxy.requst({
+ app: _this,
+ data:data,
+ url: basePath + '/fenXiao/fenXiaoUser/loadParamSettingBasic',
+ callback: function (data) {
+ _this.basicdetail = data.mapInfo.basicdetail;
+ }
+ });
+ },
//绑定客户
loadParamSetting() {
let _this = this;
@@ -433,11 +470,11 @@
AjaxProxy.requst({
app: _this,
data:data,
- url: basePath + '/fenXiao/fenXiaoUser/findShopSalesmanDetail',
+ url: basePath + '/fenXiao/fenXiaoUser/loadParamSetting',
callback: function (data) {
- _this.basicdetail = data.mapInfo.basicdetail;
_this.fxyList.rows = data.mapInfo.customDetailRecords;
_this.fxyList.total = data.mapInfo.customDetailTotal;
+ _this.loadParamSettingBasic();
}
});
},
@@ -478,11 +515,11 @@
AjaxProxy.requst({
app: _this,
data:data,
- url: basePath + '/fenXiao/fenXiaoUser/findShopSalesmanDetail',
+ url: basePath + '/fenXiao/fenXiaoUser/loadParamSettinglow',
callback: function (data) {
- _this.basicdetail = data.mapInfo.basicdetail;
_this.lowLevelList.rows = data.mapInfo.customLowRecords;
_this.lowLevelList.total = data.mapInfo.customLowTotal;
+ _this.loadParamSettingBasic();
}
});
},
@@ -524,10 +561,11 @@
AjaxProxy.requst({
app: _this,
data:data,
- url: basePath + '/fenXiao/fenXiaoUser/findShopSalesmanDetail',
+ url: basePath + '/fenXiao/fenXiaoUser/loadParamSettingOrder',
callback: function (data) {
_this.orderLevelList.rows = data.mapInfo.orderRecords;
_this.orderLevelList.total = data.mapInfo.orderTotal;
+ _this.loadParamSettingBasic();
}
});
},
@@ -617,7 +655,12 @@
url: basePath + '/fenXiao/fenXiaoUser/unbundlingSaleMan',
callback: function (data) {
_this.$message.success(data.info);
- this.loadInfo();
+ if(_this.activeName == "first"){
+ _this.loadParamSetting();
+ }
+ if(_this.activeName == "second"){
+ _this.loadParamSettinglow();
+ }
}
});
},
--
Gitblit v1.9.1