Browse Source

Merge branch 'dev-临时bug' into test

test
dai 3 years ago
parent
commit
b3a5f8b5ef
  1. 4
      src/views/modules/base/organization/organization.vue
  2. 4
      src/views/modules/renFangTongJi/index.vue

4
src/views/modules/base/organization/organization.vue

@ -1105,6 +1105,7 @@ export default {
// //
currentAgencyLevel: localStorage.getItem("level"), currentAgencyLevel: localStorage.getItem("level"),
currentAreaCode: "", currentAreaCode: "",
currentAreaCodeSwitch: "",
parentAreaCode: "", parentAreaCode: "",
parentAgencyId: localStorage.getItem("agencyId"), parentAgencyId: localStorage.getItem("agencyId"),
parentAgencyLevel: localStorage.getItem("level"), parentAgencyLevel: localStorage.getItem("level"),
@ -2238,6 +2239,7 @@ export default {
// //
this.currentAgencyLevel = data.level; this.currentAgencyLevel = data.level;
this.currentAreaCode = data.areaCode; this.currentAreaCode = data.areaCode;
this.currentAreaCodeSwitch = data.areaCodeSwitch;
if (data.parentList && data.parentList.length > 0) { if (data.parentList && data.parentList.length > 0) {
this.parentAreaCode = this.parentAreaCode =
data.parentList[data.parentList.length - 1].areaCode; data.parentList[data.parentList.length - 1].areaCode;
@ -2467,7 +2469,7 @@ export default {
parentAgencyId: this.currentAgencyId, parentAgencyId: this.currentAgencyId,
agencyName: this.agencyForm.agencyName, agencyName: this.agencyForm.agencyName,
level: this.agencyForm.level, level: this.agencyForm.level,
areaCodeSwitch: "closed", areaCodeSwitch: this.currentAreaCodeSwitch,
areaCode: this.agencyForm.areaCode, areaCode: this.agencyForm.areaCode,
areaName: this.agencyForm.areaName, areaName: this.agencyForm.areaName,
contacts: this.agencyForm.contacts, contacts: this.agencyForm.contacts,

4
src/views/modules/renFangTongJi/index.vue

@ -307,8 +307,8 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import "@/assets/scss/c/config"; @import "@/assets/scss/c/config.scss";
@import "@/assets/scss/c/function"; @import "@/assets/scss/c/function.scss";
.m-cards { .m-cards {
display: flex; display: flex;

Loading…
Cancel
Save