diff --git a/src/views/modules/base/migration/records/transferBuilding.vue b/src/views/modules/base/migration/records/transferBuilding.vue
index f81798456..4fcd918fb 100644
--- a/src/views/modules/base/migration/records/transferBuilding.vue
+++ b/src/views/modules/base/migration/records/transferBuilding.vue
@@ -14,6 +14,8 @@
:options="treeData"
:props="props"
style="width: 100%"
+ @change="handleChangeCascaderB"
+ ref="cascaderB"
/>
@@ -22,6 +24,8 @@
:options="treeData"
:props="props2"
style="width: 100%"
+ ref="cascaderV"
+ @change="handleChangeCascaderV"
/>
@@ -49,6 +53,9 @@ export default {
optionsG: [],
treeData: [],
autoOpenArr: [],
+ checkedBLevel:'',
+ checkedVLevel:'',
+ sourceId:'',
props: {
children: "children",
label: "label",
@@ -100,6 +107,17 @@ export default {
this.loadTree()
},
methods: {
+ handleChangeCascaderB(){
+ console.log(this.$refs.cascaderB.getCheckedNodes()[0]);
+ this.checkedBLevel = this.$refs.cascaderB.getCheckedNodes()[0].data.level;
+ this.form.subjectId = this.$refs.cascaderB.getCheckedNodes()[0].data.id;
+ this.sourceId = this.$refs.cascaderB.getCheckedNodes()[0].data.pid
+ },
+ handleChangeCascaderV(){
+ this.checkedVLevel = this.$refs.cascaderV.getCheckedNodes()[0].data.level;
+ this.form.targetId = this.$refs.cascaderV.getCheckedNodes()[0].data.id;
+ console.log(this.checkedVLevel);
+ },
async loadTree(isRefresh) {
const url = "/actual/base/communityBuilding/tree/initTree";
const {data, code, msg} = await requestGet(url);
@@ -107,7 +125,7 @@ export default {
this.treeData = [];
this.treeData.push(data);
// 默认加载第一层
-
+ data.children = null
this.autoOpenArr.push(data.id)
if (!isRefresh && data) {
this.selTreeObj = data;
@@ -129,18 +147,19 @@ export default {
},
submit() {
console.log(this.form.subjectId, 'form')
- if (this.form.subjectId.length < 6) {
+ console.log(this.checkedBLevel, 'this.checkedBLevel');
+ if (this.checkedBLevel != "building") {
this.$message.error('请选择迁出楼栋')
return
}
- if (this.form.targetId.length < 5) {
+ if (this.checkedVLevel!='neighborHood') {
this.$message.error('请选择迁入小区')
return
}
let params = {
- subjectId: this.form.subjectId[5],
- targetId: this.form.targetId[4],
- sourceId: this.form.targetId[4],
+ subjectId: this.form.subjectId,
+ targetId: this.form.targetId,
+ sourceId: this.sourceId,
}
let url = '/actual/base/baseDataTransfer/building/submit'
this.$http.post(url, params).then(res => {
diff --git a/src/views/modules/base/migration/records/transferCommunity.vue b/src/views/modules/base/migration/records/transferCommunity.vue
index db9d540f0..030f70c9f 100644
--- a/src/views/modules/base/migration/records/transferCommunity.vue
+++ b/src/views/modules/base/migration/records/transferCommunity.vue
@@ -12,8 +12,11 @@
@@ -21,6 +24,8 @@
v-model="form.targetId"
:options="treeData"
:props="props2"
+ ref="cascaderG"
+ @change="handleChangeCascaderG"
style="width: 100%"
/>
@@ -49,6 +54,9 @@ export default {
optionsG: [],
treeData: [],
autoOpenArr: [],
+ checkedGLevel:'',
+ sourceId:'',
+ checkedVLevel:'',
props: {
children: "children",
label: "label",
@@ -76,7 +84,6 @@ export default {
value: "id",
lazy: true,
async lazyLoad(node, resolve) {
-
const url = `/actual/base/communityBuilding/tree/nextTreeNode?id=${node.data.id}&level=${node.data.level}`;
const {data, code, msg} = await requestGet(url);
if (code === 0) {
@@ -100,14 +107,23 @@ export default {
this.loadTree()
},
methods: {
+ handleChangeCascaderG(){
+ this.checkedGLevel = this.$refs.cascaderG.getCheckedNodes()[0].data.level;
+ this.form.targetId = this.$refs.cascaderG.getCheckedNodes()[0].data.id;
+ },
+ handleChangeCascaderV(){
+ this.checkedVLevel = this.$refs.cascaderV.getCheckedNodes()[0].data.level;
+ this.form.subjectId = this.$refs.cascaderV.getCheckedNodes()[0].data.id;
+ this.sourceId = this.$refs.cascaderV.getCheckedNodes()[0].data.pid
+ },
async loadTree(isRefresh) {
const url = "/actual/base/communityBuilding/tree/initTree";
const {data, code, msg} = await requestGet(url);
if (code === 0) {
this.treeData = [];
+ data.children = null
this.treeData.push(data);
// 默认加载第一层
-
this.autoOpenArr.push(data.id)
if (!isRefresh && data) {
this.selTreeObj = data;
@@ -129,18 +145,18 @@ export default {
},
submit() {
console.log(this.form.subjectId, 'form')
- if (this.form.subjectId.length < 5) {
+ if (this.checkedVLevel!='neighborHood') {
this.$message.error('请选择迁出小区')
return
}
- if (this.form.targetId.length < 4) {
+ if (this.checkedGLevel!='grid') {
this.$message.error('请选择迁入网格')
return
}
let params = {
- subjectId: this.form.subjectId[4],
- targetId: this.form.targetId[3],
- sourceId: this.form.targetId[3],
+ subjectId: this.form.subjectId,
+ targetId: this.form.targetId,
+ sourceId: this.sourceId,
}
let url = '/actual/base/baseDataTransfer/quarter/submit'
this.$http.post(url, params).then(res => {