From be7f9ce77397dc5edef58b10ea157765f9d7fa13 Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Tue, 6 Dec 2022 14:41:09 +0800
Subject: [PATCH] bug

---
 .../rent/rentcontractinfo-add-or-update.vue   | 92 ++++++++++---------
 .../rent/rentcontractinfo-look-or-check.vue   | 68 ++++++++------
 2 files changed, 93 insertions(+), 67 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 280be6596..9bb14f981 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 @@
         <el-form-item label="与房主关系" prop="lessorRelation" label-width="140px">
             <!--<el-input v-model="dataForm.lessorRelation" placeholder="与房主关系"></el-input>-->
             <el-select v-model="dataForm.lessorRelation" placeholder="与房主关系">
-                <el-option v-for="item in lessorRelationArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+                <el-option v-for="item in lessorRelationArr_" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
                 </el-option>
             </el-select>
         </el-form-item>
@@ -149,42 +149,35 @@
           <br/>
           <el-button @click="addMember()" type="primary">添加成员</el-button>
           <div><br/></div>
-          <div style="border-bottom: 1px dashed #dcdfe6;margin-bottom: 20px;" v-for="(item, index) in dataForm.tenantList" :key="index">
-              <el-form-item label="姓名" :prop="'tenantList['+ index +'].name'" required :show-message="false">
+          <div class="add-member" v-for="(item, index) in dataForm.tenantList" :key="index">
+              <el-form-item label="姓名" :prop="'tenantList['+ index +'].name'" required :show-message="false" label-width="150px">
                   <el-input v-model="dataForm.tenantList[index].name" placeholder="请输入" ></el-input>
               </el-form-item>
 
-              <el-form-item label="与户主关系" :prop="'tenantList['+index+'].yfzgx'" required :show-message="false">
-                <el-select v-model="dataForm.tenantList[index].yfzgx" placeholder="请选择">
-                    <el-option v-for="item in lessorRelationArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
-                    </el-option>
-                </el-select>
-              </el-form-item>
-
-              <el-form-item label="手机" :prop="'tenantList['+ index +'].mobile'" required :show-message="false">
+              <el-form-item label="手机" :prop="'tenantList['+ index +'].mobile'" required :show-message="false" label-width="150px">
                 <el-input v-model="dataForm.tenantList[index].mobile" placeholder="请输入"></el-input>
               </el-form-item>
 
-
-              <br/>
-
-              <el-form-item label="证件号" :prop="'tenantList['+index+'].idCard'" required :show-message="false">
+              <el-form-item label="证件号" :prop="'tenantList['+index+'].idCard'" required :show-message="false" label-width="150px">
                 <el-input v-model="dataForm.tenantList[index].idCard" placeholder="请输入"></el-input>
               </el-form-item>
 
-
-              <el-form-item label="户籍地" :prop="'tenantList['+index+'].hjszd'" required :show-message="false">
+              <el-form-item label="户籍地" :prop="'tenantList['+index+'].hjszd'" required :show-message="false" label-width="150px">
                 <el-input v-model="dataForm.tenantList[index].hjszd" placeholder="请输入"></el-input>
               </el-form-item>
 
-              <el-form-item label="工作单位" :prop="'tenantList['+index+'].unit'" required :show-message="false">
+              <el-form-item label="工作单位" :prop="'tenantList['+index+'].unit'" required :show-message="false" label-width="150px">
                 <el-input v-model="dataForm.tenantList[index].unit" placeholder="请输入"></el-input>
               </el-form-item>
 
-              <br/>
-
+              <el-form-item label="与户主关系" :prop="'tenantList['+index+'].yfzgx'" required :show-message="false" label-width="150px">
+                <el-select v-model="dataForm.tenantList[index].yfzgx" placeholder="请选择">
+                    <el-option v-for="item in lessorRelationArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+                    </el-option>
+                </el-select>
+              </el-form-item>
 
-              <el-form-item label="政治面貌" :prop="'tenantList['+index+'].politicalStatus'" required :show-message="false">
+              <el-form-item label="政治面貌" :prop="'tenantList['+index+'].politicalStatus'" required :show-message="false" label-width="150px">
                 <el-select v-model="dataForm.tenantList[index].politicalStatus" placeholder="请选择">
                   <el-option
                     v-for="item in zzmmOptions"
