Skip to content

S
SuperMan
Commit c8b70cea authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

update

parent d62f589c
Show whitespace changes
Inline Side-by-side
Showing with 510 additions and 63 deletions
src/components/FinancialModule/Sheepcommission.vue
View file @ c8b70cea
...@@ -83,7 +83,8 @@ export default { ...@@ -83,7 +83,8 @@ export default {
this.$router.push({ this.$router.push({
name: "commissionSubsidiary", name: "commissionSubsidiary",
query: { query: {
UserId: item.UserId UserId: item.UserId,
blank:'y'
} }
}) })
}, },
......
src/components/FinancialModule/commissionSubsidiary.vue
View file @ c8b70cea
...@@ -15,58 +15,107 @@ ...@@ -15,58 +15,107 @@
<el-input type="text" v-model="msg.OrderNo" :placeholder="$t('pub.pleaseImport')"></el-input> <el-input type="text" v-model="msg.OrderNo" :placeholder="$t('pub.pleaseImport')"></el-input>
</span> </span>
</li> </li>
<li>
<span>
<em>状态</em>
<el-select v-model="msg.CommissionState" filterable clearable>
<el-option label="不限" :value="0"></el-option>
<el-option label="待结算" :value="1"></el-option>
<el-option label="已返佣" :value="2"></el-option>
</el-select>
</span>
</li>
<li> <li>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()" /> <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()" />
</li> </li>
</ul> </ul>
</div> </div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading"> <div style="background:#fff;font-size:14px;padding:20px">
<tr> <div class="app-order-title">
<th width="200">订单ID/订单号</th> <div style="width: 50%;">商品信息</div>
<th>等级描述</th> <div style="width: 20%;">等级描述</div>
<th width="100">姓名/手机号</th> <div style="width: 15%;">佣金</div>
<th>佣金</th> <div style="width: 15%;">状态</div>
<th>状态</th> <div style="width: 15%;">备注</div>
<th>类型</th> </div>
<th width="400">商品名称</th> <div v-loading="loading" class="app-order-list">
<th>规格列表</th> <el-card style="margin-top:20px" v-for="(item,index) in tableData" :key="index" class="app-order-item" shadow="never">
<th>货号</th> <div slot="header" class="clearfix">
<th>最终价格</th> <div flex="cross:center" class="app-order-head">
<th>数量</th> <div class="app-order-time">{{item.CreateDate}}</div>
<th>备注</th> <div class="app-order-user">
</tr> <span class="app-order-time">订单号：</span>{{item.OrderNo}}
<template v-for="item in dataList"> </div>
<tr v-for="(list,i) in item.DetailList"> <div style="margin:0 15px" class="app-order-user">
<td v-if="i==0" :rowspan="item.DetailList.length"> <span class="app-order-time">用户名：</span>{{item.UserName}}
{{item.OrderId}} </div>
<p>{{item.OrderNo}}</p> <div class="app-order-user">
</td> <span class="app-order-time">手机号：</span>{{item.Mobile}}
<td v-if="i==0" :rowspan="item.DetailList.length">{{item.GradeDescription}}</td> </div>
<td v-if="i==0" :rowspan="item.DetailList.length"> </div>
{{item.UserName}} </div>
<p>{{item.Mobile}}</p> <div class="app-order-body">
</td> <div class="goods-item" style="width: 50%;">
<td v-if="i==0" :rowspan="item.DetailList.length">{{item.Commission}}</td> <div v-for="(list,index2) in item.DetailList" :key="index2" class="goods">
<td v-if="i==0" :rowspan="item.DetailList.length"> <img :src="list.CoverImagePath" class="goods-image">
<div flex="dir:left">
<div class="goods-info">
<div class="goods-name">
<div class="app-ellipsis">
<div class="vue-line-clamp" style="word-break: break-all; -webkit-line-clamp: 2;">
<span class="el-tag el-tag--warning el-tag--mini el-tag--light is-hit" style="margin-right: 5px;">
{{list.OrderTypeName}}
</span>
{{list.GoodsName}}
</div>
</div>
</div>
<div style="margin-bottom: 24px;">
<span style="margin-right: 10px;">
规格：
<el-tag v-for="(item2,index2) in list.SpecificationList" :key="index2" style="top: 5px;position: relative;margin-right: 5px; max-width: 300px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis;" size="mini">
{{item2}}
</el-tag>
</span>
</div>
<div class="app-order-goods-price">
<span>货号：{{list.ProductCode}}</span>
</div>
</div>
<div flex="dir:left box:mean" style="width: 250px;">
<div flex="cross:center main:center">
<span>小计：￥{{list.Final_Price}}
</span>
</div>
<div flex="cross:center main:center">数量：x {{list.Number}}</div>
</div>
</div>
</div>
</div>
<div flex="cross:center" class="app-order-info" style="width: 20%;">
<div flex="dir:top">
{{item.GradeDescription}}
</div>
</div>
<div flex="main:center cross:center" class="app-box-info" style="width: 15%;border-right: 1px solid #EBEEF5;">
<div>{{item.Commission}}</div>
</div>
<div flex="main:center cross:center" class="app-order-info" style="border-right: 1px solid #EBEEF5; width: 15%;">
<span v-if="item.CommissionState==1">待返佣</span> <span v-if="item.CommissionState==1">待返佣</span>
<span v-if="item.CommissionState==2">已返佣</span> <span v-if="item.CommissionState==2">已返佣</span>
</td> </div>
<td>{{list.OrderTypeName}}</td> <div flex="main:center cross:center" class="app-order-info" style="border-right: 0px; width: 15%;">
<td>{{list.GoodsName}}</td> {{item.Remark}}
<td> </div>
<span v-for="(spec,index2) in list.SpecificationList" :key="index2">{{spec}}</span> </div>
</td> </el-card>
<td>{{list.ProductCode}}</td> <el-card v-if="tableData.length==0" class="app-order-item" shadow="never">
<td>{{list.Final_Price}}</td> <div style="height:100px;line-height:100px;text-align:center">
<td>{{list.Number}}</td> 暂无信息
<td v-if="i==0" :rowspan="item.DetailList.length">{{item.Remark}}</td> </div>
</tr> </el-card>
</template> </div>
</div>
<tr v-if="dataList.length==0">
<td colspan="15" align="center">暂无数据</td>
</tr>
</table>
<el-pagination background @current-change="handleCurrentChange" <el-pagination background @current-change="handleCurrentChange"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total='total'> layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total='total'>
</el-pagination> </el-pagination>
...@@ -84,17 +133,18 @@ export default { ...@@ -84,17 +133,18 @@ export default {
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 10, pageSize: 10,
UserId:'', UserId: "",
OrderId:'', OrderId: "",
OrderNo:'', OrderNo: "",
CommissionState:0,
}, },
dataList: [], tableData: [],
loading: false loading: false
}; };
}, },
created() { created() {
if(this.$route.query.UserId){ if (this.$route.query.UserId) {
this.msg.UserId=this.$route.query.UserId; this.msg.UserId = this.$route.query.UserId;
} }
this.getList(); this.getList();
}, },
...@@ -105,23 +155,419 @@ export default { ...@@ -105,23 +155,419 @@ export default {
this.getList(); this.getList();
}, },
getList() { getList() {
this.apiJavaPostSmall("/api/ERPOrderCommission/GetDistributionOrderCommissionPageList", this.msg, res => { this.loading = true;
if (res.data.resultCode === 1) { this.apipost(
"Financial_get_GetMallUserOrderCommissionPageList",
this.msg,
res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.total = res.data.data.count; this.total = res.data.data.count;
this.dataList = res.data.data.pageData; this.tableData = res.data.data.pageData;
} else { } else {
this.Error(res.data.message); this.$message.error(res.data.message);
} }
}, null);
}, },
err => {}
);
// this.apiJavaPostSmall("/api/ERPOrderCommission/GetDistributionOrderCommissionPageList", this.msg, res => {
// if (res.data.resultCode === 1) {
// this.total = res.data.data.count;
// this.dataList = res.data.data.pageData;
// } else {
// this.Error(res.data.message);
// }
// }, null);
}
} }
}; };
</script> </script>
<style> <style>
.Sheepcommission .underline{ .app-order-list .app-order-item:hover {
border: 1px solid #3399FF;
}
.app-order-list .app-order-item .el-card__header {
padding: 0!important;
}
.app-order-list .app-order-time {
color: #909399;
}
.app-order-list .app-order-head {
padding:7px 20px;
background-color: #F3F5F6;
color: #303133;
min-width: 750px;
display: flex;
position: relative;
}
.app-order-list .app-order-item .el-button {
padding: 0;
}
.app-order-list .card-footer .address-box {
margin-right: 10px;
}
.app-order-list .card-footer {
background: #F3F5F6;
padding: 10px 20px;
}
.app-order-list .app-order-info > div {
width: 100%;
}
.app-order-icon {
margin-right: 5%;
margin-bottom: 10px;
cursor: pointer;
}
.app-order-body {
display: flex;
flex-wrap: nowrap;
}
.app-order-list .app-order-info {
display: flex;
align-items: center;
width: 15%;
text-align: center;
border-right: 1px solid #EBEEF5;
justify-content: center;
}
.app-order-list .el-card__body {
padding: 0;
}
.app-order-list .express-price {
height: 30px;
line-height: 30px;
}
.app-order-list .goods-item {
border-right: 1px solid #EBEEF5;
}
.app-order-list .app-order-info {
display: flex;
align-items: center;
width: 15%;
text-align: center;
border-right: 1px solid #EBEEF5;
}
.app-order-list .goods-item .goods .app-order-goods-price {
height: 24px;
margin-top: 10px;
position: absolute;
bottom: 20px;
left: 125px;
}
.app-order-list .goods-item .goods-info .goods-name {
margin-bottom: 5px;
word-break: break-all;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
overflow: hidden;
}
.app-order-list .goods-item .goods-info {
width: 50%;
margin-top: 5px;
}
.app-order-list .goods-image {
height: 90px;
width: 90px;
margin-right: 15px;
float: left;
}
.app-order-list .goods-item .goods {
position: relative;
padding: 20px;
min-height: 130px;
border-top: 1px solid #EBEEF5;
}
.app-order-list .goods-item .goods:first-of-type {
border-top: 0;
}
.Sheepcommission .app-order-title div {
text-align: center;
}
.Sheepcommission .app-order-title {
background-color: #F3F5F6;
height: 40px;
line-height: 40px;
display: flex;
min-width: 750px;
}
.Sheepcommission .underline {
text-decoration: underline; text-decoration: underline;
} }
.Sheepcommission .point{ .Sheepcommission .point {
cursor: pointer; cursor: pointer;
} }
[flex] {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
}
[flex] > * {
display: block;
}
[flex] > [flex] {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
}
[flex~="dir:left"] {
-webkit-box-orient: horizontal;
-webkit-box-direction: normal;
-webkit-flex-direction: row;
-ms-flex-direction: row;
flex-direction: row;
}
[flex~="dir:right"] {
-webkit-box-orient: horizontal;
-webkit-box-direction: reverse;
-webkit-flex-direction: row-reverse;
-ms-flex-direction: row-reverse;
flex-direction: row-reverse;
-webkit-box-pack: end;
}
[flex~="dir:top"] {
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-webkit-flex-direction: column;
-ms-flex-direction: column;
flex-direction: column;
}
[flex~="dir:bottom"] {
-webkit-box-orient: vertical;
-webkit-box-direction: reverse;
-webkit-flex-direction: column-reverse;
-ms-flex-direction: column-reverse;
flex-direction: column-reverse;
-webkit-box-pack: end;
}
[flex~="main:left"] {
-webkit-box-pack: start;
-webkit-justify-content: flex-start;
-ms-flex-pack: start;
justify-content: flex-start;
}
[flex~="main:right"] {
-webkit-box-pack: end;
-webkit-justify-content: flex-end;
-ms-flex-pack: end;
justify-content: flex-end;
}
[flex~="main:justify"] {
-webkit-box-pack: justify;
-webkit-justify-content: space-between;
-ms-flex-pack: justify;
justify-content: space-between;
}
[flex~="main:center"] {
-webkit-box-pack: center;
-webkit-justify-content: center;
-ms-flex-pack: center;
justify-content: center;
}
[flex~="cross:top"] {
-webkit-box-align: start;
-webkit-align-items: flex-start;
-ms-flex-align: start;
align-items: flex-start;
}
[flex~="cross:bottom"] {
-webkit-box-align: end;
-webkit-align-items: flex-end;
-ms-flex-align: end;
align-items: flex-end;
}
[flex~="cross:center"] {
-webkit-box-align: center;
-webkit-align-items: center;
-ms-flex-align: center;
align-items: center;
}
[flex~="cross:baseline"] {
-webkit-box-align: baseline;
-webkit-align-items: baseline;
-ms-flex-align: baseline;
align-items: baseline;
}
[flex~="cross:stretch"] {
-webkit-box-align: stretch;
-webkit-align-items: stretch;
-ms-flex-align: stretch;
align-items: stretch;
}
[flex~="box:mean"] > *,
[flex~="box:first"] > *,
[flex~="box:last"] > *,
[flex~="box:justify"] > * {
width: 0;
height: auto;
-webkit-box-flex: 1;
-webkit-flex-grow: 1;
-ms-flex-positive: 1;
flex-grow: 1;
-webkit-flex-shrink: 1;
-ms-flex-negative: 1;
flex-shrink: 1;
}
[flex~="box:first"] > :first-child,
[flex~="box:last"] > :last-child,
[flex~="box:justify"] > :first-child,
[flex~="box:justify"] > :last-child {
width: auto;
-webkit-box-flex: 0;
-webkit-flex-grow: 0;
-ms-flex-positive: 0;
flex-grow: 0;
-webkit-flex-shrink: 0;
-ms-flex-negative: 0;
flex-shrink: 0;
}
[flex~="dir:top"][flex~="box:mean"] > *,
[flex~="dir:top"][flex~="box:first"] > *,
[flex~="dir:top"][flex~="box:last"] > *,
[flex~="dir:top"][flex~="box:justify"] > *,
[flex~="dir:bottom"][flex~="box:mean"] > *,
[flex~="dir:bottom"][flex~="box:first"] > *,
[flex~="dir:bottom"][flex~="box:last"] > *,
[flex~="dir:bottom"][flex~="box:justify"] > * {
width: auto;
height: 0;
-webkit-box-flex: 1;
-webkit-flex-grow: 1;
-ms-flex-positive: 1;
flex-grow: 1;
-webkit-flex-shrink: 1;
-ms-flex-negative: 1;
flex-shrink: 1;
}
[flex~="dir:top"][flex~="box:first"] > :first-child,
[flex~="dir:top"][flex~="box:last"] > :last-child,
[flex~="dir:top"][flex~="box:justify"] > :first-child,
[flex~="dir:top"][flex~="box:justify"] > :last-child,
[flex~="dir:bottom"][flex~="box:first"] > :first-child,
[flex~="dir:bottom"][flex~="box:last"] > :last-child,
[flex~="dir:bottom"][flex~="box:justify"]
> :first-child
[flex~="dir:bottom"][flex~="box:justify"]
> :last-child {
height: auto;
-webkit-box-flex: 0;
-webkit-flex-grow: 0;
-ms-flex-positive: 0;
flex-grow: 0;
-webkit-flex-shrink: 0;
-ms-flex-negative: 0;
flex-shrink: 0;
}
[flex-box="0"] {
-webkit-box-flex: 0;
-webkit-flex-grow: 0;
-ms-flex-positive: 0;
flex-grow: 0;
-webkit-flex-shrink: 0;
-ms-flex-negative: 0;
flex-shrink: 0;
}
[flex-box="1"] {
-webkit-box-flex: 1;
-webkit-flex-grow: 1;
-ms-flex-positive: 1;
flex-grow: 1;
-webkit-flex-shrink: 1;
-ms-flex-negative: 1;
flex-shrink: 1;
}
[flex-box="2"] {
-webkit-box-flex: 2;
-webkit-flex-grow: 2;
-ms-flex-positive: 2;
flex-grow: 2;
-webkit-flex-shrink: 2;
-ms-flex-negative: 2;
flex-shrink: 2;
}
[flex-box="3"] {
-webkit-box-flex: 3;
-webkit-flex-grow: 3;
-ms-flex-positive: 3;
flex-grow: 3;
-webkit-flex-shrink: 3;
-ms-flex-negative: 3;
flex-shrink: 3;
}
[flex-box="4"] {
-webkit-box-flex: 4;
-webkit-flex-grow: 4;
-ms-flex-positive: 4;
flex-grow: 4;
-webkit-flex-shrink: 4;
-ms-flex-negative: 4;
flex-shrink: 4;
}
[flex-box="5"] {
-webkit-box-flex: 5;
-webkit-flex-grow: 5;
-ms-flex-positive: 5;
flex-grow: 5;
-webkit-flex-shrink: 5;
-ms-flex-negative: 5;
flex-shrink: 5;
}
[flex-box="6"] {
-webkit-box-flex: 6;
-webkit-flex-grow: 6;
-ms-flex-positive: 6;
flex-grow: 6;
-webkit-flex-shrink: 6;
-ms-flex-negative: 6;
flex-shrink: 6;
}
[flex-box="7"] {
-webkit-box-flex: 7;
-webkit-flex-grow: 7;
-ms-flex-positive: 7;
flex-grow: 7;
-webkit-flex-shrink: 7;
-ms-flex-negative: 7;
flex-shrink: 7;
}
[flex-box="8"] {
-webkit-box-flex: 8;
-webkit-flex-grow: 8;
-ms-flex-positive: 8;
flex-grow: 8;
-webkit-flex-shrink: 8;
-ms-flex-negative: 8;
flex-shrink: 8;
}
[flex-box="9"] {
-webkit-box-flex: 9;
-webkit-flex-grow: 9;
-ms-flex-positive: 9;
flex-grow: 9;
-webkit-flex-shrink: 9;
-ms-flex-negative: 9;
flex-shrink: 9;
}
[flex-box="10"] {
-webkit-box-flex: 10;
-webkit-flex-grow: 10;
-ms-flex-positive: 10;
flex-grow: 10;
-webkit-flex-shrink: 10;
-ms-flex-negative: 10;
flex-shrink: 10;
}
[flex~="wrap:nowrap"] {
flex-wrap: nowrap;
}
[flex~="wrap:wrap"] {
flex-wrap: wrap;
}
[flex~="wrap:wrap-reverse"] {
flex-wrap: wrap-reverse;
}
</style> </style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment