Commit 019ee4fd authored by zhangjianguo's avatar zhangjianguo

修改样式

parent 13badf5f
...@@ -29,13 +29,35 @@ ...@@ -29,13 +29,35 @@
height: 32px; height: 32px;
margin: 0 5px; margin: 0 5px;
} }
.addFreightRule .quyu{
background-color: #f4f4f5;
color: #909399;
padding: 10px;
line-height: 30px;
height: 30px;
font-size: 12px;
border-radius: 4px;
white-space: nowrap;
margin: 5px;
}
.addFreightRule .xie{
margin: 0 5px;
}
</style> </style>
<template> <template>
<div class="addFreightRule"> <div class="addFreightRule">
<div class="form-box">
<div>
<span style="color: rgb(64, 158, 255);cursor: pointer;margin-left: 20px" @click="cancel">运费规则</span>
<span style="margin: 0 5px;color: #C0C4CC;">/</span>
<span>添加规则</span>
</div>
</div>
<div id="pane-first"> <div id="pane-first">
<div class="form-box"> <div class="form-box">
<el-form :model="msg" style="padding:0 50px;" :rules="rules" ref="msg" label-width="90px"> <el-form :model="msg" style="padding:0 50px;" :rules="rules" ref="msg" label-width="90px">
<el-form-item label="规则名称" prop="MallName" class="is-required"> <el-form-item label="规则名称" prop="RulesName" class="is-required">
<el-input v-model="msg.RulesName"/> <el-input v-model="msg.RulesName"/>
</el-form-item> </el-form-item>
<el-form-item label="计费方式"> <el-form-item label="计费方式">
...@@ -47,14 +69,18 @@ ...@@ -47,14 +69,18 @@
<el-form-item label="运费规则" class="is-required"> <el-form-item label="运费规则" class="is-required">
<div class="gez_list el-card" v-for="(item,index) in msg.Detail" :key="index"> <div class="gez_list el-card" v-for="(item,index) in msg.Detail" :key="index">
<div style="width: 500px;"> <div style="width: 500px;">
<span>首重/件(克/个):{{item.First}} <span>/</span> 首费(元):{{item.FirstPrice}} <span>/</span>续重/件(克/个):{{item.Second}}<span>/</span>续费(元){{item.SecondPrice}}</span> <span>首重/件(克/个):{{item.First}} <span class="xie">/</span> 首费(元):{{item.FirstPrice}} <span class="xie">/</span>续重/件(克/个):{{item.Second}}<span class="xie">/</span>续费(元){{item.SecondPrice}}</span>
<div>区域:<span v-for="(item2,index2) in item.List" :key="index2" class="quyu">
{{item2.RegionName}}</span>
</div>
</div> </div>
<div style="width: 110px;display: flex;flex-direction: row;justify-content: space-around"> <div style="width: 110px;display: flex;flex-direction: row;justify-content: space-around">
<el-tooltip class="item" effect="dark" content="编辑" placement="top" > <el-tooltip class="item" effect="dark" content="编辑" placement="top" >
<img src="../../assets/img/setup/edit.png" alt="" class="imgstyle"> <img src="../../assets/img/setup/edit.png" alt="" class="imgstyle" @click="edit(index,item)">
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top"> <el-tooltip class="item" effect="dark" content="删除" placement="top">
<img src="../../assets/img/setup/del.png" alt="" class="imgstyle" @click="delete_b"> <img src="../../assets/img/setup/del.png" alt="" class="imgstyle" @click="delete_b(index)">
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
...@@ -70,34 +96,34 @@ ...@@ -70,34 +96,34 @@
<!--新增规则弹窗--> <!--新增规则弹窗-->
<el-dialog title="新增规则" :visible.sync="dialogFormVisible" > <el-dialog title="新增规则" :visible.sync="dialogFormVisible" >
<el-form :model="Detail" :rules="rules"> <el-form :rules="rules">
<el-row :gutter="0"> <el-row :gutter="0">
<el-col :span="11"> <el-col :span="11" >
<el-form-item label="首重(克):" label-width="100px" style="padding: 0px 1rem;" prop="MallName2"> <el-form-item label="首重(克):" label-width="100px" style="padding: 0px 1rem;" prop="First">
<el-input v-model="Detail.First" /> <el-input v-model="First" step="1" min="0" onkeyup="this.value= this.value.match(/\d+(\.\d{0,2})?/) ? this.value.match(/\d+(\.\d{0,2})?/)[0] : ''" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11"> <el-col :span="11">
<el-form-item label="首费(元)" label-width="100px" style="padding: 0px 1rem;" > <el-form-item label="首费(元)" label-width="100px" style="padding: 0px 1rem;" prop="FirstPrice">
<el-input v-model="Detail.FirstPrice" /> <el-input v-model="FirstPrice" step="1" min="0" onkeyup="this.value= this.value.match(/\d+(\.\d{0,2})?/) ? this.value.match(/\d+(\.\d{0,2})?/)[0] : ''" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="0"> <el-row :gutter="0">
<el-col :span="11"> <el-col :span="11">
<el-form-item label="续重(克):" label-width="100px" style="padding: 0px 1rem;" > <el-form-item label="续重(克):" label-width="100px" style="padding: 0px 1rem;" prop="Second">
<el-input v-model="Detail.Second" /> <el-input v-model="Second" step="1" min="0" onkeyup="this.value= this.value.match(/\d+(\.\d{0,2})?/) ? this.value.match(/\d+(\.\d{0,2})?/)[0] : ''" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11"> <el-col :span="11">
<el-form-item label="续费(元)" label-width="100px" style="padding: 0px 1rem;" > <el-form-item label="续费(元)" label-width="100px" style="padding: 0px 1rem;" prop="SecondPrice">
<el-input v-model="Detail.SecondPrice" /> <el-input v-model="SecondPrice" step="1" min="0" onkeyup="this.value= this.value.match(/\d+(\.\d{0,2})?/) ? this.value.match(/\d+(\.\d{0,2})?/)[0] : ''" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-form-item label="地区选择"> <el-form-item label="地区选择">
<region_Choice @event1="change($event)"></region_Choice> <region_Choice @event1="change($event)" :List="List" ref="child"></region_Choice>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
...@@ -117,32 +143,43 @@ ...@@ -117,32 +143,43 @@
msg:{ msg:{
ID:0, ID:0,
RulesName:'', RulesName:'',
// jifei:1,
ChargeMode:1, ChargeMode:1,
Detail:[], Detail:[],
}, },
First:0,
FirstPrice:0,
Second:0,
SecondPrice:0,
List:[],
Detail:{ isedit:false,
ID:0, editindex:0,
First:0,
FirstPrice:0,
Second:0,
SecondPrice:0,
List:[],
},
dialogFormVisible:false, dialogFormVisible:false,
rules: { rules: {
MallName: [ RulesName: [
{required: true, message: "请输入规则名称", trigger: "blur"} {required: true, message: "请输入规则名称", trigger: "blur"}
], ],
MallName2: [ First:[
{required: true, message: "请输入规则名称", trigger: "blur"} { validator: this.isNumber, trigger: 'blur' }
],
FirstPrice:[
{ validator: this.isNumber, trigger: 'blur' }
],
Second:[
{ validator: this.isNumber, trigger: 'blur' }
],
SecondPrice:[
{ validator: this.isNumber, trigger: 'blur' }
], ],
}, },
} }
}, },
created(){
if(this.$route.query.ID){
this.getLogisticsRules(this.$route.query.ID)
}
},
components:{ components:{
region_Choice, region_Choice,
}, },
...@@ -150,17 +187,24 @@ ...@@ -150,17 +187,24 @@
cancel(){ cancel(){
this.$router.go(-1);//返回上一层 this.$router.go(-1);//返回上一层
}, },
preserve(){
},
addRule(){ addRule(){
},
getLogisticsRules(ID){//编辑时获取详情数据
this.apipost("/api/MallBase/GetLogisticsRules",{'ID':ID} , res => {
if (res.data.resultCode == 1) {
this.msg =res.data.data
} else {
this.Info(res.data.message);
}
})
}, },
change(data){ change(data){
let List=[]; let List=[];
for(let i=0 ;i<data.length;i++){ for(let i=0 ;i<data.length;i++){
if(data[i].ischeckAll==true && data[i].indeterminate==false){ //全选的情况 只穿省的ID if(data[i].ischeckAll==true && data[i].indeterminate==false){ //全选的情况 只穿省的ID
List.push({'ID':0,'RegionId':data[i].ID}) List.push({'ID':0,'RegionId':data[i].ID,"RegionName":data[i].Name,'GrandpaID':0,'ParentID':0})
} }
if(data[i].indeterminate==true){//传市的ID if(data[i].indeterminate==true){//传市的ID
...@@ -168,14 +212,14 @@ ...@@ -168,14 +212,14 @@
let citylist = data[i].cityList; let citylist = data[i].cityList;
for(let j= 0;j<citylist.length;j++){ for(let j= 0;j<citylist.length;j++){
if(citylist[j].ischeckAll==true && citylist[j].indeterminate==false){ if(citylist[j].ischeckAll==true && citylist[j].indeterminate==false){
List.push({'ID':0,'RegionId':citylist[j].ID}) List.push({'ID':0,'RegionId':citylist[j].ID,"RegionName":citylist[j].Name,'GrandpaID':0,'ParentID':data[i].ID})
} }
if(citylist[j].indeterminate==true){ if(citylist[j].indeterminate==true){
if(citylist[j].hasOwnProperty('areaList')==true){ if(citylist[j].hasOwnProperty('areaList')==true){
let areaList = citylist[j].areaList; let areaList = citylist[j].areaList;
for(let z= 0;z<areaList.length;z++){ for(let z= 0;z<areaList.length;z++){
if(areaList[z].ischeckAll==true){ if(areaList[z].ischeckAll==true){
List.push({'ID':0,'RegionId':areaList[z].ID}) List.push({'ID':0,'RegionId':areaList[z].ID,"RegionName":areaList[z].Name,'GrandpaID':data[i].ID,'ParentID':citylist[j].ID})
} }
} }
} }
...@@ -186,41 +230,100 @@ ...@@ -186,41 +230,100 @@
} }
} }
} }
this.Detail.List = List
this.List = List;
},
delete_b(index){
this.msg.Detail.splice(index,1)
}, },
delete_b(){ edit(index,data){
this.isedit=true;//设置为编辑状态
this.editindex=index;//编辑的索引
this.First=data.First;
this.FirstPrice=data.FirstPrice;
this.Second=data.Second;
this.SecondPrice=data.SecondPrice;
this.List=data.List;
this.dialogFormVisible=true;
setTimeout(()=>{
this.$refs.child.Receive(this.List)
},1000)
}, },
addOf(){ addOf(){
this.Detail.First=0; this.First=0;
this.Detail.FirstPrice=0; this.FirstPrice=0;
this.Detail.Second=0; this.Second=0;
this.Detail.SecondPrice=0; this.SecondPrice=0;
this.Detail.List=[]; this.List=[];
this.dialogFormVisible=true this.dialogFormVisible=true
setTimeout(()=>{
this.$refs.child.Receive(this.List)
},1000)
}, },
Addto(){ Addto(){
this.dialogFormVisible=false this.dialogFormVisible=false
this.Detail.First=parseInt(this.Detail.First);
this.Detail.FirstPrice=parseInt(this.Detail.FirstPrice);
this.Detail.Second=parseInt(this.Detail.Second);
this.Detail.SecondPrice=parseInt(this.Detail.SecondPrice);
this.msg.Detail.push(this.Detail)
let First = parseInt(this.First);
let FirstPrice = parseInt(this.FirstPrice);
let Second = parseInt(this.Second);
let SecondPrice = parseInt(this.SecondPrice);
let Detail = {
'ID':0,
'First':First,
'FirstPrice':FirstPrice,
'Second':Second,
'SecondPrice':SecondPrice,
'List':this.List,
}
if( this.isedit==true){
this.msg.Detail[this.editindex] =Detail;
this.isedit=false //编辑之后复原
}else {
this.msg.Detail.push(Detail)
}
}, },
preserve(){ preserve(){
this.apipost("/api/MallBase/AddOrUpdateLogisticsRules",this.msg , res => { this.apipost("/api/MallBase/AddOrUpdateLogisticsRules",this.msg , res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.$router.push({
name: 'ruleSetup',
query: {
activeName:'second',
blank: "y"
}
});
} else { } else {
this.Info(res.data.message); this.Info(res.data.message);
} }
}) })
} },
isNumber(rule, value, callback) {
if (value === '') {
return callback();
} //这是用来判断如果不是必须输入的,则直接跳出
const r = /^[0-9]*$/; // 正整数
// 如果判断不符合正则,则不是正整数不能提交
if (!r.test(value)) {
return callback(new Error('请输入数字'));
} else {
return callback();
}
},
}, },
} }
</script> </script>
......
...@@ -1051,7 +1051,7 @@ ...@@ -1051,7 +1051,7 @@
} }
this.apipost("/api/MallBase/AddOrUpdateMallBase", this.msg, res => { this.apipost("/api/MallBase/AddOrUpdateMallBase", this.msg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.Info(res.data.message); this.Success(res.data.message);
} else { } else {
this.Info(res.data.message); this.Info(res.data.message);
......
...@@ -34,6 +34,11 @@ ...@@ -34,6 +34,11 @@
activeName: 'first' activeName: 'first'
} }
}, },
created(){
if(this.$route.query.activeName){
this.activeName = this.$route.query.activeName
}
},
components:{ components:{
vlogistics, vlogistics,
freight freight
......
...@@ -61,10 +61,10 @@ ...@@ -61,10 +61,10 @@
width="180"> width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip class="item" effect="dark" content="编辑" placement="top" > <el-tooltip class="item" effect="dark" content="编辑" placement="top" >
<img src="../../../assets/img/setup/edit.png" alt="" class="imgstyle"> <img src="../../../assets/img/setup/edit.png" alt="" class="imgstyle" @click="Edit(scope.row)">
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top"> <el-tooltip class="item" effect="dark" content="删除" placement="top" >
<img src="../../../assets/img/setup/del.png" alt="" class="imgstyle"> <img src="../../../assets/img/setup/del.png" alt="" class="imgstyle" @click="delete_b(scope.row)">
</el-tooltip> </el-tooltip>
</template> </template>
</el-table-column> </el-table-column>
...@@ -113,6 +113,34 @@ ...@@ -113,6 +113,34 @@
}, },
addRule(){ addRule(){
this.$emit("AddRule",); this.$emit("AddRule",);
},
Edit(row){
this.$router.push({
name: 'addFreightRule',
query: {
ID:row.ID,
blank: "y"
}
});
},
delete_b(row){//删除按钮
let that=this;
that.Confirm("是否删除?", function () {
that.apipost(
"/api/MallBase/DelRules",
{Id:row.ID},
res => {
if (res.data.resultCode == 1) {
that.Success(res.data.message);
that.GetLogisticsRulesPage();
} else {
that.Error(res.data.message);
}
},
null
);
});
} }
}, },
mounted(){ mounted(){
......
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
this.apipost("/api/MallBase/AddOrUpdateLogistics", this.msg, res => { this.apipost("/api/MallBase/AddOrUpdateLogistics", this.msg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.Info(res.data.message); this.Success(res.data.message);
} else { } else {
this.Info(res.data.message); this.Info(res.data.message);
......
<template> <template>
<div class="regionChoice"> <div class="regionChoice" v-loading="loading">
<div class="item"> <div class="item">
<div class="item_b" v-for="(item,index) in regionList" :key="index"> <div class="item_b" v-for="(item,index) in regionList" :key="index">
<el-checkbox :indeterminate="item.indeterminate" v-model="item.ischeckAll" @change="handleCheckAllChange(index,item.ID,$event)" > </el-checkbox> <el-checkbox :indeterminate="item.indeterminate" v-model="item.ischeckAll" @change="handleCheckAllChange(index,item.ID,$event)" > </el-checkbox>
...@@ -26,6 +26,10 @@ ...@@ -26,6 +26,10 @@
<script> <script>
export default { export default {
name: "regionChoice", name: "regionChoice",
props: {
List: Array,
required: true
},
data(){ data(){
return{ return{
regionList:[], regionList:[],
...@@ -39,16 +43,29 @@ ...@@ -39,16 +43,29 @@
cityList:[], cityList:[],
areaList:[], areaList:[],
loading:false,
getlist:[],
} }
}, },
methods:{ methods:{
getprovince(){ getprovince(){
let getlist = this.getlist
this.apipost("/api/Destination/GetChildList",this.msg , res => { this.apipost("/api/Destination/GetChildList",this.msg , res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let data = res.data.data; let data = res.data.data;
for(let i=0;i<data.length;i++){ for(let i=0;i<data.length;i++){
data[i].ischeckAll=false; data[i].ischeckAll=false;
data[i].indeterminate=false; data[i].indeterminate=false;
for(let j=0;j<getlist.length;j++){
if(getlist[j].GrandpaID==data[i].ID || getlist[j].ParentID==data[i].ID){ //如果有着2个参数再 他的子级没选择完全
data[i].indeterminate=true;
}
if(getlist[j].RegionId==data[i].ID){
data[i].ischeckAll=true;
data[i].indeterminate=false;
this.getCitylist(true)
}
}
} }
this.regionList = data; this.regionList = data;
this.cityID = data[this.provinceindex].ID this.cityID = data[this.provinceindex].ID
...@@ -59,17 +76,46 @@ ...@@ -59,17 +76,46 @@
}) })
}, },
getCitylist(type=false){ getCitylist(type=false){
let getlist =this.getlist
console.log()
this.apipost("/api/Destination/GetChildList",{'Id':this.cityID} , res => { this.apipost("/api/Destination/GetChildList",{'Id':this.cityID} , res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let data = res.data.data; let data = res.data.data;
this.areaID = data[this.cityindex].ID
for(let i=0;i<data.length;i++){ for(let i=0;i<data.length;i++){
if(type==true){ if(getlist.length>0){
data[i].ischeckAll=true; for(let j=0;j<getlist.length;j++){
data[i].indeterminate=false; if(type==true){
}else { data[i].ischeckAll=true;
data[i].ischeckAll=false; data[i].indeterminate=false;
data[i].indeterminate=false; }else {
} if(getlist[j].RegionId==this.cityID){ //父 勾选
data[i].ischeckAll=true;
data[i].indeterminate=false;
}else if(getlist[j].ParentID==data[i].ID){
data[i].ischeckAll=false;
data[i].indeterminate=true;
}else if(getlist[j].RegionId==data[i].ID){//如果自己身相等
data[i].ischeckAll=true;
data[i].indeterminate=false;
}else {
data[i].ischeckAll=false;
data[i].indeterminate=false;
}
}
}
}else {
if(type==true){
data[i].ischeckAll=true;
data[i].indeterminate=false;
}else {
data[i].ischeckAll=false;
data[i].indeterminate=false;
}
}
} }
let regionList = this.regionList let regionList = this.regionList
...@@ -79,7 +125,6 @@ ...@@ -79,7 +125,6 @@
} }
} }
this.cityList = regionList[this.provinceindex].cityList this.cityList = regionList[this.provinceindex].cityList
this.areaID = data[this.cityindex].ID
this.getareaIDlist(type) this.getareaIDlist(type)
} else { } else {
this.Info(res.data.message); this.Info(res.data.message);
...@@ -87,15 +132,40 @@ ...@@ -87,15 +132,40 @@
}) })
}, },
getareaIDlist(type=false){ getareaIDlist(type=false){
let getlist =this.getlist
this.apipost("/api/Destination/GetChildList",{'Id':this.areaID} , res => { this.apipost("/api/Destination/GetChildList",{'Id':this.areaID} , res => {
this.loading= false
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let data = res.data.data; let data = res.data.data;
for(let i=0;i<data.length;i++){ for(let i=0;i<data.length;i++){
if(type==true){ if(getlist.length>0){
data[i].ischeckAll=true; for(let j=0;j<getlist.length;j++){
if(type==true){
data[i].ischeckAll=true;
}else {
if(getlist[j].RegionId==this.cityID){
data[i].ischeckAll=true;
}else if(getlist[j].RegionId==data[i].ID){
data[i].ischeckAll=true;
}else {
data[i].ischeckAll=false;
}
}
}
}else { }else {
data[i].ischeckAll=false; if(type==true){
} } data[i].ischeckAll=true;
}else {
data[i].ischeckAll=false;
}
}
}
let regionList = this.regionList; let regionList = this.regionList;
for(let i=0;i<regionList.length;i++){ for(let i=0;i<regionList.length;i++){
if(regionList[i].ID== this.cityID){ if(regionList[i].ID== this.cityID){
...@@ -133,7 +203,7 @@ ...@@ -133,7 +203,7 @@
this.cityList = cityList this.cityList = cityList
let areaList = this.cityList[this.cityindex].areaList let areaList = this.cityList[this.cityindex].areaList
for(let i=0;i<areaList.length;i++){ for(let i=0;i<areaList.length;i++){
areaList[i].ischeckAll=true areaList[i].ischeckAll=false
} }
this.areaList = areaList this.areaList = areaList
...@@ -152,8 +222,6 @@ ...@@ -152,8 +222,6 @@
} }
} }
this.toParent() this.toParent()
}, },
showcity(index, id){ showcity(index, id){
...@@ -172,29 +240,40 @@ ...@@ -172,29 +240,40 @@
let regionList = this.regionList; let regionList = this.regionList;
this.cityindex = index; this.cityindex = index;
this.areaID = id; this.areaID = id;
if(regionList[this.provinceindex].cityList[index].hasOwnProperty('areaList')==false){//没有子级的时候加载
this.getareaIDlist()
}else {
this.areaList = regionList[this.provinceindex].cityList[index].areaList;
}
//取消自己的勾的时候父级的勾改变 //取消自己的勾的时候父级的勾改变
let areaList = regionList[this.provinceindex].cityList[index].areaList; let areaList = regionList[this.provinceindex].cityList[index].areaList;
if(e==false){ if(e==false){
if(regionList[this.provinceindex].cityList[index].hasOwnProperty('areaList')==false){
this.getareaIDlist()
}else {
this.areaList = regionList[this.provinceindex].cityList[index].areaList;
}
regionList[this.provinceindex].indeterminate=true; regionList[this.provinceindex].indeterminate=true;
regionList[this.provinceindex].ischeckAll=false;
if(areaList!=undefined){ if(areaList!=undefined){
for(let i=0;i<areaList.length;i++){ for(let i=0;i<areaList.length;i++){
areaList[i].ischeckAll=false areaList[i].ischeckAll=false;
} }
regionList[this.provinceindex].cityList[index].indeterminate=false regionList[this.provinceindex].cityList[index].indeterminate=false
} }
}else { }else {
if(regionList[this.provinceindex].cityList[index].hasOwnProperty('areaList')==false){
this.getareaIDlist(true)
}else {
this.areaList = regionList[this.provinceindex].cityList[index].areaList;
}
regionList[this.provinceindex].indeterminate=true;
regionList[this.provinceindex].ischeckAll=false;
let all=true; let all=true;
let cityList = this.regionList[this.provinceindex].cityList; let cityList = this.regionList[this.provinceindex].cityList;
this.regionList[this.provinceindex].indeterminate=true;
if(cityList!=undefined){ if(cityList!=undefined){
for(let i=0;i<cityList.length;i++){ for(let i=0;i<cityList.length;i++){
if(cityList[i].ischeckAll==false){ if(cityList[i].ischeckAll==false){
all=false all=false
} }
...@@ -240,6 +319,7 @@ ...@@ -240,6 +319,7 @@
regionList[this.provinceindex].cityList[this.cityindex].indeterminate=true regionList[this.provinceindex].cityList[this.cityindex].indeterminate=true
}else { }else {
regionList[this.provinceindex].indeterminate=true
regionList[this.provinceindex].cityList[this.cityindex].indeterminate=true regionList[this.provinceindex].cityList[this.cityindex].indeterminate=true
let areaList= regionList[this.provinceindex].cityList[this.cityindex].areaList; let areaList= regionList[this.provinceindex].cityList[this.cityindex].areaList;
...@@ -270,9 +350,19 @@ ...@@ -270,9 +350,19 @@
}, },
toParent(){//传值给父组件 toParent(){//传值给父组件
this.$emit('event1', this.regionList) this.$emit('event1', this.regionList)
},
Receive(val){
console.log('进入')
this.regionList = [];
this.loading=true;
this.cityindex=0,
this.areaindex=0,
this.getlist= val;
setTimeout(()=>{
this.getprovince()
},100)
} }
}, },
mounted(){ mounted(){
......
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