From c529cded931dd8d3b2b59fe5a14f2372ab9241e2 Mon Sep 17 00:00:00 2001
From: 123456 <17862666717>
Date: Wed, 18 May 2022 17:58:59 +0800
Subject: [PATCH 1/7] =?UTF-8?q?feat=EF=BC=9A=E6=96=B0=E5=A2=9E=E6=88=BF?=
=?UTF-8?q?=E4=B8=9C=E3=80=81=E6=88=90=E5=91=98=E8=BA=AB=E4=BB=BD=E8=AF=81?=
=?UTF-8?q?=E7=85=A7=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../rent/rentcontractinfo-add-or-update.vue | 53 ++++++++++---------
.../plugins/rent/rentcontractreview.vue | 2 +-
.../rent/renttenantinfo-add-or-update.vue | 9 +++-
3 files changed, 38 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 ea408eb5..28755915 100644
--- a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
@@ -17,30 +17,35 @@
-
-
- 居住成员信息
-
-
-
- {{scope.$index+1}}
-
-
-
-
-
-
-
-
-
-
![]()
-
-
+
+
居住成员信息
+
+
+
+ {{scope.$index+1}}
+
+
+
+
+
+
+
+
+
+
![]()
+
+
![]()
+
+
合同信息
出租人信息
@@ -82,7 +87,7 @@
-
+
diff --git a/src/views/modules/plugins/rent/rentcontractreview.vue b/src/views/modules/plugins/rent/rentcontractreview.vue
index 7e58728f..c003e5a8 100644
--- a/src/views/modules/plugins/rent/rentcontractreview.vue
+++ b/src/views/modules/plugins/rent/rentcontractreview.vue
@@ -172,7 +172,7 @@
- {{ $t('checkBtn') }}
+ 登记
{{ $t('lookBtn') }}
diff --git a/src/views/modules/plugins/rent/renttenantinfo-add-or-update.vue b/src/views/modules/plugins/rent/renttenantinfo-add-or-update.vue
index ef4cb633..f7304061 100644
--- a/src/views/modules/plugins/rent/renttenantinfo-add-or-update.vue
+++ b/src/views/modules/plugins/rent/renttenantinfo-add-or-update.vue
@@ -13,8 +13,15 @@
+
+
+
+
+
-
+
From 51c6ae4f64c438618b0a41dab09ff95f1a095956 Mon Sep 17 00:00:00 2001
From: 123456 <17862666717>
Date: Thu, 19 May 2022 15:09:04 +0800
Subject: [PATCH 2/7] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E6=94=BF=E6=B2=BB?=
=?UTF-8?q?=E9=9D=A2=E8=B2=8C=E7=AD=89=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../rent/rentcontractinfo-add-or-update.vue | 15 +++++++++++++++
1 file changed, 15 insertions(+)
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 28755915..5170cdac 100644
--- a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
@@ -30,6 +30,9 @@
+
+
+
@@ -72,6 +75,18 @@
+
+
+
+
+
+
+
+
+
+
合同内容
From 3c5818b95ac6c5a1aaf525518f0349830d464391 Mon Sep 17 00:00:00 2001
From: 123456 <17862666717>
Date: Thu, 19 May 2022 16:02:38 +0800
Subject: [PATCH 3/7] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4=E8=A1=A8=E6=A0=BC?=
=?UTF-8?q?=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../plugins/rent/rentcontractinfo-add-or-update.vue | 8 ++++----
1 file changed, 4 insertions(+), 4 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 5170cdac..624586e2 100644
--- a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
@@ -27,11 +27,11 @@
-
-
-
+
+
+
-
+
From ee10d8087f8c460ee8db04a782cba8badf955190 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 20 May 2022 10:41:57 +0800
Subject: [PATCH 4/7] no message
---
.../modules/communityParty/regionalParty/activitysForm.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/modules/communityParty/regionalParty/activitysForm.vue b/src/views/modules/communityParty/regionalParty/activitysForm.vue
index 8bc70b9f..933292e4 100644
--- a/src/views/modules/communityParty/regionalParty/activitysForm.vue
+++ b/src/views/modules/communityParty/regionalParty/activitysForm.vue
@@ -223,7 +223,7 @@
import { mapGetters } from 'vuex'
import { Loading } from 'element-ui' // 引入Loading服务
import { requestPost } from '@/js/dai/request'
-import Tinymce from '@c/tinymce/index.vue'
+import Tinymce from '@c/tinymce2/index.vue'
var map
var search
From 0872c54201dab75c9b0203ed1ddde95b082c3757 Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Fri, 20 May 2022 18:09:33 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/modules/base/community/communityForm.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/views/modules/base/community/communityForm.vue b/src/views/modules/base/community/communityForm.vue
index 9dd8aef9..413a0170 100644
--- a/src/views/modules/base/community/communityForm.vue
+++ b/src/views/modules/base/community/communityForm.vue
@@ -21,6 +21,7 @@
Date: Mon, 23 May 2022 16:18:36 +0800
Subject: [PATCH 6/7] =?UTF-8?q?Revert=20"=E4=BF=AE=E5=A4=8D"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This reverts commit 0872c542
---
src/views/modules/base/community/communityForm.vue | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/views/modules/base/community/communityForm.vue b/src/views/modules/base/community/communityForm.vue
index 413a0170..9dd8aef9 100644
--- a/src/views/modules/base/community/communityForm.vue
+++ b/src/views/modules/base/community/communityForm.vue
@@ -21,7 +21,6 @@
Date: Mon, 23 May 2022 17:45:10 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=B7=BB=E5=8A=A0?=
=?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8B=E5=8F=91=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../rent/rentcontractinfo-add-or-update.vue | 28 +++++++++++++------
1 file changed, 19 insertions(+), 9 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 ea408eb5..d638231a 100644
--- a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
@@ -238,17 +238,27 @@ export default {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
- this.$message({
- message: this.$t('prompt.success'),
- type: 'success',
- duration: 500,
- onClose: () => {
- this.visible = false
- this.$emit('refreshDataList')
- }
- })
+ // 调用文件下发权限接口
+ this.fileJurisdiction(params)
}).catch(() => {})
},
+ // 文件下发权限接口
+ fileJurisdiction (params) {
+ this.$http.post('/pli/power/rentContractInfo/send', params).then(({ data: res }) => {
+ if (res.code !== 0) {
+ return this.$message.error(res.msg)
+ }
+ this.$message({
+ message: this.$t('prompt.success'),
+ type: 'success',
+ duration: 500,
+ onClose: () => {
+ this.visible = false
+ this.$emit('refreshDataList')
+ }
+ })
+ }).catch(() => {})
+ },
// 表单提交
dataFormSubmitHandle: debounce(function () {
this.$refs['dataForm'].validate((valid) => {