diff --git a/src/assets/scss/pages/resiAdd.scss b/src/assets/scss/pages/resiAdd.scss index 5b97e2246..a93875839 100644 --- a/src/assets/scss/pages/resiAdd.scss +++ b/src/assets/scss/pages/resiAdd.scss @@ -52,18 +52,18 @@ h5 { color:#ff5107 ; } } -.font-color-blue{ - ::v-deep .el-form-item__label{ - color:#3876f2; - position: relative; - &::before{ - content: '*'; - position: absolute; - top: 0px; - left: 16px; - } - } -} +// .font-color-blue{ +// ::v-deep .el-form-item__label{ +// color:#3876f2; +// position: relative; +// &::before{ +// content: '*'; +// position: absolute; +// top: 0px; +// left: 16px; +// } +// } +// } .font-color-blue2{ ::v-deep .el-form-item__label{ &::before{ diff --git a/src/views/components/addResi.vue b/src/views/components/addResi.vue index d51d3f3d4..3ca535131 100644 --- a/src/views/components/addResi.vue +++ b/src/views/components/addResi.vue @@ -162,7 +162,6 @@
- { + group.children.forEach((item) => { + if (item.check && !this.form[group.id][item.formName] ||this.form[group.id][item.formName].length === 0) { + this.$message.error(`${item.label}不能为空`); + throw new Error(`${item.label}不能为空`); + } + }); + }); + if (this.formType === 'add') { + this.form.id = this.form.partyOrgId; + } + // this.$emit('submitExpand', this.form, this.formType) }, handlePartyOrgCascadarChange(selectedNode) { this.form.parymemberInfoDto.partyOrgId = selectedNode[selectedNode.length - 1]; diff --git a/src/views/dataBoard/renfang/house/list.vue b/src/views/dataBoard/renfang/house/list.vue index 07579979b..b0b2502ca 100644 --- a/src/views/dataBoard/renfang/house/list.vue +++ b/src/views/dataBoard/renfang/house/list.vue @@ -178,7 +178,7 @@ export default { // this.displayedHouseId = item.houseId; // this.$router.push(`/homeDetails/index?id=${item.neighborHoodId}&buildingId=${item.buildingId}&unitId=${item.unitNumKey}`) console.log(item); - this.$router.push(`/dataBoard/overview/familyPortrait/?name=${item.neighborHoodName}-${item.houseName}&buId=${item.buildingId}&type=renfang&orgId=${this.org_id}&type_name=${this.typeName}&name2=${ this.tableTitle }`) + this.$router.push(`/dataBoard/overview/familyPortrait/?name=${item.neighborHoodName}-${item.houseName}&buId=${item.buildingId}&type=renfang&orgId=${this.org_id}&type_name=${this.typeName}&name2=${ this.tableTitle }&houseId=${item.houseId}`) }, diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue index ab56d17ca..45a12f1eb 100644 --- a/src/views/modules/home/index.vue +++ b/src/views/modules/home/index.vue @@ -165,12 +165,6 @@ {{scope.row.nonIntegratedNum}} - - - -