Merge branch 'master' into shibei_master

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)

src/views/components/resiForm.vue

@@ -105,7 +105,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">
@@ -316,11 +316,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] = [

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>

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>

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>