|
|
|
@ -161,7 +161,7 @@
|
|
|
|
|
header-align="center"
|
|
|
|
|
>
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<span>{{ componendDistrict("0" + scope.row.subdistrict) || '/' }}</span>
|
|
|
|
|
<span>{{ componendDistrict(scope.row.subdistrict) || '/' }}</span>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column
|
|
|
|
@ -483,20 +483,20 @@ export default {
|
|
|
|
|
// console.log('123')
|
|
|
|
|
if(Array.isArray(this.form.subdistrict)){
|
|
|
|
|
if(this.form.subdistrict.length == 2) {
|
|
|
|
|
this.subdistrict = this.form.subdistrict[1].slice(1, 11);
|
|
|
|
|
this.subdistrict = this.form.subdistrict[1].slice(0, 10);
|
|
|
|
|
obj = { ...this.pages, ...this.form,subdistrict:this.subdistrict };
|
|
|
|
|
} else if(this.form.subdistrict.length == 1) {
|
|
|
|
|
this.subdistrict = this.form.subdistrict[0].slice(1, 8);
|
|
|
|
|
this.subdistrict = this.form.subdistrict[0].slice(0, 7);
|
|
|
|
|
obj = { ...this.pages, ...this.form,subdistrict:this.subdistrict };
|
|
|
|
|
} else {
|
|
|
|
|
obj = {...this.pages,...this.form}
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
if(this.county){
|
|
|
|
|
let subdistrict = this.form.subdistrict.slice(1, 8);
|
|
|
|
|
let subdistrict = this.form.subdistrict.slice(0, 7);
|
|
|
|
|
obj = { ...this.pages, ...this.form,subdistrict };
|
|
|
|
|
} else {
|
|
|
|
|
let subdistrict = this.form.subdistrict.slice(1, 8);
|
|
|
|
|
let subdistrict = this.form.subdistrict.slice(0, 7);
|
|
|
|
|
obj = { ...this.pages, ...this.form,subdistrict };
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -506,7 +506,7 @@ export default {
|
|
|
|
|
// this.subdistrict = this.form.subdistrict.slice(1, 8);
|
|
|
|
|
// obj = { ...this.pages, ...this.form,subdistrict:this.subdistrict };
|
|
|
|
|
// } else if(this.dept.ancestors.split(',').length == 3){
|
|
|
|
|
this.subdistrict = this.form.subdistrict.slice(1, 11);
|
|
|
|
|
this.subdistrict = this.form.subdistrict.slice(0, 10);
|
|
|
|
|
obj = { ...this.pages, ...this.form,subdistrict:this.subdistrict };
|
|
|
|
|
// }
|
|
|
|
|
}
|
|
|
|
@ -540,9 +540,9 @@ export default {
|
|
|
|
|
this.$refs.mypagination.defaultPages();
|
|
|
|
|
// let obj = {...this.pages,...this.form}
|
|
|
|
|
if(this.dept.ancestors.split(',').length == 2){
|
|
|
|
|
this.subdistrict = this.workingArea.slice(1, 8);
|
|
|
|
|
this.subdistrict = this.workingArea.slice(0, 7);
|
|
|
|
|
} else if(this.dept.ancestors.split(',').length == 3){
|
|
|
|
|
this.subdistrict = this.form.subdistrict.slice(1, 11);
|
|
|
|
|
this.subdistrict = this.form.subdistrict.slice(0, 10);
|
|
|
|
|
}
|
|
|
|
|
this.getTable({...this.pages,...this.form,subdistrict:this.subdistrict});
|
|
|
|
|
},
|
|
|
|
@ -680,13 +680,13 @@ export default {
|
|
|
|
|
if(this.dept.ancestors.split(',').length == 2){
|
|
|
|
|
if(Array.isArray(this.form.subdistrict)) {
|
|
|
|
|
if(this.form.subdistrict.length == 2) {
|
|
|
|
|
this.subdistrict = this.form.subdistrict[1].slice(1, 11);
|
|
|
|
|
this.subdistrict = this.form.subdistrict[1].slice(0, 10);
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
this.subdistrict = this.form.subdistrict.slice(1, 8);
|
|
|
|
|
this.subdistrict = this.form.subdistrict.slice(0, 7);
|
|
|
|
|
}
|
|
|
|
|
} else if(this.dept.ancestors.split(',').length == 3){
|
|
|
|
|
this.subdistrict = this.form.subdistrict.slice(1, 11);
|
|
|
|
|
this.subdistrict = this.form.subdistrict.slice(0, 10);
|
|
|
|
|
}
|
|
|
|
|
// console.log(this.subdistrict,'this.subdistrict')
|
|
|
|
|
// console.log(this.form,'this.form')
|
|
|
|
|