Skip to content

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

区域购买和电子面单

parent b849a43c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1060 additions and 33 deletions
src/components/setup/addAddress.vue
View file @ f7460ec9
......@@ -17,12 +17,9 @@
<el-input v-model="msg.Mobile" placeholder="请输入联系方式"/>
</el-form-item>
<el-form-item label="省市区" prop="Mobile" class="is-required" >
<!--<el-cascader-->
<!--v-if="options.length>0"-->
<!--v-model="selectedOptions"-->
<!--:options="cascaderData"-->
<!--@change="handleChange"></el-cascader>-->
<el-form-item label="省市区" prop="position" class="is-required" >
<el-cascader v-model="msg.position" :placeholder="addressName" :options="provinceList" @active-item-change="handleItemChange" :props="props" style="width: 300px"></el-cascader>
</el-form-item>
......@@ -45,10 +42,10 @@
name: "addAddress",
data(){
return{
props:{
label:'Name',
value:'ID',
},
provinceList: [], //省市县列表
props: {value: 'value', children: 'cities'},
Name:[],
msg:{
ID:0,
......@@ -56,11 +53,13 @@
Mobile:'',
Address:'',
Remarks:'',
ProvinceId:11,
CityId:12,
DistrictId:3587,
ProvinceId:0,
CityId:0,
DistrictId:0,
position:[],
},
options:[],
addressName:'请选择',
cityindex:0,
rules:{
Name:[
......@@ -72,6 +71,9 @@
Address:[
{required: true, message: "请输入详细地址", trigger: "blur"}
],
position:[
{ type: 'array', required: true, message: '请选择省市区', trigger: 'change' }
],
}
}
},
......@@ -90,15 +92,20 @@
this.apipost("/api/MallBase/GetLogisticsDelivery",{'ID':ID} , res => {
if (res.data.resultCode == 1) {
this.msg =res.data.data
this.msg.position =[res.data.data.ProvinceId,res.data.data.CityId,res.data.data.DistrictId]
this.addressName = res.data.data.ProvinceName+'/'+res.data.data.CityName+'/'+res.data.data.DistrictName
} else {
this.Info(res.data.message);
}
})
},
preserve(formName){
this.msg.ProvinceId = this.msg.position[0];
this.msg.CityId = this.msg.position[1];
this.msg.DistrictId = this.msg.position[2];
this.$refs[formName].validate((valid) => {
if (valid) {
delete this.msg.position //删除position 不传到后台
this.apipost("/api/MallBase/AddOrUpdateLogisticsDelivery",this.msg , res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
......@@ -113,12 +120,59 @@
}
});
},
handleChange(value){
getPosition(val, cb) {
}
let vm = this; //查询省市县
let params = {};
if(!val) { //初始化加载 获取所有省份数据
params = {Id:2}
} else if (val.length === 1) { //加载二级 获取市级数据
params = {Id: val[0]}
} else { //加载3级 获取县级数据
params = {Id: val[1]}
}
this.apipost("/api/Destination/GetChildList",params , res => {
if (res.data.resultCode == 1) {
if(!val) { //初始化加载 查询省份数据
vm.provinceList = res.data.data.map((e) => {
return {value: e.ID, label: e.Name, cities: []}
});
} else if (val.length === 1) { //加载二级 查询该省下市级数据
vm.provinceList.map((item) => {
if(item.value === val[0]) {
item.cities = res.data.data.map((e) => {
return {value: e.ID, label: e.Name, cities: []}
})
}
})
} else { //加载3级 查询该省市下县级数据
vm.provinceList.map((item) => {
if(item.value === val[0]) {
item.cities.map((value) => {
if(value.value === val[1]){
value.cities = res.data.data.map((e) => {
return {value: e.ID, label: e.Name}
})
}
})
}
})
}
cb&&cb(res);
} else {
// this.Info(res.data.message);
}
})
},
handleItemChange (val) {
this.getPosition(val)
},
},
mounted(){
this.getNodes()
this.getPosition(null)
}
}
</script>
......@@ -135,4 +189,5 @@
height: 32px;
line-height: 32px
}
</style>
src/components/setup/addElectronFaceSheet.vue 0 → 100644
View file @ f7460ec9
This diff is collapsed.
src/components/setup/basicSetUp.vue
View file @ f7460ec9
This diff is collapsed.
src/components/setup/electronFaceSheet.vue 0 → 100644
View file @ f7460ec9
This diff is collapsed.
src/components/setup/regionBuy.vue 0 → 100644
View file @ f7460ec9
<template>
<div class="regionBuy">
<div class="el-card__header">
<span>区域允许购买</span>
</div>
<div id="pane-first">
<div class="form-box">
<el-form :model="msg" style="padding:0 50px;" :rules="rules" ref="msg" label-width="110px">
<el-form-item label="是否开启" class="is-required" >
<el-switch
:active-value="1"
:inactive-value="0"
v-model="msg.IsOpenMinPrice"
active-text=""
inactive-text="">
</el-switch>
</el-form-item>
<el-form-item label="允许购买区域" class="is-required" v-if="msg.IsOpenMinPrice==1">
<div class="gez_list el-card" v-if="msg.List.length>0">
<div style="width: 500px;" >
<div >区域：<span v-for="(item,index) in msg.List" :key="index" class="quyu">
{{item.RegionName}}</span>
</div> </div>
<div style="width: 110px;display: flex;flex-direction: row;justify-content: space-around">
<el-tooltip class="item" effect="dark" content="编辑" placement="top" >
<img src="../../assets/img/setup/edit.png" alt="" class="imgstyle" @click="edit()">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<img src="../../assets/img/setup/del.png" alt="" class="imgstyle" @click="delete_b()">
</el-tooltip>
</div>
</div>
<span style="color: #409EFF;font-size: 14px;cursor: pointer;" @click="addOf" v-if="msg.List.length==0">+新增规则</span>
</el-form-item>
</el-form>
</div>
<el-button type="primary" style="margin: 12px 0 " @click="preserve('msg')">保存</el-button>
</div>
<el-dialog title="新增规则" :visible.sync="dialogFormVisible" >
<el-form :model="msg" :rules="rules" ref="msg">
<el-form-item label="包邮地区" prop="List">
<region_Choice @event1="change($event)" ref="child"></region_Choice>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible = false">取 消</el-button>
<el-button type="primary" @click="Addto()">确 定</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import region_Choice from './view/regionChoice'
export default {
name: "regionBuy",
data(){
return{
msg:{
ID:0,
IsOpenMinPrice:0,
List:[],
},
dialogFormVisible:false,
List:[],
rules: {
},
isedit:false,
}
},
components:{
region_Choice,
},
methods:{
getAreaBuyInfo(){
this.apipost("/api/MallBase/GetAreaBuyInfo",{} , res => {
if (res.data.resultCode == 1) {
this.msg.IsOpenMinPrice = res.data.data.IsOpenMinPrice;
this.msg.List = res.data.data.List;
this.msg.ID = res.data.data.ID;
} else {
this.Info(res.data.message);
}
})
},
edit(){
this.dialogFormVisible=true;
setTimeout(()=>{
this.$refs.child.Receive(this.msg.List)
},1000)
} ,
delete_b(){
this.msg.List=[]
},
preserve(){
let msg = this.msg;
for(let i=0;i<msg.List.length;i++){
delete msg.List[i].GrandpaID;
delete msg.List[i].ParentID;
}
this.apipost("/api/MallBase/AddOrUpdateAreaBuy",msg , res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
} else {
this.Info(res.data.message);
}
})
},
Addto(){
this.dialogFormVisible=false
this.msg.List =this.List;
},
change(data){
this.List = data;
},
addOf(){
this.List=[]
this.dialogFormVisible=true;
this.isedit=false;//设置为编辑状态
setTimeout(()=>{
this.$refs.child.Receive(this.List)
},1000)
},
},
mounted(){
this.getAreaBuyInfo()
}
}
</script>
<style scoped>
.regionBuy .el-card__header{
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
background: #fff;
}
.regionBuy .form-box {
background: #fff;
padding: 20px 50% 20px 0;
margin-top: 10px;
}
.regionBuy .gez_list{
width: 650px;
margin-bottom: 12px;
padding: 20px;
border: 1px solid #EBEEF5;
background-color: #FFF;
color: #303133;
display: flex;
flex-direction: row;
justify-content: space-between;
}
.regionBuy .quyu{
background-color: #f4f4f5;
color: #909399;
padding: 10px;
line-height: 30px;
height: 30px;
font-size: 12px;
border-radius: 4px;
white-space: nowrap;
margin: 5px;
}
.regionBuy .imgstyle{
width: 32px;
height: 32px;
margin: 0 5px;
}
</style>
src/components/setup/returnAddressList.vue
View file @ f7460ec9
......@@ -69,6 +69,10 @@
</template>
</el-table-column>
</el-table>
<el-pagination style="text-align:right" background @current-change="handleCurrentChange"
v-if="list&&list.length>0" :current-page.sync="msg.pageIndex"
layout="total,prev, pager, next" :page-size="msg.pageSize" :total="total">
</el-pagination>
</div>
</div>
</template>
......@@ -131,6 +135,10 @@
},
address(){
this.$router.push('/addAddress');
},
handleCurrentChange(val){
this.msg.pageIndex = val;
this.getLogisticsDeliveryPage();
}
},
mounted(){
......
src/components/statistics/retailRanking.vue 0 → 100644
View file @ f7460ec9
<template>
<div class="retailRanking">
<div class="el-card__header">
<span>分销排行</span>
<div style="display: flex;flex-direction: row;align-items: center">
<el-button type="primary" class="el-button--small" @click="derive">导出全部</el-button>
</div>
</div>
<div class="content">
<div>
<el-select class="w100" @change="getList" style="margin-right: 10px;" v-model="msg.MemberGrade" size="small" placeholder="请选择">
<el-option label="全部平台" :value="0"></el-option>
<el-option
v-for="item in options"
:key="item.Id"
:label="item.Name"
:value="item.Id">
</el-option>
</el-select>
<div class="searchInput" style="width:250px">
<el-input style="display:inline-block;width:225px;height:30px"
placeholder="请输入分销商名称或ID搜索"
v-model="msg.Id"
size="small"
clearable>
</el-input>
<span @click="getList" class="el-icon-search" style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
</div>
<span style="color: #92959B;margin-left: 35px;cursor: pointer;font-size: 15px;" @click="empty">清空筛选</span>
</div>
</div>
</div>
</template>
<script>
export default {
name: "retailRanking",
data(){
return{
options:[],
msg:{
value:0,
neirong:'',
Name:''
}
}
},
created(){
this.getplat()
},
methods:{
getplat(){
this.apipost("/api/User/GetMemberUserSourceEnumList", {}, res => {
if(res.data.resultCode==1){
this.options = res.data.data
}
})
},
derive(){ //导出
},
empty(){
},
getList(){
}
},
mounted(){
}
}
</script>
<style>
.retailRanking .el-card__header{
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
background: #fff;
}
.retailRanking .el-card__header2{
display: flex;
flex-direction: row;
align-items: center;
background: #fff;
padding: 18px 20px;
}
.retailRanking .el-button--small{
padding: 9px 15px;
}
.retailRanking .content .searchInput{
border: 1px solid #DCDFE6;
border-radius: 4px;
}
.retailRanking .content .searchInput .el-input__inner{
border:none;outline:none;
height: 30px;
line-height: 30px;
}
.retailRanking .content .searchInput{
line-height: normal;
display: inline-table;
border-collapse: separate;
border-spacing: 0;
width:250px;
margin-right: 20px;
}
.retailRanking .content{
background: #fff;
margin-top:10px;
padding: 20px;
box-sizing: border-box;
}
</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