Skip to content

E
ElectricitySheep
Commit c497f09c authored by zhangjianguo's avatar zhangjianguo
Browse files
Options

1

parent dfc05333
Show whitespace changes
Inline Side-by-side
Showing with 1272 additions and 1234 deletions
src/components/CommodityMan/goodsList.vue
View file @ c497f09c
......@@ -149,11 +149,23 @@
</template>
</el-table-column>
<el-table-column
prop="SalesNum"
width="105"
width="120"
sortable
label="已出售量">
>
<template slot="header" slot-scope="scope">
已出售量
<el-tooltip effect="dark" content="已出售量=实际销量+虚拟销量，按实际销量排序" placement="top">
<i class="el-icon-info"></i>
</el-tooltip>
</template>
<template slot-scope="scope">
<span >{{scope.row.SalesNum}}+{{scope.row.GoodsBuyNum}}</span>
</template>
</el-table-column>
<el-table-column
prop="UpdateDate"
width="110"
......
src/components/CommodityMan/goodsListEdit.vue
View file @ c497f09c
......@@ -1794,11 +1794,11 @@
</div>
</template>
<script>
import ChooseImg from "@/components/global/ChooseImg.vue";
import Choosevideo from "@/components/global/Choosevideo.vue";
import region_Choice from "@/components/setup/view/regionChoice";
import UE from "@/components/global/UE.vue";
export default {
import ChooseImg from "@/components/global/ChooseImg.vue";
import Choosevideo from "@/components/global/Choosevideo.vue";
import region_Choice from "@/components/setup/view/regionChoice";
import UE from "@/components/global/UE.vue";
export default {
components: {
ChooseImg,
Choosevideo,
......@@ -1807,6 +1807,7 @@ export default {
},
data() {
return {
thisType:0,
tableData: [],
SpecificationList: [],
SpecificationPriceList: [],
......@@ -1989,6 +1990,12 @@ export default {
if (this.$route.query.hpState) {
this.hpState = this.$route.query.hpState;
}
this.getTree();
this.getService();
this.getRule();
this.getSpeciList();
this.getDistributor();
this.gethuiyList();
},
mounted() {
this.$refs.ue.loadUe();
......@@ -1996,12 +2003,13 @@ export default {
this.GoodsId = this.$route.query.GoodsId;
this.getData();
}
this.getTree();
this.getService();
this.getRule();
this.getSpeciList();
this.getDistributor();
this.gethuiyList();
// this.getTree();
// this.getService();
// this.getRule();
// this.getSpeciList();
// this.getDistributor();
// this.gethuiyList();
},
methods: {
initShareSettings() {
......@@ -2349,11 +2357,13 @@ export default {
this.calcdis(JSON.parse(JSON.stringify(arrList)));
},
calcdis(dislist) {
console.log("dislist",dislist)
let memberList2 = JSON.parse(JSON.stringify(dislist));
dislist.forEach(item => {
item.GradeCommissionList = [];
for (let i = 0; i < this.DropdownList.length; i++) {
let obj = {
SpecificationSort:item.SpecificationSort,
DistributorGrade: this.DropdownList[i].Id,
OneCommission: 0,
TwoCommission: 0,
......@@ -2374,7 +2384,9 @@ export default {
}
});
this.disList2 = JSON.parse(JSON.stringify(dislist));
console.log("disList2",this.disList2)
this.memberList2 = JSON.parse(JSON.stringify(memberList2));
console.log("memberList2",this.memberList2)
},
addggModeule() {
this.speciDig = true;
......@@ -2636,9 +2648,12 @@ export default {
}
}
if (this.addMsg.SeparateDistributionType == 2) {
this.disList2 = this.addMsg.DistributionCommissionTreeList;
// this.disList2 = this.addMsg.DistributionCommissionTreeList;
this.getDistributor();
this.thisType=1;
}
this.disList1 = [];
let objNew = {
SpecificationSort: "",
GradeCommissionList: this.GradeCommissionList
......@@ -2656,6 +2671,7 @@ export default {
this.addMsg.SeparateDistribution = 0;
}
this.getSuggestPrice();
}
);
},
......@@ -2758,7 +2774,7 @@ export default {
this.DropdownList = JSON.parse(JSON.stringify(this.DropdownList));
if (
!this.$route.query.GoodsId ||
this.addMsg.DistributionCommissionTreeList.length == 0
this.addMsg.DistributionCommissionTreeList.length == 0 || this.thisType==1
) {
this.GradeCommissionList = [];
this.DropdownList.forEach(item => {
......@@ -2775,74 +2791,79 @@ export default {
JSON.stringify(this.GradeCommissionList)
);
this.disList1 = [];
this.disList2 = [];
let objNew = {
SpecificationSort: "",
GradeCommissionList: this.GradeCommissionList
};
this.disList1.push(objNew);
console.log("this.disList1",this.disList1)
console.log("this.SpecificationList",this.disList1)
this.getSkuData([], 0, this.SpecificationList);
}
});
}
}
};
};
</script>
<style>
.app-attr-group .close {
.app-attr-group .close {
position: absolute;
top: -4px;
right: -4px;
font-size: 16px;
cursor: pointer;
}
}
.goodsListEdit .el-image {
.goodsListEdit .el-image {
position: relative;
display: inline-block;
overflow: hidden;
}
}
.goodsListEdit .pendSelect {
.goodsListEdit .pendSelect {
width: 100px;
}
}
.goodsListEdit .el-table th > .cell {
.goodsListEdit .el-table th > .cell {
padding-left: 20px !important;
}
}
.goodsListEdit .app-attr .box {
.goodsListEdit .app-attr .box {
line-height: 64px;
border-top: 1px solid #e8eaee;
border-left: 1px solid #e8eaee;
border-right: 1px solid #e8eaee;
padding: 0 16px;
}
}
.speciDig .tpl-scrollbar .el-checkbox {
.speciDig .tpl-scrollbar .el-checkbox {
display: flex;
-webkit-align-items: center;
align-items: center;
padding: 10px 0;
}
}
.speciDig .tpl-scrollbar {
.speciDig .tpl-scrollbar {
height: calc(440px - 44px - 10px);
}
}
.speciDig .tpl-box .tpl-head {
.speciDig .tpl-box .tpl-head {
padding: 0 20px;
font-size: 15px;
color: #909399;
margin-bottom: 10px;
line-height: 44px;
background: #f5f7fa;
}
}
.speciDig .tpl-box {
.speciDig .tpl-box {
width: 300px;
height: 440px;
}
}
.goodsListEdit .app-attr-group .attr-jt {
.goodsListEdit .app-attr-group .attr-jt {
background: #ffffff;
width: 6px;
height: 6px;
......@@ -2855,33 +2876,33 @@ export default {
-ms-transform: rotate(-45deg);
position: absolute;
top: -5px;
}
}
.goodsListEdit .app-attr-group .img-box {
.goodsListEdit .app-attr-group .img-box {
position: relative;
height: 100px;
width: 100px;
margin-top: 8px;
border: 1px solid #ebeef5;
}
}
.goodsListEdit .app-attr-group .close {
.goodsListEdit .app-attr-group .close {
position: absolute;
top: -4px;
right: -4px;
font-size: 16px;
cursor: pointer;
}
}
.goodsListEdit .app-attr-group .attr-list {
.goodsListEdit .app-attr-group .attr-list {
display: inline-block;
margin-right: 10px;
margin-bottom: 10px;
position: relative;
cursor: move;
}
}
.goodsListEdit .box-grow-0 {
.goodsListEdit .box-grow-0 {
min-width: 0;
-webkit-box-flex: 0;
-webkit-flex-grow: 0;
......@@ -2890,43 +2911,43 @@ export default {
-webkit-flex-shrink: 0;
-ms-flex-negative: 0;
flex-shrink: 0;
}
}
.goodsListEdit .app-attr-group .del-img {
.goodsListEdit .app-attr-group .del-img {
height: 20px;
width: 20px;
cursor: pointer;
}
}
.goodsListEdit .app-attr-group .bg {
.goodsListEdit .app-attr-group .bg {
height: 44px;
padding: 0 10px;
background: #f8f8f8;
}
}
.regionDig .regionChoice .item_b {
.regionDig .regionChoice .item_b {
margin-bottom: 10px;
}
}
.goodsListEdit .app-attr-group .bg {
.goodsListEdit .app-attr-group .bg {
height: 44px;
padding: 0 10px;
background: #f8f8f8;
}
}
.goodsListEdit .app-attr-group {
.goodsListEdit .app-attr-group {
border: 1px solid #ebeef5;
padding: 10px;
}
}
.goodsListEdit .delBtn {
.goodsListEdit .delBtn {
position: absolute;
right: -8px;
top: -8px;
padding: 4px 4px !important;
}
}
.goodsListEdit .add-image-btn {
.goodsListEdit .add-image-btn {
width: 100px;
height: 100px;
line-height: 100px;
......@@ -2934,59 +2955,59 @@ export default {
border: 1px solid #e2e2e2;
cursor: pointer;
text-align: center;
}
}
.goodsListEdit .colapp-image {
.goodsListEdit .colapp-image {
background-size: cover;
background-position: center center;
width: 100px;
height: 100px;
border-radius: 0%;
}
}
.goodsListEdit .el-form-item__label {
.goodsListEdit .el-form-item__label {
padding-right: 26px;
}
}
.app-add-cat .el-checkbox-group {
.app-add-cat .el-checkbox-group {
font-size: 14px !important;
}
}
.app-add-cat .el-checkbox {
.app-add-cat .el-checkbox {
margin-right: 0;
}
}
.app-add-cat .el-dialog__body {
.app-add-cat .el-dialog__body {
padding: 10px 20px !important;
}
}
.app-add-cat .tag-box .tag-item {
.app-add-cat .tag-box .tag-item {
margin-right: 5px;
}
}
.app-add-cat .tag-box {
.app-add-cat .tag-box {
margin: 20px 0;
}
}
.app-add-cat .app-goods-cat-list .active {
.app-add-cat .app-goods-cat-list .active {
background: #fafafa;
}
}
.app-add-cat .app-goods-cat-list .cat-item {
.app-add-cat .app-goods-cat-list .cat-item {
cursor: pointer;
padding: 5px 10px;
}
}
.app-add-cat .app-goods-cat-list {
.app-add-cat .app-goods-cat-list {
border: 1px solid #e8eaee;
border-radius: 5px;
margin-top: -5px;
padding: 10px 0;
overflow: scroll;
height: 400px;
}
}
.goodsListEdit .bottom-div {
.goodsListEdit .bottom-div {
border-top: 1px solid #e3e3e3;
position: fixed;
bottom: 0;
......@@ -2994,28 +3015,28 @@ export default {
z-index: 999;
padding: 10px;
width: 80%;
}
.goodsListEdit .fen-table {
}
.goodsListEdit .fen-table {
width: 100%;
border-collapse: collapse;
border-spacing: 0;
border: 1px solid #eee;
}
.goodsListEdit .fen-table td,
.goodsListEdit .fen-table th {
}
.goodsListEdit .fen-table td,
.goodsListEdit .fen-table th {
border: 1px solid #eee;
padding: 10px 0;
padding-left: 10px;
}
.goodsListEdit .fen-table td {
}
.goodsListEdit .fen-table td {
font-size: 12px;
}
.goodsListEdit .fen-table th {
}
.goodsListEdit .fen-table th {
background: #ddd;
font-weight: 500;
}
.goodsListEdit .fen-sumg {
}
.goodsListEdit .fen-sumg {
margin: 20px 0;
font-size: 12px;
}
}
</style>
src/components/UserMan/distributionOrder.vue
View file @ c497f09c
......@@ -149,7 +149,8 @@
</div>
</div>
<div flex="main:center cross:center" class="app-box-info" style="width: 10%;border-right: 1px solid #EBEEF5;">
<div>待结算</div>
<div v-if="item.IsOrderCommission==1">已结算</div>
<div v-if="item.IsOrderCommission==2">待结算</div>
</div>
<div flex="main:center cross:center" class="app-order-info" style="border-right: 0px; width: 20%;">
<div style="margin:0 auto;width:90%;margin-left:17%">
......@@ -158,8 +159,8 @@
<span>{{list.GradeDescription}}</span>
<span class="price">￥{{list.Commission}}</span>
</div>
<div>昵称：{{list.Name}}</div>
<div>姓名：{{list.UserName}}</div>
<div>昵称：{{list.UserName}}</div>
<div>姓名：{{list.Name}}</div>
<div>手机：{{list.Mobile}}</div>
</div>
</div>
......
src/components/orderMan/orderList.vue
View file @ c497f09c
......@@ -289,7 +289,7 @@
</span>
</el-dialog>
<!--待处理-->
<el-dialog custom-class="app-send" :title="pendMgs.Type==1?'同意':'拒绝'" :visible.sync="pendD" width="15%">
<el-dialog custom-class="app-send" :title="pendMgs.Type==1?'同意':'拒绝'" :visible.sync="pendD" width="15%" class="tyi">
<el-input v-if="pendMgs.Type==2" type="textarea" size="small" v-model="pendMgs.Remark" placeholder="拒绝理由"></el-input>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="pendD = false">取 消</el-button>
......@@ -1259,7 +1259,11 @@
.hszDigClass .el-dialog__body {
padding: 0 10px 20px 0;
}
.orderList .tyi .el-dialog__body{
padding:0 20px
}
.sendDigClass .el-dialog__body {
padding: 0 10px 10px 0;
}
......
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