From 8a67dd573ff39d4a933d0f7f1cc1b420cb66a559 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Mon, 11 Apr 2022 09:23:17 +0800
Subject: [PATCH 1/4] dd

---
 src/views/modules/base/epidemic/travelForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/base/epidemic/travelForm.vue b/src/views/modules/base/epidemic/travelForm.vue
index ed662cab..c6d1f6fc 100644
--- a/src/views/modules/base/epidemic/travelForm.vue
+++ b/src/views/modules/base/epidemic/travelForm.vue
@@ -53,7 +53,7 @@
             <el-option v-for="item in personList"
                        @click.native="handleSelPerson(item)"
                        :key="item.demandUserId"
-                       :label="item.demandUserName"
+                       :label="item.label"
                        :value="item.demandUserId">
             </el-option>
           </el-select>

From bae5cb7a10c488ee67c7eff5534b0c6353f91c55 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Mon, 11 Apr 2022 14:33:10 +0800
Subject: [PATCH 2/4] dd

---
 src/views/components/editResi.vue                  | 8 ++++----
 src/views/modules/communityService/sqzzz/index.vue | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue
index d7afc877..cb71cda7 100644
--- a/src/views/components/editResi.vue
+++ b/src/views/components/editResi.vue
@@ -137,7 +137,7 @@
             <!-- <el-col v-for="n in item" :key="n.id" :span="n.itemType === 'textarea'&&24 || (24/columns)"> -->
             <el-col v-for="n in item" :key="n.itemId" :span="item.length === 1 ? 24 : (24/columns)"
             :style="n.itemType === 'divider' && 'display: none;'">
-              <el-form-item :prop="n.columnName" :label="n.label" :required="Boolean(n.required)">
+              <el-form-item :prop="n.columnName" :label="n.label">
                 <!-- <div class="resi-cell"> -->
                   <!-- <div class="resi-cell-label">{{n.label}}</div> -->
                   <div class="resi-cell-value">
@@ -363,11 +363,11 @@ export default {
         if (item.required) {
           if (item.validType === 'mobile') {
             rules[item.columnName] = [
-              { validator: checkMObile, trigger: 'blur' }
+              { required: true, validator: checkMObile, trigger: 'blur' }
             ]
           } else if (item.validType === 'id_card') {
             rules[item.columnName] = [
-              { validator: checkIdCard, trigger: 'blur' }
+              { required: true, validator: checkIdCard, trigger: 'blur' }
             ]
           } else {
             rules[item.columnName] = [
@@ -501,7 +501,7 @@ export default {
   },
   created () {
     this.initForm()
-    // console.log('formInfo---ggg', this.form)
+    console.log('formInfo---gggreg', this.rulesForm)
     if (this.supportAdd) {
       this.addList = [...this.mutiList]
       // console.log('addList----111', this.addList)
diff --git a/src/views/modules/communityService/sqzzz/index.vue b/src/views/modules/communityService/sqzzz/index.vue
index 9e347e83..940778b6 100644
--- a/src/views/modules/communityService/sqzzz/index.vue
+++ b/src/views/modules/communityService/sqzzz/index.vue
@@ -95,7 +95,7 @@
           align="center"
         >
           <template slot-scope="scope">
-            <a class="name-a" @click="handleWatch(scope.row)">
+            <a class="name-a" @click="handleWatch(scope.$index)">
               {{ scope.row.organizationName }}
             </a>
           </template>

From 679793ae70e053ab08c3edd64eafb5b9dc35b0e3 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Mon, 11 Apr 2022 14:34:30 +0800
Subject: [PATCH 3/4] dd

---
 src/views/components/resiForm.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue
index 506c2265..d7b0587d 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -146,7 +146,7 @@
             <!-- <el-col v-for="n in item" :key="n.id" :span="n.itemType === 'textarea'&&24 || (24/columns)"> -->
             <el-col v-for="n in item" :key="n.itemId" :span="item.length === 1 ? 24 : (24/columns)"
             :style="n.itemType === 'divider' && 'display: none;'">
-              <el-form-item :prop="n.columnName" :label="n.label" :required="Boolean(n.required)">
+              <el-form-item :prop="n.columnName" :label="n.label">
                 <!-- <div class="resi-cell"> -->
                   <!-- <div class="resi-cell-label">{{n.label}}</div> -->
                   <div class="resi-cell-value">
@@ -355,11 +355,11 @@ export default {
         if (item.required) {
           if (item.validType === 'mobile') {
             rules[item.columnName] = [
-              { validator: checkMObile, trigger: 'blur' }
+              { required: true, validator: checkMObile, trigger: 'blur' }
             ]
           } else if (item.validType === 'id_card') {
             rules[item.columnName] = [
-              { validator: checkIdCard, trigger: 'blur' }
+              { required: true, validator: checkIdCard, trigger: 'blur' }
             ]
           } else {
             rules[item.columnName] = [

From 4528f1957c0d2f2741e2df88bece56f3410edd98 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 11 Apr 2022 14:36:22 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/visual/basicinfo/people.vue | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/visual/basicinfo/people.vue b/src/views/modules/visual/basicinfo/people.vue
index 146a16d0..2079e0d6 100644
--- a/src/views/modules/visual/basicinfo/people.vue
+++ b/src/views/modules/visual/basicinfo/people.vue
@@ -139,12 +139,8 @@
                    src="@/assets/img/shuju/people/huzhu-line/zuo2.png" />
               <div class="rel-text"
                    :class="houseInfo.userList[0].isSelf == '1' ? 'z-on' : ''">
-                <!-- <div class="rel-call">岳父母或公婆</div>
-                <div class="rel-name">吉克隽逸</div> -->
-                <span class="rel-call">{{
-                  houseInfo.userList[0].relation
-                }}</span>
-                <span class="rel-name">（{{ houseInfo.userList[0].userName }}）</span>
+                <div class="rel-call">{{ houseInfo.userList[0].relation }}</div>
+                <div class="rel-name">{{ houseInfo.userList[0].userName }}</div>
               </div>
             </div>