From c529cded931dd8d3b2b59fe5a14f2372ab9241e2 Mon Sep 17 00:00:00 2001
From: 123456 <17862666717>
Date: Wed, 18 May 2022 17:58:59 +0800
Subject: [PATCH 1/3] =?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 @@
             <el-form-item label="房主姓名" prop="ownerName">
                 <el-input v-model="dataForm.ownerName" placeholder="房主姓名"></el-input>
             </el-form-item>
-            <br/>
-
-            <div style="margin-left: 50px;height: 30px;font-weight: bold;">居住成员信息</div>
-            <el-table v-loading="dataListLoading" :data="dataForm.tenantList" border style="width: 100%">
-                <el-table-column label="序号" header-align="center" align="center" width="50px">
-                    <template slot-scope="scope">
-                        {{scope.$index+1}}
-                    </template>
-                </el-table-column>
-                <el-table-column prop="name" label="姓名" header-align="center" align="center"></el-table-column>
-                <el-table-column prop="yfzgx" label="与户主关系" header-align="center" align="center"></el-table-column>
-                <el-table-column prop="mobile" label="手机" header-align="center" align="center"></el-table-column>
-                <el-table-column prop="idCard" label="身份证号" header-align="center" align="center"></el-table-column>
-                <el-table-column prop="imgList" label="照片" header-align="center" align="center">
-                    <template slot-scope="scope">
-                        <div v-for="(item,index) in scope.row.imgList" :key="index">
-                            <img :src="item.fileUrl" @click="imgShow(item.fileUrl)" width="40" height="40"  />
-                        </div>
-                    </template>
-                </el-table-column>
-            </el-table>
-            <br/>
         </div>
-
+        <div style="padding:20px 30px">
+          <div style="height: 30px;font-weight: bold;">居住成员信息</div>
+          <el-table v-loading="dataListLoading" :data="dataForm.tenantList" border style="width: 100%">
+              <el-table-column label="序号" header-align="center" align="center" width="50px">
+                  <template slot-scope="scope">
+                      {{scope.$index+1}}
+                  </template>
+              </el-table-column>
+              <el-table-column prop="name" label="姓名" header-align="center" align="center"></el-table-column>
+              <el-table-column prop="yfzgx" label="与户主关系" header-align="center" align="center"></el-table-column>
+              <el-table-column prop="mobile" label="手机" header-align="center" align="center"></el-table-column>
+              <el-table-column prop="idCard" label="身份证号" header-align="center" align="center"></el-table-column>
+              <el-table-column prop="idCardImgList" label="身份证照片" header-align="center" align="center">
+                  <template slot-scope="scope">
+                      <div v-for="(item,index) in scope.row.idCardImgList" :key="index">
+                          <img :src="item.fileUrl" @click="imgShow(item.fileUrl)" width="40" height="40"  />
+                      </div>
+                  </template>
+              </el-table-column>
+              <el-table-column prop="imgList" label="照片" header-align="center" align="center">
+                  <template slot-scope="scope">
+                      <div v-for="(item,index) in scope.row.imgList" :key="index">
+                          <img :src="item.fileUrl" @click="imgShow(item.fileUrl)" width="40" height="40"  />
+                      </div>
+                  </template>
+              </el-table-column>
+          </el-table>
+        </div>
         <div style="margin-left: 50px;height: 30px;font-weight: bold;">合同信息</div>
         <div style="margin-left: 50px;height: 30px;">出租人信息</div>
         <el-form-item label="出租人姓名" prop="lessorName">
@@ -82,7 +87,7 @@
         <br/>
 
         <el-form-item label="合同附件" prop="fileList">
-            <template slot-scope="scope">
+            <template>
                 <label v-for="(item,index) in dataForm.fileList" :key="index">
                     <img :src="item.fileUrl" @click="imgShow(item.fileUrl)" width="100" height="100" />
                 </label>
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 @@
         <el-table-column prop="isBlack" label="是否黑名单人员" header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
-            <el-button v-if="scope.row.state === '0'" type="text" size="small" @click="addOrUpdateHandle(scope.row.id,'2')">{{ $t('checkBtn') }}</el-button>
+            <el-button v-if="scope.row.state === '0'" type="text" size="small" @click="addOrUpdateHandle(scope.row.id,'2')">登记</el-button>
             <el-button v-else type="text" size="small" @click="addOrUpdateHandle(scope.row.id,'1')">{{ $t('lookBtn') }}</el-button>
 <!--            <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>-->
           </template>
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 @@
         <!--<el-form-item label="与房主关系" prop="yfzgx">-->
             <!--<el-input v-model="dataForm.yfzgx" placeholder="与房主关系" disabled></el-input>-->
         <!--</el-form-item>-->