@@ -195,7 +188,7 @@
                 </el-select>
               </el-form-item>
 
-              <el-form-item label="是否服过兵役" label-width="140px" :prop="'tenantList['+index+'].isMilitary'" required :show-message="false">
+              <el-form-item label="是否服过兵役" :prop="'tenantList['+index+'].isMilitary'" required :show-message="false" label-width="150px">
                 <el-select v-model="dataForm.tenantList[index].isMilitary" placeholder="请选择">
                   <el-option
                     v-for="item in shifouOptions"
@@ -206,8 +199,7 @@
                 </el-select>
               </el-form-item>
 
-
-              <el-form-item label="国籍" :prop="'tenantList['+index+'].nation'" required :show-message="false">
+              <el-form-item label="国籍" :prop="'tenantList['+index+'].nation'" required :show-message="false" label-width="150px">
                 <el-select v-model="dataForm.tenantList[index].nation" placeholder="请选择">
                   <el-option
                     v-for="item in nationOptions"
@@ -219,7 +211,7 @@
               </el-form-item>
               <br/>
 
-              <el-form-item label="证件照片">
+              <el-form-item label="证件照片" label-width="150px">
                 <template>
                   <upload-image 
                       :defaultFileList="dataForm.tenantList[index].idCardImgList" 
@@ -229,7 +221,7 @@
                 </template>
               </el-form-item>
 
-              <el-form-item label="照片">
+              <el-form-item label="照片" label-width="150px">
                 <template>
                   <upload-image 
                     :defaultFileList="dataForm.tenantList[index].imgList" 
@@ -239,7 +231,7 @@
                 </template>
               </el-form-item>
               <br/>
-              <el-form-item label="民族" :prop="'tenantList['+index+'].mz'" required :show-message="false">
+              <el-form-item label="民族" :prop="'tenantList['+index+'].mz'" required :show-message="false" label-width="150px">
                 <el-select v-model="dataForm.tenantList[index].mz" placeholder="请选择">
                   <el-option
                     v-for="item in mzOptions"
@@ -251,7 +243,7 @@
               </el-form-item>
 
 
-              <el-form-item label="性别" :prop="'tenantList['+index+'].gender'" required :show-message="false">
+              <!-- <el-form-item label="性别" :prop="'tenantList['+index+'].gender'" required :show-message="false">
                 <el-select v-model="dataForm.tenantList[index].gender" placeholder="请选择">
                   <el-option
                     v-for="item in genderOptions"
@@ -260,10 +252,10 @@
                     :value="item.value">
                   </el-option>
                 </el-select>
-              </el-form-item>
+              </el-form-item> -->
 
 
-              <el-form-item label="出生日期" :prop="'tenantList['+index+'].birthday'" required :show-message="false" label-width="150px">
+              <!-- <el-form-item label="出生日期" :prop="'tenantList['+index+'].birthday'" required :show-message="false" label-width="150px">
                 <el-date-picker
                     v-model="dataForm.tenantList[index].birthday"
                     type="date"
@@ -273,13 +265,9 @@
                     style="width: 200px; margin-right: 20px"
                 >
                 </el-date-picker>
-              </el-form-item>
-
-              <br/>
-
-
+              </el-form-item> -->
 
-              <el-form-item label="是否接种" :prop="'tenantList['+index+'].isVaccination'" required :show-message="false">
+              <el-form-item label="是否接种" :prop="'tenantList['+index+'].isVaccination'" required :show-message="false" label-width="150px">
                 <el-select v-model="dataForm.tenantList[index].isVaccination" placeholder="请选择">
                   <el-option
                     v-for="item in isVaccinationOption"
@@ -362,7 +350,7 @@
               </el-form-item>
               <br/>
 
-              <el-form-item label="原因" :show-message="false">
+              <el-form-item label="原因" :show-message="false" label-width="150px">
                 <el-select v-model="dataForm.tenantList[index].reason" placeholder="请选择">
                   <el-option
                     v-for="item in reasonOption"
@@ -372,8 +360,7 @@
                   </el-option>
                 </el-select>
               </el-form-item>
-              <br/>
-              <el-form-item label="备注" :show-message="false">
+              <el-form-item label="备注" :show-message="false" label-width="150px">
                 <el-input
                     type="textarea"
                     maxlength="500"
