diff --git a/src/views/modules/plugins/change/changewelfare.vue b/src/views/modules/plugins/change/changewelfare.vue
index bb4ce7828..e7f30bc90 100644
--- a/src/views/modules/plugins/change/changewelfare.vue
+++ b/src/views/modules/plugins/change/changewelfare.vue
@@ -58,7 +58,6 @@
- {{ $t('export') }}
导入
+ {{ $t('export') }}
diff --git a/src/views/modules/plugins/rent/plirentcontractinfolog-add-or-update.vue b/src/views/modules/plugins/rent/plirentcontractinfolog-add-or-update.vue
new file mode 100644
index 000000000..74dcade31
--- /dev/null
+++ b/src/views/modules/plugins/rent/plirentcontractinfolog-add-or-update.vue
@@ -0,0 +1,334 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('cancel') }}
+ {{ $t('confirm') }}
+
+
+
+
+
diff --git a/src/views/modules/plugins/rent/plirentcontractinfolog.vue b/src/views/modules/plugins/rent/plirentcontractinfolog.vue
new file mode 100644
index 000000000..3eb0a2df1
--- /dev/null
+++ b/src/views/modules/plugins/rent/plirentcontractinfolog.vue
@@ -0,0 +1,102 @@
+
+
+
+
+
+
+
+
+ {{ $t('query') }}
+
+
+ {{ $t('add') }}
+
+
+ {{ $t('deleteBatch') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('update') }}
+ {{ $t('delete') }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
index bb50164b7..e64242d71 100644
--- a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
@@ -112,7 +112,7 @@
-
+
@@ -149,118 +149,230 @@
添加成员
-
-
-
- {{scope.$index+1}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
- 删除
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+
+
合同内容
@@ -383,11 +495,23 @@ export default {
yfzgx: '',
type: 1,
politicalStatus: '',
+ mz:'',
+ gender:'',
+ birthday:'',
+ isVaccination:'1',
isMilitary: '',
nation: '',
imgList: [],
idCardImgList: [],
- unit: ''
+ unit: '',
+ firstVacTime: '',
+ firstVacSite:'',
+ secondVacTime:'',
+ secondVacSite:'',
+ thirdVacTime:'',
+ thirdVacSite:'',
+ reason:'',
+ note:'',
}],
fileList: [],
docList: []
@@ -404,6 +528,22 @@ export default {
{ name: '中国', value: '中国' },
{ name: '其他', value: '其他' }
],
+ mzOptions:[],
+ isVaccinationOption: [
+ { value: '0', label: '否' },
+ { value: '1', label: '是' },
+ ],
+ vacSiteOption: [
+ { value: '本街道内接种', label: '本街道内接种' },
+ { value: '区内其他街道接种', label: '区内其他街道接种' },
+ { value: '区外其他地区接种', label: '区外其他地区接种' },
+ ],
+ reasonOption: [
+ { value: '禁忌症', label: '禁忌症' },
+ { value: '拒绝接种', label: '拒绝接种' },
+ { value: '其他原因', label: '其他原因' },
+ ],
+ genderOptions:[{label: "男", value: "1"}, {label: "女", value: "2"}],
dataListLoading: false,
dialogVisible: false,
dialogImageUrl: '',
@@ -419,6 +559,18 @@ export default {
{ dictValue: '兄弟姐妹', dictName: '兄弟姐妹' },
{ dictValue: '其他', dictName: '其他' }
],
+ lessorRelationArr_: [
+ { dictValue: '本人', dictName: '本人' },
+ { dictValue: '配偶', dictName: '配偶' },
+ { dictValue: '子女', dictName: '子女' },
+ { dictValue: '父母', dictName: '父母' },
+ { dictValue: '岳父母或公婆', dictName: '岳父母或公婆' },
+ { dictValue: '祖父母', dictName: '祖父母' },
+ { dictValue: '媳婿', dictName: '媳婿' },
+ { dictValue: '孙子女', dictName: '孙子女' },
+ { dictValue: '兄弟姐妹', dictName: '兄弟姐妹' },
+ { dictValue: '中介', dictName: '中介' }
+ ],
checkVisible: false,
disabledBtn: false,
gridOptions: [],
@@ -429,7 +581,9 @@ export default {
agencyOptions: [],
uploadUrl: `${window.SITE_CONFIG['apiURL']}/oss/file/uploadqrcodeV2`,
customerId: localStorage.getItem("customerId"),
- limit: 3
+ limit: 3,
+ tip: { required: true, message: '必填项不能为空', trigger: 'blur' },
+ tip_select: { required: true, message: '必填项不能为空', trigger: 'change' }
}
},
computed: {
@@ -568,11 +722,23 @@ export default {
yfzgx: '',
type: 1,
politicalStatus: '',
+ mz: '',
+ gender:'',
+ birthday:'',
+ isVaccination:'1',
isMilitary: '',
nation: '',
imgList: [],
idCardImgList: [],
- unit: ''
+ unit: '',
+ firstVacTime:'',
+ firstVacSite:'',
+ secondVacTime:'',
+ secondVacSite:'',
+ thirdVacTime:'',
+ thirdVacSite:'',
+ reason:'',
+ note:'',
}],
fileList: [],
docList: [],
@@ -581,6 +747,7 @@ export default {
},
init () {
this.visible = true
+ this.getMz()
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
this.dataFormReset()
@@ -668,11 +835,23 @@ export default {
yfzgx: '',
type: 1,
politicalStatus: '',
+ mz: '',
+ gender:'',
+ birthday:'',
+ isVaccination: '1',
isMilitary: '',
nation: '',
imgList: [],
idCardImgList: [],
- unit: ''
+ unit: '',
+ firstVacTime:'',
+ firstVacSite:'',
+ secondVacTime:'',
+ secondVacSite:'',
+ thirdVacTime:'',
+ thirdVacSite:'',
+ reason:'',
+ note:'',
}
this.dataForm.tenantList.push(ob)
},
@@ -756,7 +935,7 @@ export default {
},
getAgencyList() {
return new Promise((resolve, reject) => {
- this.$http.post('/gov/org/agency/communityListByCustomerId')
+ this.$http.post('/gov/org/customeragency/getCurrentUserCommunityInfo')
.then(({ data: res }) => {
if (res.code !== 0) {
reject(false)
@@ -905,6 +1084,15 @@ export default {
this.editModeGetList()
}).catch(() => {})
},
+ getMz() {
+ this.$http.post(`/sys/dict/data/nation`).then(({ data: res }) => {
+ if (res.code !== 0) {
+ return this.$message.error(res.msg)
+ }
+ this.mzOptions = res.data
+ console.log(res)
+ }).catch(() => {})
+ },
handleFlieSuccess(res, file) {
if (res.code === 0 && res.msg === "success") {
let ob = {
@@ -1006,6 +1194,16 @@ export default {
margin-bottom: 0;
}
}
+
+.add-member{
+ border-bottom: 1px dashed #dcdfe6;
+ margin-bottom: 20px;
+ .el-form-item {
+ .el-form-item__content{
+ width: 190px !important;
+ }
+ }
+}
diff --git a/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue b/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue
index 36e556d40..794f39b3f 100644
--- a/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue
@@ -74,35 +74,122 @@
居住成员信息
-
-
-
- {{scope.$index+1}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
![]()
-
-
-
-
-
-
-
![]()
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
![]()
+
+
+
+
+
+
+
+
![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
合同内容
@@ -139,7 +226,7 @@
{{ $t('checkBTGBtn') }}
- {{ $t('checkTGBtn') }}
+ {{ $t('checkTGBtn') }}
@@ -210,7 +297,9 @@ export default {
],
checkReason: '',
checkVisible: false,
- disabledBtn: false
+ disabledBtn: false,
+ disabledBtn_check: false,
+ mzOptions:[],
}
},
computed: {
@@ -301,6 +390,7 @@ export default {
...this.dataForm,
...res.data
}
+ this.getMz()
}).catch(() => {})
},
// 打开审核不通过对话框
@@ -326,7 +416,9 @@ export default {
lessorRelation: this.dataForm.lessorRelation,
reason: this.checkReason
}
+ this.disabledBtn_check = true,
this.$http.post('/pli/power/rentContractInfo/review', params).then(({ data: res }) => {
+ this.disabledBtn_check = false
if (res.code !== 0) {
return this.$message.error(res.msg)
}
@@ -356,6 +448,15 @@ export default {
downFile(fileUrl) {
window.open(fileUrl)
},
+ getMz() {
+ this.$http.post(`/sys/dict/data/nation`).then(({ data: res }) => {
+ if (res.code !== 0) {
+ return this.$message.error(res.msg)
+ }
+ this.mzOptions = res.data
+ console.log(res)
+ }).catch(() => {})
+ },
// 表单提交
dataFormSubmitHandle: debounce(function () {
this.$refs['dataForm'].validate((valid) => {
@@ -398,4 +499,13 @@ export default {
// width: 280px;
}
}
+.add-member{
+ border-bottom: 1px dashed #dcdfe6;
+ margin-bottom: 20px;
+ .el-form-item {
+ .el-form-item__content{
+ width: 190px !important;
+ }
+ }
+}
diff --git a/src/views/modules/plugins/rent/rentcontractinfo.vue b/src/views/modules/plugins/rent/rentcontractinfo.vue
index 4ee321e33..7ae1c67ea 100644
--- a/src/views/modules/plugins/rent/rentcontractinfo.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo.vue
@@ -203,9 +203,9 @@ export default {
data: function () {
return {
mixinViewModuleOptions: {
- getDataListURL: '/pli/power/rentContractInfo/page',
+ getDataListURL: '/pli/power/plirentcontractinfolog/page',
getDataListIsPage: true,
- deleteURL: '/pli/power/rentContractInfo',
+ deleteURL: '/pli/power/plirentcontractinfolog',
deleteIsBatch: true
},
optionsV: [],