Skip to content

E
ElectricitySheep
Commit 0e395bf5 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

商品列表的排序批量设置 等样式问题

parent bf245cbf
Hide whitespace changes
Inline Side-by-side
Showing with 116 additions and 13 deletions
src/components/CommodityMan/goodsList.vue
View file @ 0e395bf5
......@@ -63,6 +63,8 @@
:data="tableData"
v-loading="loading"
border
sortable='custom'
@sort-change='getSort'
@selection-change="tableSelect"
style="width: 100%;margin:20px 0">
<el-table-column
......@@ -150,7 +152,7 @@
</el-table-column>
<el-table-column
width="120"
sortable
>
<template slot="header" slot-scope="scope">
已出售量
......@@ -199,6 +201,7 @@
width="200"
label="操作">
<template slot-scope="scope">
<img @click="CommonJump('goodsListEdit',{GoodsId:scope.row.Id,hpState:hpState})" style="width:32px;height:32px;margin:0 10px" src="../../assets/img/userman/edit.png" alt="">
<img @click="Delete(scope.row)" style="width:32px;height:32px;margin:0 10px" src="../../assets/img/userman/del.png" alt="">
</template>
......@@ -286,6 +289,8 @@
<div flex="main:center" @click="ClearSelect(9)" :class="plszMsg.Type==9?'batch-div-active':''">积分</div>
<div flex="main:center" @click="ClearSelect(10)" :class="plszMsg.Type==10?'batch-div-active':''">快速购买</div>
<div flex="main:center" @click="ClearSelect(11)" :class="plszMsg.Type==11?'batch-div-active':''">面议</div>
<div flex="main:center" @click="ClearSelect(12)" :class="plszMsg.Type==12?'batch-div-active':''">供应商</div>
</div>
<div class="batch-box-right">
<el-form class="app-batch" :model="addMsg" :rules="rules" ref="addMsg" label-width="100px">
......@@ -367,6 +372,14 @@
</el-switch>
</el-form-item>
<el-form-item class="spmy" v-if="plszMsg.Type==12" label-width="160px" label="供应商">
<el-select class="w150" style="margin-right: 10px;" v-model="plszMsg.SupplierId" size="small"
placeholder="请选择" @change='changeSupplier'>
<el-option v-for="item in options" :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
</el-form-item>
</el-form>
</div>
</div>
......@@ -412,10 +425,12 @@ export default {
Id:'',
StartTime:'',
EndTime:'',
OrderBy:0,
},
total:0,
tableData:[],
loading:false,
options:[],
addMsg:{
Id:0,
Sort:'',
......@@ -450,6 +465,7 @@ export default {
IsMultipleDeduction:2,
IsQuickBuy:2,
IsGoodsNegotiable:2,
SupplierId:''
},
ruleList:[],
ruleSelect:{},
......@@ -464,6 +480,7 @@ export default {
this.getTree();
this.getRule();
this.getHpState();
this.getSupplierList()//获取供应商
},
methods:{
getHpState(){
......@@ -510,7 +527,24 @@ export default {
this.plszMsg.LimitBuyOrderNum=-1
}
}
this.commonSet(this.plszMsg);
let mall_userInfo = JSON.parse(localStorage.mall_userInfo)
if(mall_userInfo.TenantId==1 && mall_userInfo.MallBaseId==1 ){
if(this.plszMsg.SupplierId==''){
this.Error("请选择供应商!");
return
}else{
this.commonSet(this.plszMsg);
}
}else{
if(this.plszMsg.SupplierId==''){
this.plszMsg.SupplierId=0
this.commonSet(this.plszMsg)
}else{
this.commonSet(this.plszMsg);
}
}
},
plsetBtn(){
if(this.GoodsIds.length==0){
......@@ -523,6 +557,7 @@ export default {
})
this.keepGoodsIds=idList.join(',');
this.plszMsg.GoodsIds=this.keepGoodsIds;
this.plszMsg.SupplierId=''
this.plDig=true;
},
......@@ -540,6 +575,7 @@ export default {
IsMultipleDeduction:2,
IsQuickBuy:2,
IsGoodsNegotiable:2,
SupplierId:''
}
},
YfSelect(val){
......@@ -748,6 +784,52 @@ export default {
})
},
changeSupplier(val) {},
getSupplierList(){
this.apipost("/api/Supplier/GetSupplierAllList", {}, res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.options = res.data.data;
}
});
},
getSort(val){//列表的升序降序
console.log(val)
if(val.prop=='Id'){
if(val.order=='ascending'){
this.msg.OrderBy=1
}else if(val.order=='descending'){
this.msg.OrderBy=2
}else{
this.msg.OrderBy=0
}
}else if(val.prop=='address'){
if(val.order=='ascending'){
this.msg.OrderBy=3
}else if(val.order=='descending'){
this.msg.OrderBy=4
}else{
this.msg.OrderBy=0
}
}else if(val.prop=='SellingPrice'){
if(val.order=='ascending'){
this.msg.OrderBy=5
}else if(val.order=='descending'){
this.msg.OrderBy=6
}else{
this.msg.OrderBy=0
}
}else if(val.prop=='InventoryNum'){
if(val.order=='ascending'){
this.msg.OrderBy=7
}else if(val.order=='descending'){
this.msg.OrderBy=8
}else{
this.msg.OrderBy=0
}
}
this.getList()
},
},
};
</script>
......
src/components/CommodityMan/goodsListEdit.vue
View file @ 0e395bf5
......@@ -1633,7 +1633,13 @@
this.addMsg.MemberPriceList = this.memberList2;
this.addMsg.MemberPriceTreeList = this.memberList2;
}
this.addMsg.SupplierId = this.SupplierId != '' ? this.SupplierId : 0, //暂时使用
let mall_userInfo = JSON.parse(localStorage.mall_userInfo)
if(mall_userInfo.TenantId==1 && mall_userInfo.MallBaseId==1 && this.SupplierId ==''){
this.Error("请选择供应商!");
return
}else{
this.addMsg.SupplierId = this.SupplierId != '' ? this.SupplierId : 0;
}
this.addMsg.SpecificationPriceList = this.SpecificationPriceList;
this.addMsg.SpecificationList = this.SpecificationList;
......
src/components/UserMan/distributionOrder.vue
View file @ 0e395bf5
......@@ -69,7 +69,7 @@
</div>
<div flex="cross:center" class="app-order-user">
<img v-if="item.OrderSource==1" src="../../assets/img/userman/wx.png" alt="">
<span>{{item.UserName}}</span>
<span>{{item.UserName}}({{item.UserId}})</span>
</div>
<div flex="dir:left wrap:wrap" class="app-order-offline">
<div v-if="item.DeliveryMethodName && item.DeliveryMethodName!=''" class="express-send-box">
......@@ -271,6 +271,12 @@ export default {
}
},
created(){
if (this.$route.query.UserId) {//如果有UserId过来 查询显示用户id
console.log(this.$route.query.UserId)
this.msg.UserId = this.$route.query.UserId;
this.msgId = 3;
this.msgVal = this.msg.UserId
}
this.getList();
this.getplat();
this.getDown();
......
src/components/UserMan/distributors.vue
View file @ 0e395bf5
......@@ -122,7 +122,7 @@
<el-table-column prop="address" width="300" label="操作">
<template slot-scope="scope">
<el-tooltip class="item" effect="dark" content="查看订单" placement="top-start">
<img v-if="scope.row.AuditStatus==2" @click="CommonJump('distributionOrder')" style="width:32px;height:32px"
<img v-if="scope.row.AuditStatus==2" @click="godistribution(scope.row.UserId)" style="width:32px;height:32px"
src="../../assets/img/userman/order.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="提现详情" placement="top-start">
......@@ -712,6 +712,15 @@
this.msg.pageIndex = val;
this.getList();
},
godistribution(UserId){
this.$router.push({
name: 'distributionOrder',
query: {
UserId: UserId,
blank: "y"
}
});
}
},
mounted() {
......
src/components/orderMan/orderList.vue
View file @ 0e395bf5
......@@ -76,7 +76,7 @@
</div>
<div flex="cross:center" class="app-order-user">
<img v-if="item.OrderSource==1" src="../../assets/img/userman/wx.png" alt="">
<span>{{item.UserName}}</span>
<span>{{item.UserName}}({{item.UserId}})</span>
</div>
<div v-if="item.BuyerMessage && item.BuyerMessage!=''" flex="cross:center" class="remark-box">
<el-tooltip class="item" effect="dark" :content="item.BuyerMessage" placement="top">
......@@ -153,11 +153,11 @@
src="../../assets/img/userman/edit1.png" alt="">
</span>
<span style="">商品成本：￥{{ list.CostMoney}}
<img v-if="item.OrderStatus==1||item.OrderStatus==2" @click="costBtn(list,1)"
<img v-if="item.OrderStatus!==7" @click="costBtn(list,1)"
src="../../assets/img/userman/edit1.png" alt="">
</span>
<span style="">运费成本：￥{{list.FreightCostMoney>0?list.FreightCostMoney: list.FreightMoney}}
<img v-if="item.OrderStatus==1||item.OrderStatus==2" @click="costBtn(list,2)"
<img v-if="item.OrderStatus!==7" @click="costBtn(list,2)"
src="../../assets/img/userman/edit1.png" alt="">
</span>
<span style="">供应商：{{list.SupplierName !=null ? list.SupplierName :''}}</span>
......@@ -191,26 +191,26 @@
<div flex="wrap:wrap cross:center">
<template v-if="msg.Recycled==2">
<!-- 未发货 -->
<el-tooltip class="item" effect="dark" content="发货" placement="top">
<el-tooltip class="item" effect="dark" content="发货" placement="top" v-if="item.OrderStatus==2">
<img v-if="item.OrderStatus==2" @click="fhBtn(item)" class="app-order-icon"
src="../../assets/img/userman/send.png" alt="">
</el-tooltip>
<!-- 待收货 -->
<el-tooltip class="item" effect="dark" content="确认收货" placement="top">
<el-tooltip class="item" effect="dark" content="确认收货" placement="top" v-if="item.OrderStatus==3">
<img @click="ConfirmSh(item)" v-if="item.OrderStatus==3" class="app-order-icon"
src="../../assets/img/userman/confirm.png" alt="">
</el-tooltip>
<!-- 已收货 -->
<el-tooltip class="item" effect="dark" content="确认完成" placement="top">
<el-tooltip class="item" effect="dark" content="确认完成" placement="top" v-if="item.OrderStatus==4">
<img @click="qrEnd(item,6)" v-if="item.OrderStatus==4" class="app-order-icon"
src="../../assets/img/userman/sale.png" alt="">
</el-tooltip>
<!--待处理-->
<el-tooltip class="item" effect="dark" content="同意" placement="top">
<el-tooltip class="item" effect="dark" content="同意" placement="top" v-if="item.OrderStatus==6">
<img @click="pending(item,1)" v-if="item.OrderStatus==6" class="app-order-icon"
src="../../assets/img/userman/pass.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="拒绝" placement="top">
<el-tooltip class="item" effect="dark" content="拒绝" placement="top" v-if="item.OrderStatus==6">
<img @click="pending(item,2)" v-if="item.OrderStatus==6" class="app-order-icon"
src="../../assets/img/userman/nopass.png" alt="">
</el-tooltip>
......
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