@@ -382,9 +369,8 @@
                     placeholder="请输入备注，不超过500字"
                     v-model="dataForm.tenantList[index].note"></el-input>
               </el-form-item>
-              <br/>
               <el-form-item>
-                <el-button type="primary" size="small" @click="deleteMember(index)">删除</el-button>
+                <el-button style="float: right" type="primary" size="small" @click="deleteMember(index)">删除</el-button>
               </el-form-item>
           </div>
         </div>
@@ -573,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: [],
@@ -1194,6 +1192,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;
+    }
+  }
+}
 </style>
 <style lang="scss" scoped>
     ::v-deep .el-upload-list__item.is-success.focusing .el-icon-close-tip {
@@ -1220,4 +1228,6 @@ export default {
     .margin_left10 {
         margin-left: 10px;
     }
+
+
 </style>
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 be668fb5d..794f39b3f 100644
--- a/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue
@@ -76,40 +76,44 @@
           <div style="height: 30px;font-weight: bold;">居住成员信息</div>
         </div>
 
-        <div style="border-bottom: 1px dashed #dcdfe6;margin-bottom: 20px;" v-for="(item, index) in dataForm.tenantList" :key="index">
-          <el-form-item label="姓名" :prop="'tenantList['+ index +'].name'">
+        <div class="add-member" v-for="(item, index) in dataForm.tenantList" :key="index">
+          <el-form-item label="姓名">
               <el-input v-model="dataForm.tenantList[index].name" disabled></el-input>
           </el-form-item>
 
-          <el-form-item label="与户主关系" :prop="'tenantList['+ index +'].yfzgx'">
-              <el-input v-model="dataForm.tenantList[index].yfzgx" disabled></el-input>
-          </el-form-item>
-
-          <el-form-item label="手机" :prop="'tenantList['+ index +'].mobile'">
+          <el-form-item label="手机">
               <el-input v-model="dataForm.tenantList[index].mobile" disabled></el-input>
           </el-form-item>
 
-          <el-form-item label="证件号" :prop="'tenantList['+ index +'].idCard'">
+          <el-form-item label="证件号">
               <el-input v-model="dataForm.tenantList[index].idCard" disabled></el-input>
           </el-form-item>
 
-          <el-form-item label="工作单位" :prop="'tenantList['+ index +'].unit'">
+          <el-form-item label="户籍地">
+            <el-input v-model="dataForm.tenantList[index].hjszd" disabled></el-input>
+          </el-form-item>
+
+          <el-form-item label="工作单位">
               <el-input v-model="dataForm.tenantList[index].unit" disabled></el-input>
           </el-form-item>
 
-          <el-form-item label="政治面貌" :prop="'tenantList['+ index +'].politicalStatus'">
+          <el-form-item label="与户主关系">
+              <el-input v-model="dataForm.tenantList[index].yfzgx" disabled></el-input>
+          </el-form-item>
+
+          <el-form-item label="政治面貌">
               <el-input v-model="dataForm.tenantList[index].politicalStatus" disabled></el-input>
           </el-form-item>
-          <el-form-item label="是否服过兵役" :prop="'tenantList['+ index +'].isMilitary'">
+          <el-form-item label="是否服过兵役">
               <el-input v-model="dataForm.tenantList[index].isMilitary" disabled></el-input>
           </el-form-item>
 
-          <el-form-item label="国籍" :prop="'tenantList['+ index +'].nation'">
+          <el-form-item label="国籍">
               <el-input v-model="dataForm.tenantList[index].nation" disabled></el-input>
           </el-form-item>
           <br/>
 
-          <el-form-item label="证件照片" :prop="'tenantList['+ index +'].idCardImgList'">
+          <el-form-item label="证件照片">
             <template>
                 <div v-for="(item,index) in dataForm.tenantList[index].idCardImgList" :key="index">
                     <img :src="item.fileUrl" @click="imgShow(item.fileUrl)" width="40" height="40"  />
@@ -117,7 +121,7 @@
             </template>
           </el-form-item>
 
-          <el-form-item label="照片" :prop="'tenantList['+ index +'].imgList'">
+          <el-form-item label="照片">
             <template>
                 <div v-for="(item,index) in dataForm.tenantList[index].imgList" :key="index">
                     <img :src="item.fileUrl" @click="imgShow(item.fileUrl)" width="40" height="40"  />
@@ -127,7 +131,7 @@
           <br/>
 
 
-          <el-form-item label="民族" :prop="'tenantList['+index+'].mz'">
+          <el-form-item label="民族">
             <el-select v-model="dataForm.tenantList[index].mz" placeholder="请选择" disabled>
               <el-option
                 v-for="item in mzOptions"
@@ -138,43 +142,43 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="性别" :prop="'tenantList['+ index +'].gender'">
+          <!-- <el-form-item label="性别" :prop="'tenantList['+ index +'].gender'">
               <el-input v-model="dataForm.tenantList[index].gender === '1' ? '男' : '女'" disabled></el-input>
           </el-form-item>
 
           <el-form-item label="出生日期" :prop="'tenantList['+ index +'].birthday'">
               <el-input v-model="dataForm.tenantList[index].birthday" disabled></el-input>
-          </el-form-item>
+          </el-form-item> -->
 
-          <el-form-item label="是否接种" :prop="'tenantList['+ index +'].isVaccination'">
+          <el-form-item label="是否接种">
               <el-input v-model="dataForm.tenantList[index].isVaccination === '0' ? '否' : '是'" disabled></el-input>
           </el-form-item>
 
-          <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第一次接种时间" :prop="'tenantList['+ index +'].firstVacTime'">
+          <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第一次接种时间">
               <el-input v-model="dataForm.tenantList[index].firstVacTime" disabled></el-input>
           </el-form-item>
 
-          <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第一次接种地点" :prop="'tenantList['+ index +'].firstVacSite'">
+          <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第一次接种地点">
               <el-input v-model="dataForm.tenantList[index].firstVacSite" disabled></el-input>
           </el-form-item>
 
-          <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第二次接种时间" :prop="'tenantList['+ index +'].secondVacTime'">
+          <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第二次接种时间">
               <el-input v-model="dataForm.tenantList[index].secondVacTime" disabled></el-input>
           </el-form-item>
 
-          <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第二次接种地点" :prop="'tenantList['+ index +'].secondVacSite'">
+          <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第二次接种地点">
               <el-input v-model="dataForm.tenantList[index].secondVacSite" disabled></el-input>
           </el-form-item>
 
-          <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第三次接种时间" :prop="'tenantList['+ index +'].thirdVacTime'">
+          <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第三次接种时间">
               <el-input v-model="dataForm.tenantList[index].thirdVacTime" disabled></el-input>
           </el-form-item>
 
-          <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第三次接种地点" :prop="'tenantList['+ index +'].thirdVacSite'">
+          <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第三次接种地点">
               <el-input v-model="dataForm.tenantList[index].thirdVacSite" disabled></el-input>
           </el-form-item>
 
-          <el-form-item label="原因" :prop="'tenantList['+ index +'].reason'">
+          <el-form-item label="原因">
               <el-input v-model="dataForm.tenantList[index].reason" disabled></el-input>
           </el-form-item>
           <br/>
@@ -222,7 +226,7 @@
         <!--<el-button v-if="dataForm.state === '0'" type="danger" @click="openCheckReasonDialog">{{ $t('checkBTGBtn') }}</el-button>-->
         <!--<el-button v-if="dataForm.state === '0'" type="primary" @click="checkHandle('1')">{{ $t('checkTGBtn') }}</el-button>-->
             <el-button type="danger" @click="openCheckReasonDialog">{{ $t('checkBTGBtn') }}</el-button>
-            <el-button type="primary" @click="checkHandle('1')">{{ $t('checkTGBtn') }}</el-button>
+            <el-button type="primary" @click="checkHandle('1')" :disabled="disabledBtn_check">{{ $t('checkTGBtn') }}</el-button>
         </div>
     </template>
       <el-dialog :visible.sync="dialogVisible" :modal="false">
@@ -294,6 +298,7 @@ export default {
         checkReason: '',
         checkVisible: false,
         disabledBtn: false,
+        disabledBtn_check: false,
         mzOptions:[],
     }
   },
@@ -411,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)
           }
@@ -492,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;
+    }
+  }
+}
 </style>