+        <el-form-item label="身份证照片" prop="idCardImgList">
+            <template>
+                <label v-for="(item,index) in dataForm.idCardImgList" :key="index">
+                    <img :src="item.fileUrl" @click="imgShow(item.fileUrl)" width="100" height="100" />
+                </label>
+            </template>
+        </el-form-item>
         <el-form-item label="照片" prop="imgList">
-            <template slot-scope="scope">
+            <template>
                 <label v-for="(item,index) in dataForm.imgList" :key="index">
                     <img :src="item.fileUrl" @click="imgShow(item.fileUrl)" width="100" height="100" />
                 </label>

From 51c6ae4f64c438618b0a41dab09ff95f1a095956 Mon Sep 17 00:00:00 2001
From: 123456 <17862666717>
Date: Thu, 19 May 2022 15:09:04 +0800
Subject: [PATCH 2/3] =?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 @@
               <el-table-column prop="yfzgx" label="与户主关系" header-align="center" align="center"></el-table-column>
               <el-table-column prop="mobile" label="手机" header-align="center" align="center"></el-table-column>
               <el-table-column prop="idCard" label="身份证号" header-align="center" align="center"></el-table-column>
+              <el-table-column prop="politicalStatus" label="政治面貌" header-align="center" align="center"></el-table-column>
+              <el-table-column prop="isMilitary" label="是否服过兵役" header-align="center" align="center"></el-table-column>
+              <el-table-column prop="nation" label="国籍" header-align="center" align="center"></el-table-column>
               <el-table-column prop="idCardImgList" label="身份证照片" header-align="center" align="center">
                   <template slot-scope="scope">
                       <div v-for="(item,index) in scope.row.idCardImgList" :key="index">
@@ -72,6 +75,18 @@
             <el-input v-model="dataForm.lesseeMobile" placeholder="承租人手机"></el-input>
         </el-form-item>
         <br/>
+        <el-form-item label="与房主关系" prop="lessorRelation">
+            <el-input v-model="dataForm.lessorRelation" placeholder="与房主关系"></el-input>
+        </el-form-item>
+        <br/>
+        <el-form-item label="中介合同附件" prop="agencyImgList" v-if="dataForm.lessorRelation ==='中介'">
+            <template>
+                <label v-for="(item,index) in dataForm.agencyImgList" :key="index">
+                    <img :src="item.fileUrl" @click="imgShow(item.fileUrl)" width="100" height="100" />
+                </label>
+            </template>
+        </el-form-item>
+        <br/>
 
         <div style="margin-left: 50px;height: 30px;font-weight: bold;">合同内容</div>
         <el-form-item label="签署日期" prop="signDate">

From 3c5818b95ac6c5a1aaf525518f0349830d464391 Mon Sep 17 00:00:00 2001
From: 123456 <17862666717>
Date: Thu, 19 May 2022 16:02:38 +0800
Subject: [PATCH 3/3] =?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 @@
                   </template>
               </el-table-column>
               <el-table-column prop="name" label="姓名" header-align="center" align="center"></el-table-column>
-              <el-table-column prop="yfzgx" label="与户主关系" header-align="center" align="center"></el-table-column>
-              <el-table-column prop="mobile" label="手机" header-align="center" align="center"></el-table-column>
-              <el-table-column prop="idCard" label="身份证号" header-align="center" align="center"></el-table-column>
+              <el-table-column prop="yfzgx" label="与户主关系" header-align="center" align="center" width="120"></el-table-column>
+              <el-table-column prop="mobile" label="手机" header-align="center" align="center" width="120"></el-table-column>
+              <el-table-column prop="idCard" label="身份证号" header-align="center" align="center" width="180"></el-table-column>
               <el-table-column prop="politicalStatus" label="政治面貌" header-align="center" align="center"></el-table-column>
-              <el-table-column prop="isMilitary" label="是否服过兵役" header-align="center" align="center"></el-table-column>
+              <el-table-column prop="isMilitary" label="是否服过兵役" header-align="center" align="center" width="120"></el-table-column>
               <el-table-column prop="nation" label="国籍" header-align="center" align="center"></el-table-column>
               <el-table-column prop="idCardImgList" label="身份证照片" header-align="center" align="center">
                   <template slot-scope="scope">