Skip to content

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

1

parent dfc05333
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1272 additions and 1234 deletions
src/components/CommodityMan/goodsList.vue
View file @ c497f09c
......@@ -89,7 +89,7 @@
<span @click="scope.row.editsort=false" class="el-icon-error" style="color: rgb(245, 108, 108);"></span>
<span @click="Edit(scope.row,1)" class="el-icon-success" style="color:#67c23a"></span>
</template>
</template>
</template>
</el-table-column>
<el-table-column
prop="Remark"
......@@ -100,7 +100,7 @@
<div slot="content">
<span v-for="(item,index) in scope.row.CategoryList" :key="index">{{item.CategoryName}} </span>
</div>
<span v-if="scope.row.CategoryList.length>1 && index==0" v-for="(item,index) in scope.row.CategoryList" :key="index">...</span>
<span v-if="scope.row.CategoryList.length>1 && index==0" v-for="(item,index) in scope.row.CategoryList" :key="index">...</span>
</el-tooltip>
</template>
</el-table-column>
......@@ -129,8 +129,8 @@
<span @click="Edit(scope.row,2)" class="el-icon-success" style="color:#67c23a;position: relative;top: 9px;"></span>
</template>
</div>
</template>
</template>
</el-table-column>
<el-table-column
prop="SellingPrice"
......@@ -146,15 +146,27 @@
<template slot-scope="scope">
<span v-if="scope.row.InventoryNum==0" style="color:red">售罄</span>
<span v-else>{{scope.row.InventoryNum}}</span>
</template>
</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
<el-table-column
prop="UpdateDate"
width="110"
label="是否加入快速购买">
......@@ -166,7 +178,7 @@
:active-value="1"
:inactive-value="0">
</el-switch>
</template>
</template>
</el-table-column>
<el-table-column
prop="CreateDate"
......@@ -180,7 +192,7 @@
<template slot-scope="scope">
<el-tag v-if="scope.row.GoodsStatus==1" type="success">销售中</el-tag>
<el-tag v-if="scope.row.GoodsStatus==2" type="warning">下架中</el-tag>
</template>
</template>
</el-table-column>
<el-table-column
prop="address"
......@@ -189,7 +201,7 @@
<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>
</template>
</el-table-column>
</el-table>
<el-pagination style="text-align:right"
......@@ -217,7 +229,7 @@
</div>
</div>
</el-checkbox-group>
</div>
</el-col>
<el-col v-show="childList2.length>0" :span="8" style="padding:0 10px;box-sizing:border-box">
......@@ -234,7 +246,7 @@
</div>
</div>
</el-checkbox-group>
</div>
</el-col>
<el-col v-show="childList3.length>0" :span="8" style="padding:0 10px;box-sizing:border-box">
......@@ -251,7 +263,7 @@
</div>
</div>
</el-checkbox-group>
</div>
</el-col>
</el-row>
......@@ -262,7 +274,7 @@
<el-button size="small" @click="flDig = false">取 消</el-button>
<el-button @click="chooseFl" size="small" type="primary">确 定</el-button>
</span>
</el-dialog>
</el-dialog>
<!-- 批量修改 -->
<el-dialog custom-class="plxg" title="批量修改" :visible.sync="plDig" width="960px">
<span class="absoSpan">已选商品{{GoodsIds.length}}个</span>
......@@ -332,7 +344,7 @@
<el-form-item label-width="110px">
<el-checkbox v-model="plszMsg.IsMultipleDeduction" :true-label="1" :false-label="2">允许多件抵扣</el-checkbox>
</el-form-item>
</template>
<el-form-item v-if="plszMsg.Type==10" label-width="160px" label="是否加入快速购买">
<el-switch
......@@ -354,7 +366,7 @@
:inactive-value="0">
</el-switch>
</el-form-item>
</el-form>
</div>
</div>
......@@ -362,7 +374,7 @@
<el-button size="small" @click="plDig = false">取 消</el-button>
<el-button @click="plsetOk" size="small" type="primary">确 定</el-button>
</span>
</el-dialog>
</el-dialog>
<!-- 选择运费 -->
<el-dialog title="选择运费" top="2%" :modal="false" :modal-append-to-body='false' :visible.sync="chooseyfDig" width="25%">
<div>
......@@ -374,7 +386,7 @@
<el-button size="small" @click="chooseyfDig = false,ruleSelect={},plszMsg.FreightId=0">取 消</el-button>
<el-button size="small" @click="chooseyfDig = false" type="primary">确 定</el-button>
</span>
</el-dialog>
</el-dialog>
</div>
</template>
......@@ -457,9 +469,9 @@ export default {
getHpState(){
this.apipost("/api/user/GetHpDistributorIsEnabled", {}, res => {
if(res.data.resultCode==1){
this.hpState=res.data.data;
this.hpState=res.data.data;
}
})
},
goodChange(val,num){
......@@ -470,7 +482,7 @@ export default {
else if(num==2){
this.plszMsg.LimitBuyOrderNum=0;
}
}
},
Export(){
......@@ -570,7 +582,7 @@ export default {
}).then(() => {
this.commonSet(msg);
}).catch(() => {
});
},
Edit(row,num){
......@@ -603,7 +615,7 @@ export default {
CategoryIds.push(item.Id)
})
this.msg.CategoryIds = CategoryIds.join(",");
this.getList();
this.getList();
this.flDig=false;
},
getChild3(ChildList){
......@@ -668,7 +680,7 @@ export default {
null
);
}).catch(() => {
});
},
handleCurrentChange(val) {
......@@ -676,7 +688,7 @@ export default {
this.getList();
},
getList(){
if(this.dateList && this.dateList.length>0){
this.msg.StartTime=this.dateList[0];
this.msg.EndTime=this.dateList[1];
......@@ -702,7 +714,7 @@ export default {
})
this.tableData=pageData;
}
})
},
getTree(){
......@@ -717,9 +729,9 @@ export default {
this.apipost("/api/product/GetProductCategoryTreeList", msg1, res => {
if(res.data.resultCode==1){
let pageData=res.data.data;
this.fenleiData=pageData;
this.fenleiData=pageData;
}
})
},
getRule(){
......@@ -731,9 +743,9 @@ export default {
this.apipost("/api/MallBase/GetLogisticsRulesPage", msg1, res => {
if(res.data.resultCode==1){
let pageData=res.data.data.pageData;
this.ruleList=pageData;
this.ruleList=pageData;
}
})
},
},
......
src/components/UserMan/distributionOrder.vue
View file @ c497f09c
......@@ -68,25 +68,25 @@
<span class="app-order-time">订单号：</span>{{item.OrderNo}}
</div>
<div flex="cross:center" class="app-order-user">
<img v-if="item.OrderSource==1" src="../../assets/img/userman/wx.png" alt="">
<img v-if="item.OrderSource==1" src="../../assets/img/userman/wx.png" alt="">
<span>{{item.UserName}}</span>
</div>
<div flex="dir:left wrap:wrap" class="app-order-offline">
<div v-if="item.DeliveryMethodName && item.DeliveryMethodName!=''" class="express-send-box">
<span class="el-tag el-tag--small el-tag--light">{{item.DeliveryMethodName}}</span>
<span class="el-tag el-tag--small el-tag--light">{{item.DeliveryMethodName}}</span>
</div>
<el-tag v-if="item.PaymentTime==''" style="margin-left:5px" size="small" type="warning">未付款</el-tag>
<el-tag v-else style="margin-left:5px" size="small" type="warning">已付款</el-tag>
<el-tag v-if="item.DeliveryTime=='' && item.ReceivingTime==''" style="margin-left:5px" size="small" type="success">未发货</el-tag>
<el-tag v-if="item.DeliveryTime!='' && item.ReceivingTime==''" style="margin-left:5px" size="small" type="success">待发货</el-tag>
<el-tag v-if="item.ReceivingTime!=''" style="margin-left:5px" size="small" type="success">已收货</el-tag>
<el-tag v-if="item.ReceivingTime!=''" style="margin-left:5px" size="small" type="success">已完成</el-tag>
<el-tag v-if="item.OrderStatus==7" style="margin-left:5px" size="small" type="danger">已取消</el-tag>
</div>
</div>
</div>
......@@ -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>
......@@ -204,8 +205,8 @@
<el-checkbox style="margin-bottom:10px;width:135px" v-for="city in cities" :label="city.Id" :key="city.Name">{{city.Name}}</el-checkbox>
</el-checkbox-group>
</div>
</el-form>
</el-form>
<div style="text-align:right;margin-top:20px">
<el-button size="small" type="primary" @click="Export">导出</el-button>
</div>
......@@ -226,7 +227,7 @@ export default {
isIndeterminate: true,
addMsg:{},
dialogVisible:false,
activeName:'first',
msgVal:'',
dateList:[],
......@@ -306,7 +307,7 @@ export default {
this.msg.GoodsName=msgVal;
}
},
Export(){
this.msg.ExcelEnumIds=this.checkedCities;
let msg = JSON.parse(JSON.stringify(this.msg));
......@@ -324,7 +325,7 @@ export default {
data.forEach(item=>{
this.cityOptions.push(item.Id)
})
})
},
handleCheckAllChange(val) {
......@@ -341,7 +342,7 @@ export default {
this.msg.OrderType=dataId;
this.getList();
},
getList(){
this.ChangeId(this.msgId);
if(!this.msgVal || this.msgVal==''){
......@@ -365,7 +366,7 @@ export default {
let pageData=res.data.data.pageData;
this.tableData=pageData;
}
})
},
handleCurrentChange(val) {
......@@ -387,13 +388,13 @@ export default {
this.orderTypeList=res.data.data;
})
},
getplat(){
this.apipost("/api/user/GetMemberUserSourceEnumList",{}, res => {
this.platList=res.data.data;
})
},
},
};
</script>
......@@ -470,7 +471,7 @@ export default {
width: 15%;
text-align: center;
border-right: 1px solid #EBEEF5;
}
.app-order-list .goods-item .goods .app-order-goods-price {
height: 24px;
......
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