diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index 7ba9c6498..0f598f38c 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -48,7 +48,6 @@
房主手机
@@ -75,6 +74,32 @@
+
+
+
+
+
{
@@ -224,6 +260,8 @@ export default {
this.ownerName = ''
this.ownerPhone = ''
this.rentFlag = ''
+ this.purpose = ''
+ this.remark = ''
this.pageSize = 10
this.pageNo = 1
@@ -295,6 +333,8 @@ export default {
this.ownerName = ''
this.ownerPhone = ''
this.rentFlag = ''
+ 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 aaf8d1a54..975443819 100644
--- a/src/views/modules/base/community/roomForm.vue
+++ b/src/views/modules/base/community/roomForm.vue
@@ -110,6 +110,15 @@
v-model="dataForm.ownerIdCard">
+
+
+
+
@@ -146,14 +155,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: '',
@@ -255,7 +265,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({
@@ -314,14 +324,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: '' // 备注
}
},
@@ -368,6 +379,9 @@ export default {
ownerIdCard: [
{ required: false }
],
+ remark: [
+ { required: false }
+ ]
}
},
@@ -377,4 +391,4 @@ export default {
\ No newline at end of file
+
diff --git a/src/views/modules/communityParty/members/index.vue b/src/views/modules/communityParty/members/index.vue
index 7652d0fd9..b0ce18dc8 100644
--- a/src/views/modules/communityParty/members/index.vue
+++ b/src/views/modules/communityParty/members/index.vue
@@ -110,7 +110,7 @@
新增
-
+ {{ exportBtnTitle }}
@@ -540,7 +540,7 @@ export default {
}
},
async handleExportModule () {
- let url = "/resi/partymember/icpartymemberstyle/import/template-download"
+ let url = "/resi/partymember/icPartyMember/downloadTemplate"
let params = {}
@@ -590,7 +590,7 @@ export default {
const formData = new FormData() //FormData对象,添加参数只能通过append('key', value)的形式添加
formData.append('file', file.file) //添加文件对象
this.$http
- .post('/resi/partymember/icpartymemberstyle/import', formData).then(res => {
+ .post('/resi/partymember/icPartyMember/import', formData).then(res => {
console.log('res-up', res)
if (res.data.code == 0 && res.data.msg == 'success') {
// this.$message.success('导入成功')
@@ -618,7 +618,7 @@ export default {
}
// .post('epmetuser/icresiuser/exportExcel', params)
await axios({
- url: window.SITE_CONFIG['apiURL'] + '/resi/partymember/icpartymemberstyle/export',
+ url: window.SITE_CONFIG['apiURL'] + '/resi/partymember/icPartyMember/export',
// url: 'epmetuser/icresiuser/exportExcel',
method: 'post',
data: params,
diff --git a/src/views/modules/partymember/icpartymemberpayrecorddetail.vue b/src/views/modules/partymember/icpartymemberpayrecorddetail.vue
index f6893f475..dc685a44e 100644
--- a/src/views/modules/partymember/icpartymemberpayrecorddetail.vue
+++ b/src/views/modules/partymember/icpartymemberpayrecorddetail.vue
@@ -1,6 +1,6 @@
-
-
+
+
@@ -71,7 +71,7 @@
- {{ $t('export') }}
+ {{ $t('export') }}
@@ -107,12 +107,13 @@
-
+