From 31a256905bfd6e2f3451b67ac52f472c8a1fc333 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 19 Jun 2024 11:42:06 +0800
Subject: [PATCH] 代码优化
---
subPackage/counterfraud/add.vue | 6 +-
subPackage/house/member/add.vue | 53 +++++++++++++++++++++-----
subPackage/label/formList.vue | 2
3 files changed, 46 insertions(+), 15 deletions(-)
diff --git a/subPackage/counterfraud/add.vue b/subPackage/counterfraud/add.vue
index 00e0689..2f76a2b 100644
--- a/subPackage/counterfraud/add.vue
+++ b/subPackage/counterfraud/add.vue
@@ -154,11 +154,11 @@
<u-input v-model="info.backblastPubPersonEntityList[index].name" border="none"
placeholderClass="f-28 c-99" inputAlign="right" placeholder="请输入姓名"></u-input>
</u-form-item>
- <u-form-item label="手机号" borderBottom required>
+ <u-form-item label="手机号" borderBottom>
<u-input v-model="info.backblastPubPersonEntityList[index].telephone" border="none"
placeholderClass="f-28 c-99" inputAlign="right" placeholder="请输入手机号"></u-input>
</u-form-item>
- <u-form-item label="身份证号" borderBottom required>
+ <u-form-item label="身份证号" borderBottom>
<u-input v-model="info.backblastPubPersonEntityList[index].idCard" type="idCard" border="none"
placeholderClass="f-28 c-99" inputAlign="right" placeholder="请输入身份证号"></u-input>
</u-form-item>
@@ -587,7 +587,7 @@
addType
} = res.data;
if (isJur == 1) {
- if (addType && addType != 4) {
+ if (addType) {
if (res.data.addressType) {
this.addressType = res.data.addressType
}
diff --git a/subPackage/house/member/add.vue b/subPackage/house/member/add.vue
index 0e849ce..37e6034 100644
--- a/subPackage/house/member/add.vue
+++ b/subPackage/house/member/add.vue
@@ -26,12 +26,12 @@
<u-form labelWidth="70" :model="form" :rules="rules" ref="form">
<view class="event-info">
- <u-form-item class="form-item" labelWidth="120" label="房屋" required prop="currentAddress"
+ <u-form-item class="form-item" labelWidth="60" label="房屋" required prop="currentAddress"
@click="isShowPopup = true">
<u--input v-if="!form.currentAddress" border="none" disabled disabledColor="#ffffff"
placeholder="请选择房屋">
</u--input>
- <u-textarea v-if="form.currentAddress" border="none" :disabled="true"
+ <u-textarea v-if="form.currentAddress" border="none" :disabled="true" :autoHeight="true"
disabledColor="#ffffff" v-model="form.currentAddress" placeholder="请选择房屋">
</u-textarea>
<u-icon slot="right" name="arrow-right"></u-icon>
@@ -44,6 +44,19 @@
</u--input>
<u-icon slot="right" name="arrow-right"></u-icon>
</u-form-item>
+
+ <u-form-item v-if="form.currentAddress" class="form-item" labelWidth="110" label="业主名称"
+ prop="gender">
+ <u--input border="none" v-model="form.houseName" disabled disabledColor="#ffffff">
+ </u--input>
+ </u-form-item>
+
+ <u-form-item v-if="form.currentAddress" class="form-item" labelWidth="110" label="业主电话"
+ prop="gender">
+ <u--input border="none" v-model="form.housePhone" disabled disabledColor="#ffffff">
+ </u--input>
+ </u-form-item>
+
</view>
</u-form>
@@ -109,7 +122,8 @@
getHouseholdDetail,
saveOrUpdateHousehold,
removeHousehold,
- saveOrUpdateHouseholdBatch
+ saveOrUpdateHouseholdBatch,
+ fetchHousehold
} from '@/api/house/household.js'
import {
bizDictionary
@@ -374,7 +388,7 @@
},
onShow() {
- console.log(this.form);
+ // console.log(this.form);
if (this.id) {
// this.getHouseholdInfo()
this.getHoldLabel();
@@ -399,13 +413,13 @@
roleName: uni.getStorageSync("activeRole").roleName,
addressCode: code || uni.getStorageSync("siteInfo").houseCode,
}).then(res => {
- console.log(res);
+ // console.log(res);
if (type) {
if (res.data.isJur = 1) {
this.houseCode = code;
this.homeRegion = res.data.townStreetName;
this.form.currentAddress = res.data.addressName;
- console.log("===>", this.getHouseRegion(res.data.townStreetName));
+ // console.log("===>", this.getHouseRegion(res.data.townStreetName));
this.form.homeAdcode = this.getHouseRegion(res.data.townStreetName).code;
this.homeIndex = this.getHouseRegion(res.data.townStreetName).index;
if (res.data.userHouseLabelVOList.length) {
@@ -423,9 +437,10 @@
this.houseCode = code;
this.homeRegion = res.data.townStreetName;
this.form.currentAddress = res.data.addressName;
- console.log("===>", this.getHouseRegion(res.data.townStreetName));
+ // console.log("===>", this.getHouseRegion(res.data.townStreetName));
this.form.homeAdcode = this.getHouseRegion(res.data.townStreetName).code;
this.homeIndex = this.getHouseRegion(res.data.townStreetName).index;
+ this.getFetchHousehold(code)
if (res.data.userHouseLabelVOList.length) {
this.houseTag = res.data.userHouseLabelVOList[0].labelName
}
@@ -493,7 +508,7 @@
getRegionList() {
select(361102).then(res => {
- console.log(res);
+ // console.log(res);
if (res.code == 200) {
this.regionList = res.data;
}
@@ -503,13 +518,13 @@
getRegionTree(callback) {
regionTree().then(res => {
- console.log("region ==>", res.data)
+ // console.log("region ==>", res.data)
callback(res.data);
})
},
regionSelect(e) {
- console.log(e);
+ // console.log(e);
const [result] = e.value;
this.homeIndex = e.indexs[0];
this.homeRegion = result.name;
@@ -653,6 +668,21 @@
}
})
},
+ // 查询住户
+ getFetchHousehold(houseCode) {
+ fetchHousehold({
+ houseCode: houseCode,
+ relationship: 1
+ }).then((res) => {
+ // console.log("********************" + JSON.stringify(res))
+ if (res.data.length > 0) {
+ let datas = res.data[0]
+ console.log("********************" + JSON.stringify(datas))
+ this.form.houseName = datas.name
+ this.form.housePhone = datas.phoneNumber
+ }
+ })
+ },
// 显示选择弹框
showSelectBus(title, key) {
@@ -680,7 +710,7 @@
})
},
handleData(res) {
- console.log("-----------" + res)
+ // console.log("-----------" + res)
if (res) {
this.saveOrUpdate();
}
@@ -852,6 +882,7 @@
if (i.userHouseLabelVOList.length) {
this.houseTag = i.userHouseLabelVOList[0].labelName;
}
+ this.getFetchHousehold(i.houseCode)
this.isShowPopup = false;
},
diff --git a/subPackage/label/formList.vue b/subPackage/label/formList.vue
index 7528889..dba52e3 100644
--- a/subPackage/label/formList.vue
+++ b/subPackage/label/formList.vue
@@ -47,7 +47,7 @@
getLabelReportingList({
userId: uni.getStorageSync("userInfo").user_id,
current: this.currentPage,
- houseCode: uni.getStorageSync("curHouseCode"),
+ houseCode: uni.getStorageSync("siteInfo").houseCode,
size: 10,
reportType: 3
// eventType: type
--
Gitblit v1.9.3