|
@@ -80,7 +80,6 @@ export default {
|
|
|
selected: {
|
|
|
handler(val, oval) {
|
|
|
let dif = _.difference(val, oval);
|
|
|
- let key = Object.keys(val[0]);
|
|
|
if (dif.length > 0) {
|
|
|
this.defaultProcess();
|
|
|
}
|
|
@@ -100,7 +99,7 @@ export default {
|
|
|
//处理直辖/省份
|
|
|
processProvince(val) {
|
|
|
//1对比出哪个是新选的,如果没有新选的,那就是取消
|
|
|
- let is_selected = this.selected.map(item => item.value); //将选择前的结果的value整理出来
|
|
|
+ let is_selected = this.selected.map(item => item.code); //将选择前的结果的value整理出来
|
|
|
let different = _.difference(val, is_selected); //对比出新选的value是哪个
|
|
|
if (different.length > 0) {
|
|
|
//新选的情况
|
|
@@ -115,7 +114,7 @@ export default {
|
|
|
this.$set(this, `selectList`, _.dropRight(this.selectList));
|
|
|
let code = '';
|
|
|
if (typeof haveCityList[0] === 'object') {
|
|
|
- code = haveCityList[0].value;
|
|
|
+ code = haveCityList[0].code;
|
|
|
} else {
|
|
|
code = haveCityList[0];
|
|
|
}
|
|
@@ -132,19 +131,19 @@ export default {
|
|
|
processCity() {
|
|
|
let newArr = [];
|
|
|
this.selectList.map(item => {
|
|
|
- let result = this.firstList.filter(fil => fil.value === item);
|
|
|
+ let result = this.firstList.filter(fil => fil.code === item);
|
|
|
if (result.length > 0) {
|
|
|
result.forEach(res => {
|
|
|
newArr.push(res);
|
|
|
});
|
|
|
} else {
|
|
|
- result = this.secondList.filter(fil => fil.value === item);
|
|
|
+ result = this.secondList.filter(fil => fil.code === item);
|
|
|
if (result.length > 0) {
|
|
|
result.forEach(res => {
|
|
|
newArr.push(res);
|
|
|
});
|
|
|
} else {
|
|
|
- result = this.displayList.filter(fil => fil.value === item);
|
|
|
+ result = this.displayList.filter(fil => fil.code === item);
|
|
|
if (result.length > 0) {
|
|
|
result.forEach(res => {
|
|
|
newArr.push(res);
|
|
@@ -158,23 +157,22 @@ export default {
|
|
|
//关闭标签方法
|
|
|
tagClose(val) {
|
|
|
//取消选择
|
|
|
- let leastList = this.selectList.filter(item => item !== val.value);
|
|
|
- let leastDisplayList = this.displayList.filter(item => item.value !== val.value);
|
|
|
+ let leastList = this.selectList.filter(item => item !== val.code);
|
|
|
+ let leastDisplayList = this.displayList.filter(item => item.code !== val.code);
|
|
|
this.$set(this, `selectList`, leastList);
|
|
|
this.disFilter(leastDisplayList);
|
|
|
},
|
|
|
//是不是直辖市
|
|
|
haveCity(item) {
|
|
|
- console.log(item);
|
|
|
- let value;
|
|
|
+ let code;
|
|
|
if (typeof item === 'object') {
|
|
|
- value = item.value;
|
|
|
+ code = item.code;
|
|
|
} else {
|
|
|
- value = item;
|
|
|
+ code = item;
|
|
|
}
|
|
|
- if (value === '110000' || value === '120000' || value === '310000' || value === '500000' || value === '810000' || value === '820000') {
|
|
|
+ if (code === '110000' || code === '120000' || code === '310000' || code === '500000' || code === '810000' || code === '820000') {
|
|
|
return false;
|
|
|
- } else if (value.indexOf('0000') > 0) {
|
|
|
+ } else if (code.indexOf('0000') > 0) {
|
|
|
return true;
|
|
|
} else {
|
|
|
return false;
|
|
@@ -191,9 +189,10 @@ export default {
|
|
|
//初始化处理
|
|
|
defaultProcess() {
|
|
|
//处理复选框
|
|
|
- let select = this.selected.filter(item => item.value !== undefined);
|
|
|
+ if (!_.isObject(this.selected)) return;
|
|
|
+ let select = this.selected.filter(item => item.code !== undefined);
|
|
|
if (select.length > 0) {
|
|
|
- let result = this.selected.map(item => item.value);
|
|
|
+ let result = this.selected.map(item => item.code);
|
|
|
this.$set(this, `selectList`, result);
|
|
|
//处理显示
|
|
|
this.$set(this, `displayList`, this.selected);
|
|
@@ -231,6 +230,8 @@ export default {
|
|
|
.firstMenu {
|
|
|
background: #c9cacf;
|
|
|
border: 1px solid #e7e8ec;
|
|
|
+ height: 15rem;
|
|
|
+ overflow-y: scroll;
|
|
|
}
|
|
|
/deep/.el-collapse-item__header {
|
|
|
height: 0;
|