From 803b4b7c603702aec008846cdd5bf3519c18ed30 Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Tue, 6 Dec 2022 16:36:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rent/rentcontractinfo-add-or-update.vue   | 75 ++++---------------
 1 file changed, 16 insertions(+), 59 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 4154a30bc..e64242d71 100644
--- a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
@@ -150,34 +150,34 @@
           <el-button @click="addMember()" type="primary">添加成员</el-button>
           <div><br/></div>
           <div class="add-member" v-for="(item, index) in dataForm.tenantList" :key="index">
-              <el-form-item label="姓名" prop="name" label-width="150px">
+              <el-form-item label="姓名" :prop="'tenantList['+ index +'].name'" :rules="tip" label-width="150px">
                   <el-input v-model="dataForm.tenantList[index].name" placeholder="请输入" ></el-input>
               </el-form-item>
 
-              <el-form-item label="手机" prop="mobile" label-width="150px">
+              <el-form-item label="手机" :prop="'tenantList['+ index +'].mobile'" :rules="tip" label-width="150px">
                 <el-input v-model="dataForm.tenantList[index].mobile" placeholder="请输入"></el-input>
               </el-form-item>
 
-              <el-form-item label="证件号" prop="idCard" label-width="150px">
+              <el-form-item label="证件号" :prop="'tenantList['+index+'].idCard'" :rules="tip" label-width="150px">
                 <el-input v-model="dataForm.tenantList[index].idCard" placeholder="请输入"></el-input>
               </el-form-item>
 
-              <el-form-item label="户籍地" prop="hjszd" label-width="150px">
+              <el-form-item label="户籍地" :prop="'tenantList['+index+'].hjszd'" :rules="tip" label-width="150px">
                 <el-input v-model="dataForm.tenantList[index].hjszd" placeholder="请输入"></el-input>
               </el-form-item>
 
-              <el-form-item label="工作单位" prop="unit" label-width="150px">
+              <el-form-item label="工作单位" :prop="'tenantList['+index+'].unit'" :rules="tip" label-width="150px">
                 <el-input v-model="dataForm.tenantList[index].unit" placeholder="请输入"></el-input>
               </el-form-item>
 
-              <el-form-item label="与户主关系" prop="yfzgx" label-width="150px">
+              <el-form-item label="与户主关系" :prop="'tenantList['+index+'].yfzgx'" :rules="tip_select" 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="politicalStatus" label-width="150px">
+              <el-form-item label="政治面貌" :prop="'tenantList['+index+'].politicalStatus'" :rules="tip_select" label-width="150px">
                 <el-select v-model="dataForm.tenantList[index].politicalStatus" placeholder="请选择">
                   <el-option
                     v-for="item in zzmmOptions"
@@ -188,7 +188,7 @@
                 </el-select>
               </el-form-item>
 
-              <el-form-item label="是否服过兵役" prop="isMilitary" label-width="150px">
+              <el-form-item label="是否服过兵役" :prop="'tenantList['+index+'].isMilitary'" :rules="tip_select" label-width="150px">
                 <el-select v-model="dataForm.tenantList[index].isMilitary" placeholder="请选择">
                   <el-option
                     v-for="item in shifouOptions"
@@ -199,7 +199,7 @@
                 </el-select>
               </el-form-item>
 
-              <el-form-item label="国籍" prop="nation" label-width="150px">
+              <el-form-item label="国籍" :prop="'tenantList['+index+'].nation'" :rules="tip_select" label-width="150px">
                 <el-select v-model="dataForm.tenantList[index].nation" placeholder="请选择">
                   <el-option
                     v-for="item in nationOptions"
@@ -231,7 +231,7 @@
                 </template>
               </el-form-item>
               <br/>
-              <el-form-item label="民族" prop="mz" label-width="150px">
+              <el-form-item label="民族" :prop="'tenantList['+index+'].mz'" :rules="tip_select" label-width="150px">
                 <el-select v-model="dataForm.tenantList[index].mz" placeholder="请选择">
                   <el-option
                     v-for="item in mzOptions"
@@ -267,7 +267,7 @@
                 </el-date-picker>
               </el-form-item> -->
 
-              <el-form-item label="是否接种" prop="isVaccination" label-width="150px">
+              <el-form-item label="是否接种" :prop="'tenantList['+index+'].isVaccination'" :rules="tip_select" label-width="150px">
                 <el-select v-model="dataForm.tenantList[index].isVaccination" placeholder="请选择">
                   <el-option
                     v-for="item in isVaccinationOption"
@@ -278,10 +278,7 @@
                 </el-select>
               </el-form-item>
               <br/>
-              <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" 
-                            label="第一次接种时间" 
-                            prop="firstVacTime" 
-                            label-width="150px">
+              <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第一次接种时间" :prop="'tenantList['+index+'].firstVacTime'" :rules="tip_select" label-width="150px">
                 <el-date-picker
                     v-model="dataForm.tenantList[index].firstVacTime"
                     type="date"
@@ -294,10 +291,7 @@
               </el-form-item>
 
 
-              <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" 
-                            label="第一次接种地点" 
-                            prop="firstVacSite" 
-                            label-width="150px">
+              <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第一次接种地点" :prop="'tenantList['+index+'].firstVacSite'" :rules="tip_select" label-width="150px">
                 <el-select v-model="dataForm.tenantList[index].firstVacSite" placeholder="请选择">
                   <el-option
                     v-for="item in vacSiteOption"
@@ -587,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: {
@@ -662,45 +658,6 @@ export default {
         endDate: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        name: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        mobile: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        idCard: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        hjszd: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        unit: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        yfzgx: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        politicalStatus: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        isMilitary: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        nation: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        mz: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        isVaccination: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        firstVacTime: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        firstVacSite: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
         // fileList: [
         //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         // ],