From 1ce89f516744e743bc5de7c717630477a7066ab4 Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Fri, 11 Nov 2022 15:37:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BF=85=E5=A1=AB?=
=?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../rent/rentcontractinfo-add-or-update.vue | 57 +++++++++++--------
.../plugins/rent/rentcontractreview.vue | 4 +-
2 files changed, 35 insertions(+), 26 deletions(-)
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 e5924a369..0ca43f14d 100644
--- a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
@@ -140,7 +140,7 @@
-
+
@@ -187,6 +187,15 @@
+
+
+
+
+
+
+
+
+
@@ -236,12 +245,12 @@
-
+
-
+
@@ -286,7 +295,7 @@
-
+
@@ -483,9 +492,9 @@ export default {
lesseeUnit: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
- lesseeHouseAddress: [
- { required: true, message: this.$t('validate.required'), trigger: 'blur' }
- ],
+ // lesseeHouseAddress: [
+ // { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+ // ],
signDate: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
@@ -495,9 +504,9 @@ export default {
endDate: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
- fileList: [
- { required: true, message: this.$t('validate.required'), trigger: 'blur' }
- ],
+ // fileList: [
+ // { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+ // ],
// agencyImgList: [
// { required: true, message: this.$t('validate.required'), trigger: 'blur' }
// ]
@@ -939,20 +948,20 @@ export default {
if (!valid) {
return false
}
- const isUploadIdCardImgList = this.dataForm.tenantList.some(item => {
- return item.idCardImgList.length == 0
- })
- if (isUploadIdCardImgList) {
- this.$message.error('请上传成员证件照片')
- return
- }
- const isUploadImgList = this.dataForm.tenantList.some(item => {
- return item.imgList.length == 0
- })
- if (isUploadImgList) {
- this.$message.error('请上传成员照片')
- return
- }
+ // const isUploadIdCardImgList = this.dataForm.tenantList.some(item => {
+ // return item.idCardImgList.length == 0
+ // })
+ // if (isUploadIdCardImgList) {
+ // this.$message.error('请上传成员证件照片')
+ // return
+ // }
+ // const isUploadImgList = this.dataForm.tenantList.some(item => {
+ // return item.imgList.length == 0
+ // })
+ // if (isUploadImgList) {
+ // this.$message.error('请上传成员照片')
+ // return
+ // }
if (this.dataForm.lessorRelation == '中介') {
if (this.dataForm.agencyImgList.length == 0) {
this.$message.error('请上传中介委托照片')
diff --git a/src/views/modules/plugins/rent/rentcontractreview.vue b/src/views/modules/plugins/rent/rentcontractreview.vue
index a1d211e33..9049969df 100644
--- a/src/views/modules/plugins/rent/rentcontractreview.vue
+++ b/src/views/modules/plugins/rent/rentcontractreview.vue
@@ -104,10 +104,10 @@
-
+
-
+
From 9c6a0141ae9ef312243a81140fcabf8ef2b06c59 Mon Sep 17 00:00:00 2001
From: jiangyy
Date: Fri, 11 Nov 2022 15:46:15 +0800
Subject: [PATCH 2/2] 11
---
src/views/modules/base/epidemic/vaccin.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/modules/base/epidemic/vaccin.vue b/src/views/modules/base/epidemic/vaccin.vue
index 488e094a0..46616b4c4 100644
--- a/src/views/modules/base/epidemic/vaccin.vue
+++ b/src/views/modules/base/epidemic/vaccin.vue
@@ -394,7 +394,7 @@ export default {
this.tableData = data.list;
this.tableData.forEach((item) => {
- item.isResiUserShow = item.isResiUser === "0" ? "否" : "是";
+ item.isResiUserShow = item.isLocalResiUser === "1" ? "是" : "否";
if (item.natResult === "1") {
item.natResultShow = "阳性";
} else if (item.natResult === "0") {