From ec1918a1e0fb98e3e74430af3ba39ae0d60f8b4a Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Tue, 24 May 2022 15:21:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=80=A7=E5=88=AB=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/plugins/change/changedeath.vue | 10 +++++++++- src/views/modules/plugins/change/changerelocation.vue | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/views/modules/plugins/change/changedeath.vue b/src/views/modules/plugins/change/changedeath.vue index 9b02a8f9d..57c8fdeba 100644 --- a/src/views/modules/plugins/change/changedeath.vue +++ b/src/views/modules/plugins/change/changedeath.vue @@ -84,7 +84,15 @@ - + + + diff --git a/src/views/modules/plugins/change/changerelocation.vue b/src/views/modules/plugins/change/changerelocation.vue index bbad8d18b..2c917a4ed 100644 --- a/src/views/modules/plugins/change/changerelocation.vue +++ b/src/views/modules/plugins/change/changerelocation.vue @@ -182,7 +182,15 @@ - + + + From 438d2195b7d5ef9156248bd5c0964fe199ab9ef3 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 25 May 2022 09:51:37 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/communityService/measure/info.vue | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/views/modules/communityService/measure/info.vue b/src/views/modules/communityService/measure/info.vue index 74193bd21..5d84e0cde 100644 --- a/src/views/modules/communityService/measure/info.vue +++ b/src/views/modules/communityService/measure/info.vue @@ -301,17 +301,17 @@ export default { type: String, default: "", }, - addType: { - type: String, - default: "look", - }, + // addType: { + // type: String, + // default: "look", + // }, }, data () { return { btnLoading: false, pageLoading: false, - + addType: 'look', form: { gridId: "", categoryCodeArr: [], @@ -476,9 +476,14 @@ export default { ""; } if (addType == "finish") { - if (row.serviceStartTime) + if (row.serviceStartTime && row.serviceEndTime) { this.finishServiceTime = [row.serviceStartTime, row.serviceEndTime]; + } else { + this.finishServiceTime = [] + } + + this.form.finishResult = "resolved"; this.form.score = 5; } From f153f5c36274aee061b10722933de118bcbd5da7 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Wed, 25 May 2022 14:38:27 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/base/community/community.vue | 46 ++++++++++++++++-- src/views/modules/base/community/roomForm.vue | 48 ++++++++++++------- 2 files changed, 74 insertions(+), 20 deletions(-) diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue index caf105692..118fe34c0 100644 --- a/src/views/modules/base/community/community.vue +++ b/src/views/modules/base/community/community.vue @@ -43,7 +43,6 @@
房主手机
@@ -70,6 +69,32 @@
+ +
+
房屋用途
+
+ + + + + + +
+
+ +
+
备注
+
+ + + + +
+
+ { - this.$refs['ref_buildingTable'].loadTable('search', this.selTreeObj, this.ownerName, this.ownerPhone, this.rentState) + this.$refs['ref_buildingTable'].loadTable('search', this.selTreeObj, this.ownerName, this.ownerPhone, this.rentState, this.purpose, this.remark) }) } else { this.$message.warning('请输入查询条件') @@ -209,6 +245,8 @@ export default { this.ownerName = '' this.ownerPhone = '' this.rentState = '' + this.purpose = '' + this.remark = '' this.pageSize = 10 this.pageNo = 1 @@ -280,6 +318,8 @@ export default { this.ownerName = '' this.ownerPhone = '' this.rentState = '' + this.purpose = '' + this.remark = '' this.showRoomTable = false this.selObj = JSON.parse(JSON.stringify(obj)) diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue index 37316861c..6ec07da86 100644 --- a/src/views/modules/base/community/roomForm.vue +++ b/src/views/modules/base/community/roomForm.vue @@ -109,6 +109,15 @@ v-model="dataForm.ownerIdCard"> + + + + @@ -145,14 +154,15 @@ export default { dataForm: { neighborHoodId: '', // 所属小区ID buildingId: '',//所属楼栋ID - buildingUnitId: '',//所属单元ID - doorName: '',//门牌号 - houseType: '',//房屋类型【楼房，平房，别墅】 - purpose: '',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】 + buildingUnitId: '',//所属单元ID + doorName: '',//门牌号 + houseType: '',//房屋类型【楼房，平房，别墅】 + purpose: '',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】 rentFlag: 0,//房屋状态【是：1，否：0】 出租1、闲置2、自住 0 - ownerPhone: '', //房主电话 - ownerName: '', //房主名字 - ownerIdCard: '' //房主身份证 + ownerPhone: '', //房主电话 + ownerName: '', //房主名字 + ownerIdCard: '', //房主身份证 + remark: '' // 备注 }, keyWords: '', @@ -254,7 +264,7 @@ export default { }, async addRoom () { - const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X + const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X if (this.dataForm.ownerIdCard && regCard.test(this.dataForm.ownerIdCard) === false) { this.btnDisable = false this.$message({ @@ -313,14 +323,15 @@ export default { this.dataForm = { neighborHoodId: '', // 所属小区ID buildingId: '',//所属楼栋ID - buildingUnitId: '',//所属单元ID - doorName: '',//门牌号 - houseType: '1',//房屋类型【楼房，平房，别墅】 - purpose: '1',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】 - rentFlag: 0,//是否出租【是：1，否：0】 - ownerPhone: '', //房主电话 - ownerName: '', //房主名字 - ownerIdCard: '' //房主身份证 + buildingUnitId: '',//所属单元ID + doorName: '',//门牌号 + houseType: '1',//房屋类型【楼房，平房，别墅】 + purpose: '1',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】 + rentFlag: 0,//是否出租【是：1，否：0】 + ownerPhone: '', //房主电话 + ownerName: '', //房主名字 + ownerIdCard: '', //房主身份证 + remark: '' // 备注 } }, @@ -367,6 +378,9 @@ export default { ownerIdCard: [ { required: false } ], + remark: [ + { required: false } + ] } }, @@ -376,4 +390,4 @@ export default { \ No newline at end of file +