diff --git a/src/utils/cascader.js b/src/utils/cascader.js index 8d7adbd..104ea14 100644 --- a/src/utils/cascader.js +++ b/src/utils/cascader.js @@ -31,8 +31,8 @@ export function collapse(arr, childName) { } export function getItemBySingleIdInCascader(arr, id, idName, childName) { - let collapseArr = collapse(arr); - return getItemByIdInCascader(collapseArr, [id], idName, childName); + let collapseArr = collapse(arr, childName); + return getItemByIdInCascader(collapseArr, [id], idName, childName)[0]; } export default { diff --git a/src/views/modules/lingshan/bmfw/bsdt/index.vue b/src/views/modules/lingshan/bmfw/bsdt/index.vue index f8704f5..fa920ae 100644 --- a/src/views/modules/lingshan/bmfw/bsdt/index.vue +++ b/src/views/modules/lingshan/bmfw/bsdt/index.vue @@ -74,9 +74,9 @@ export default { field: "所属组织", keyName: "orgId", type: "cascader", - optionUrl: "/gov/org/customeragency/agencygridtree", + optionUrl: "/gov/org/customeragency/agencygridtreeV2", optionUrlParams: { - agencyId: this.$store.state.user.agencyId, + customerId: this.$store.state.user.customerId, }, optionList: [], optionProps: { @@ -230,9 +230,9 @@ export default { field: "申请人所属组织", keyName: "applicantOrgId", type: "cascader", - optionUrl: "/gov/org/customeragency/agencygridtree", + optionUrl: "/gov/org/customeragency/agencygridtreeV2", optionUrlParams: { - agencyId: this.$store.state.user.agencyId, + customerId: this.$store.state.user.customerId, }, optionList: [], optionProps: { @@ -248,21 +248,20 @@ export default { }, supKeys: ["applicantOrgType"], supValues: [""], - handleChangeFn(val, item) { + handleChangeFn(val, item, that) { const { optionList } = item; if (val.length > 0) { - item["supValues"][0] = getItemBySingleIdInCascader( + let type = getItemBySingleIdInCascader( optionList, val, "agencyId", "subAgencyList" )["level"]; - item["supValues"][0] = - item["supValues"][0] == "grid" - ? "grid" - : "agency"; + type = type == "grid" ? "grid" : "agency"; + + that.fmData[item["supKeys"][0]] = type; } else { - item["supValues"][0] = ""; + that.fmData[item["supKeys"][0]] = ""; } }, rules: [