1.通讯录模块“称呼”改为“通讯录中称呼”，“成员姓名”改成“家人姓名” 2.家根网详情成功展示数据

Tcsm

2023-06-11 2c8b26bef24ccfde85cce836fea1681b204aa74c

1.通讯录模块“称呼”改为“通讯录中称呼”，“成员姓名”改成“家人姓名”
2.家根网详情成功展示数据

 ruoyi-ui/src/views/contacts/contactsInfo.vue

@@ -22,8 +22,8 @@
            </el-form-item>
           </el-cow>
           <el-cow>
            <el-form-item label="称呼" prop="nickName" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
              <el-input v-model="formData.nickName" placeholder="请输入称呼" clearable :style="{width: '100%'}" :disabled="dsb">
            <el-form-item label="通讯录中称呼" prop="nickName" label-width="110px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
              <el-input v-model="formData.nickName" placeholder="请输入通讯录中称呼" clearable :style="{width: '100%'}" :disabled="dsb">
              </el-input>
            </el-form-item>
           </el-cow>

 ruoyi-ui/src/views/contacts/index.vue

@@ -18,7 +18,7 @@
        <!--        v-model="queryParams.id"-->
      </el-form-item>

      <el-form-item label="成员姓名" prop="myName" style="padding-left:180px">
      <el-form-item label="家人姓名" prop="myName" style="padding-left:180px">
        <el-input
          v-model="queryParams.myName"
          placeholder="请输入家人姓名"
@@ -30,10 +30,10 @@

      </el-form-item>

      <el-form-item label="称呼" prop="nickName">
      <el-form-item label="通讯录中称呼" prop="nickName">
        <el-input
          v-model="queryParams.nickName"
          placeholder="请输入称呼"
          placeholder="请输入通讯录中称呼"
          clearable
          style="width: 240px"
          @keyup.enter.native="handleQuery">
@@ -152,7 +152,7 @@
        </template>

      </el-table-column>
      <el-table-column label="称呼" prop="nickName" sortable :show-overflow-tooltip="true" width="120" align="center" />
      <el-table-column label="通讯录中称呼" prop="nickName" sortable :show-overflow-tooltip="true" width="160" align="center" />
      <el-table-column label="姓名" prop="name" sortable :show-overflow-tooltip="true" width="120" align="center"/>
      <el-table-column label="工作单位" prop="work" sortable width="160" align="center" >
        <template slot-scope="scope">{{scope.row.work? scope.row.work: '————'}}</template>
@@ -244,12 +244,12 @@
      <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">

        <el-form-item label="家人姓名" prop="myName">
          <el-input v-model="formDat.myName" placeholder="请输入成员姓名" clearable :style="{width: '100%'}" >
          <el-input v-model="formDat.myName" placeholder="请输入家人姓名" clearable :style="{width: '100%'}" >
        </el-input>
        </el-form-item>

        <el-form-item label="称呼" prop="nickName">
          <el-input v-model="formDat.nickName" placeholder="请输入称呼" clearable :style="{width: '100%'}" ></el-input>
        <el-form-item label="通讯录中称呼" prop="nickName">
          <el-input v-model="formDat.nickName" placeholder="请输入通讯录中称呼" clearable :style="{width: '100%'}" ></el-input>
        </el-form-item>
        <el-form-item label="姓名" prop="name">
          <el-input v-model="formDat.name" placeholder="请输入姓名" clearable :style="{width: '100%'}" >
@@ -476,7 +476,7 @@
        }],
        nickName: [{
          required: true,
          message: '请输入称呼',
          message: '请输入通讯录中称呼',
          trigger: 'blur'
        }],
        name: [{

 ruoyi-ui/src/views/homeRoot/personInfo.vue

@@ -9,10 +9,10 @@
                <el-container>
                  <el-col :span="6" :data="personInfos">
                    <div class="block" :model="personInfos" >
                      <el-col v-model="personInfos.url" prop="url">
                      <el-col v-model="personInfos[0].url" prop="url">
                        <el-avatar shape="square" :size=200 >
                          <el-image
                            :src="'http://47.93.189.255:8080/'+ personInfos.url"
                            :src="'http://47.93.189.255:8080/'+ personInfos[0].url"
                            :fit="fit"
                          ></el-image>
                        </el-avatar>
@@ -26,31 +26,31 @@
                  <el-row>
                    <el-cow :span="8">
                      <el-form-item label="姓名" prop="nickName" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                        <el-input v-model="personInfos.nickName" placeholder="请输入姓名" clearable :style="{width: '100%'}" :disabled="dsb">
                        <el-input v-model="personInfos[0].nickName" placeholder="请输入姓名" clearable :style="{width: '100%'}" :disabled="dsb">
                        </el-input>
                      </el-form-item>
                    </el-cow>
                    <el-cow :span="8">
                      <el-form-item label="身份" prop="identity" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                        <el-input v-model="personInfos.identity" placeholder="请输入身份" clearable :style="{width: '100%'}" :disabled="dsb">
                        <el-input v-model="personInfos[0].identity" placeholder="请输入身份" clearable :style="{width: '100%'}" :disabled="dsb">
                        </el-input>
                      </el-form-item>
                    </el-cow>
                    <el-cow :span="8">
                      <el-form-item label="曾用名" prop="oldName" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                        <el-input v-model="personInfos.oldName" placeholder="请输入曾用名" clearable :style="{width: '100%'}" :disabled="dsb">
                        <el-input v-model="personInfos[0].oldName" placeholder="请输入曾用名" clearable :style="{width: '100%'}" :disabled="dsb">
                        </el-input>
                      </el-form-item>
                    </el-cow>
                    <el-cow :span="8">
                      <el-form-item label="生肖" prop="idNo" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                        <el-input v-model="formData.idNo" placeholder="请输入生肖" clearable :style="{width: '100%'}" :disabled="dsb">
                      <el-form-item label="生肖" prop="shengXiao" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                        <el-input v-model="personInfos[0].shengXiao" placeholder="请输入生肖" clearable :style="{width: '100%'}" :disabled="dsb">
                        </el-input>
                      </el-form-item>
                    </el-cow>
                    <el-cow :span="8">
                      <el-form-item label="星座" prop="grade" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                        <el-input v-model="formData.grade" placeholder="请输入星座" clearable :style="{width: '100%'}" :disabled="dsb">
                      <el-form-item label="星座" prop="constellation" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                        <el-input v-model="personInfos[0].constellation" placeholder="请输入星座" clearable :style="{width: '100%'}" :disabled="dsb">
                        </el-input>
                      </el-form-item>
                    </el-cow>
@@ -63,30 +63,30 @@
                  <el-row>
                    <el-cow :span="8">
                      <el-form-item label="性别" prop="sex" label-width="45px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                        <el-input v-model="formData.sex" placeholder="请输入性别" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
                        <el-input v-model="personInfos[0].sex === 1 ? '男':'女'" placeholder="请输入性别" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
                      </el-form-item>
                    </el-cow>
                    <el-cow :span="8">
                      <el-form-item label="民族" prop="nation" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                        <el-input v-model="formData.nation" placeholder="请输入民族" clearable :style="{width: '100%'}" :disabled="dsb">
                        <el-input v-model="personInfos[0].nation" placeholder="请输入民族" clearable :style="{width: '100%'}" :disabled="dsb">
                        </el-input>
                      </el-form-item>
                    </el-cow>
                    <el-cow :span="8">
                      <el-form-item label="联系方式" prop="phoneNumber" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                        <el-input v-model="formData.phoneNumber" placeholder="请输入联系方式" clearable :style="{width: '100%'}" :disabled="dsb">
                        <el-input v-model="personInfos[0].phoneNumber" placeholder="请输入联系方式" clearable :style="{width: '100%'}" :disabled="dsb">
                        </el-input>
                      </el-form-item>
                    </el-cow>
                    <el-cow :span="8">
                      <el-form-item label="微信号" prop="nationality" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                        <el-input v-model="formData.nationality" placeholder="请输入微信号" clearable :style="{width: '100%'}" :disabled="dsb">
                      <el-form-item label="微信号" prop="wxNo" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                        <el-input v-model="personInfos[0].wxNo" placeholder="请输入微信号" clearable :style="{width: '100%'}" :disabled="dsb">
                        </el-input>
                      </el-form-item>
                    </el-cow>
                    <el-cow :span="8">
                      <el-form-item label="单位" prop="unit" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                        <el-input v-model="formData.unit" placeholder="请输入单位" clearable :style="{width: '100%'}" :disabled="dsb">
                        <el-input v-model="personInfos[0].unit" placeholder="请输入单位" clearable :style="{width: '100%'}" :disabled="dsb">
                        </el-input>
                      </el-form-item>
                    </el-cow>
@@ -97,31 +97,31 @@
                <el-container>
                  <el-row>
                    <el-cow :span="8">
                      <el-form-item label="婚姻状况" prop="sex" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                        <el-input v-model="formData.sex" placeholder="请输入婚姻状况" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
                      <el-form-item label="婚姻状况" prop="maritalStatus" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                        <el-input v-model="personInfos[0].maritalStatus === 1 ? '已婚':'未婚'" placeholder="请输入婚姻状况" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
                      </el-form-item>
                    </el-cow>
                    <el-cow :span="8">
                      <el-form-item label="配偶" prop="spouseId" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                        <el-input v-model="formData.spouseId" placeholder="请输入配偶" clearable :style="{width: '100%'}" :disabled="dsb">
                      <el-form-item label="配偶" prop="nickName" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                        <el-input v-model="personInfos[1].nickName" placeholder="请输入配偶" clearable :style="{width: '100%'}" :disabled="dsb">
                        </el-input>
                      </el-form-item>
                    </el-cow>
                    <el-cow :span="8">
                      <el-form-item label="户籍地址" prop="locationAddress" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                        <el-input v-model="formData.locationAddress" placeholder="请输入户籍地址" clearable :style="{width: '100%'}" :disabled="dsb">
                        <el-input v-model="personInfos[0].locationAddress" placeholder="请输入户籍地址" clearable :style="{width: '100%'}" :disabled="dsb">
                        </el-input>
                      </el-form-item>
                    </el-cow>
                    <el-cow :span="8">
                      <el-form-item label="常住地址" prop="alwaysAddress" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                        <el-input v-model="formData.alwaysAddress" placeholder="请输入常住地址" clearable :style="{width: '100%'}" :disabled="dsb">
                        <el-input v-model="personInfos[0].alwaysAddress" placeholder="请输入常住地址" clearable :style="{width: '100%'}" :disabled="dsb">
                        </el-input>
                      </el-form-item>
                    </el-cow>
                    <el-cow :span="8">
                      <el-form-item label="职务职称" prop="position" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                        <el-input v-model="formData.position" placeholder="请输入职务职称" clearable :style="{width: '100%'}" :disabled="dsb">
                        <el-input v-model="personInfos[0].position" placeholder="请输入职务职称" clearable :style="{width: '100%'}" :disabled="dsb">
                        </el-input>
                      </el-form-item>
                    </el-cow>
@@ -136,31 +136,31 @@
                  <el-row>
                    <el-cow :span="8">
                      <el-form-item label="姓名" prop="nickName" label-width="50px" style="background:#D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
                        <el-input v-model="personInfos.nickName" placeholder="请输入姓名" clearable :style="{width: '100%'}" :disabled="dsb">
                        <el-input v-model="personInfos[1].nickName" placeholder="请输入姓名" clearable :style="{width: '100%'}" :disabled="dsb">
                        </el-input>
                      </el-form-item>
                    </el-cow>
                    <el-cow :span="8">
                      <el-form-item label="身份" prop="identity" label-width="50px" style="background: #D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
                        <el-input v-model="personInfos.identity" placeholder="请输入身份" clearable :style="{width: '100%'}" :disabled="dsb">
                        <el-input v-model="personInfos[1].identity" placeholder="请输入身份" clearable :style="{width: '100%'}" :disabled="dsb">
                        </el-input>
                      </el-form-item>
                    </el-cow>
                    <el-cow :span="8">
                      <el-form-item label="曾用名" prop="oldName" label-width="68px" style="background: #D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
                        <el-input v-model="personInfos.oldName" placeholder="请输入曾用名" clearable :style="{width: '100%'}" :disabled="dsb">
                        <el-input v-model="personInfos[1].oldName" placeholder="请输入曾用名" clearable :style="{width: '100%'}" :disabled="dsb">
                        </el-input>
                      </el-form-item>
                    </el-cow>
                    <el-cow :span="8">
                      <el-form-item label="生肖" prop="idNo" label-width="50px" style="background: #D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
                        <el-input v-model="formData.idNo" placeholder="请输入生肖" clearable :style="{width: '100%'}" :disabled="dsb">
                      <el-form-item label="生肖" prop="shengXiao" label-width="50px" style="background: #D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
                        <el-input v-model="personInfos[1].shengXiao" placeholder="请输入生肖" clearable :style="{width: '100%'}" :disabled="dsb">
                        </el-input>
                      </el-form-item>
                    </el-cow>
                    <el-cow :span="8">
                      <el-form-item label="星座" prop="grade" label-width="50px" style="background: #D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
                        <el-input v-model="formData.grade" placeholder="请输入星座" clearable :style="{width: '100%'}" :disabled="dsb">
                      <el-form-item label="星座" prop="constellation" label-width="50px" style="background: #D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
                        <el-input v-model="personInfos[1].constellation" placeholder="请输入星座" clearable :style="{width: '100%'}" :disabled="dsb">
                        </el-input>
                      </el-form-item>
                    </el-cow>
@@ -173,30 +173,30 @@
                  <el-row>
                    <el-cow :span="8">
                      <el-form-item label="性别" prop="sex" label-width="45px" style="background:#D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
                        <el-input v-model="formData.sex" placeholder="请输入性别" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
                        <el-input v-model="personInfos[1].sex=== 1 ? '男':'女'" placeholder="请输入性别" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
                      </el-form-item>
                    </el-cow>
                    <el-cow :span="8">
                      <el-form-item label="民族" prop="nation" label-width="50px" style="background: #D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
                        <el-input v-model="formData.nation" placeholder="请输入民族" clearable :style="{width: '100%'}" :disabled="dsb">
                        <el-input v-model="personInfos[1].nation" placeholder="请输入民族" clearable :style="{width: '100%'}" :disabled="dsb">
                        </el-input>
                      </el-form-item>
                    </el-cow>
                    <el-cow :span="8">
                      <el-form-item label="联系方式" prop="phoneNumber" label-width="68px" style="background:#D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
                        <el-input v-model="formData.phoneNumber" placeholder="请输入联系方式" clearable :style="{width: '100%'}" :disabled="dsb">
                        <el-input v-model="personInfos[1].phoneNumber" placeholder="请输入联系方式" clearable :style="{width: '100%'}" :disabled="dsb">
                        </el-input>
                      </el-form-item>
                    </el-cow>
                    <el-cow :span="8">
                      <el-form-item label="微信号" prop="nationality" label-width="68px" style="background: #D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
                        <el-input v-model="formData.nationality" placeholder="请输入微信号" clearable :style="{width: '100%'}" :disabled="dsb">
                      <el-form-item label="微信号" prop="wxNo" label-width="68px" style="background: #D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
                        <el-input v-model="personInfos[1].wxNo" placeholder="请输入微信号" clearable :style="{width: '100%'}" :disabled="dsb">
                        </el-input>
                      </el-form-item>
                    </el-cow>
                    <el-cow :span="8">
                      <el-form-item label="单位" prop="unit" label-width="68px" style="background:#D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
                        <el-input v-model="formData.unit" placeholder="请输入单位" clearable :style="{width: '100%'}" :disabled="dsb">
                        <el-input v-model="personInfos[1].unit" placeholder="请输入单位" clearable :style="{width: '100%'}" :disabled="dsb">
                        </el-input>
                      </el-form-item>
                    </el-cow>
@@ -207,31 +207,31 @@
                <el-container>
                  <el-row>
                    <el-cow :span="8">
                      <el-form-item label="婚姻状况" prop="sex" label-width="68px" style="background:#D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
                        <el-input v-model="formData.sex" placeholder="请输入婚姻状况" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
                      <el-form-item label="婚姻状况" prop="maritalStatus" label-width="68px" style="background:#D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
                        <el-input v-model="personInfos[1].maritalStatus === 1 ? '已婚':'未婚'" placeholder="请输入婚姻状况" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
                      </el-form-item>
                    </el-cow>
                    <el-cow :span="8">
                      <el-form-item label="配偶" prop="spouseId" label-width="50px" style="background:#D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
                        <el-input v-model="formData.spouseId" placeholder="请输入配偶" clearable :style="{width: '100%'}" :disabled="dsb">
                      <el-form-item label="配偶" prop="nickName" label-width="50px" style="background:#D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
                        <el-input v-model="personInfos[0].nickName" placeholder="请输入配偶" clearable :style="{width: '100%'}" :disabled="dsb">
                        </el-input>
                      </el-form-item>
                    </el-cow>
                    <el-cow :span="8">
                      <el-form-item label="户籍地址" prop="locationAddress" label-width="68px" style="background:#D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
                        <el-input v-model="formData.locationAddress" placeholder="请输入户籍地址" clearable :style="{width: '100%'}" :disabled="dsb">
                        <el-input v-model="personInfos[1].locationAddress" placeholder="请输入户籍地址" clearable :style="{width: '100%'}" :disabled="dsb">
                        </el-input>
                      </el-form-item>
                    </el-cow>
                    <el-cow :span="8">
                      <el-form-item label="常住地址" prop="alwaysAddress" label-width="68px" style="background: #D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
                        <el-input v-model="formData.alwaysAddress" placeholder="请输入常住地址" clearable :style="{width: '100%'}" :disabled="dsb">
                        <el-input v-model="personInfos[1].alwaysAddress" placeholder="请输入常住地址" clearable :style="{width: '100%'}" :disabled="dsb">
                        </el-input>
                      </el-form-item>
                    </el-cow>
                    <el-cow :span="8">
                      <el-form-item label="职务职称" prop="position" label-width="68px" style="background:#D8E6F5;border-radius: 7px 7px 7px 7px;opacity: 1;">
                        <el-input v-model="formData.position" placeholder="请输入职务职称" clearable :style="{width: '100%'}" :disabled="dsb">
                        <el-input v-model="personInfos[1].position" placeholder="请输入职务职称" clearable :style="{width: '100%'}" :disabled="dsb">
                        </el-input>
                      </el-form-item>
                    </el-cow>
@@ -242,10 +242,10 @@
                <el-container>
                  <el-col :span="6" :data="personInfos">
                    <div class="block" :model="personInfos" >
                      <el-col v-model="personInfos.url" prop="url">
                      <el-col v-model="personInfos[1].url" prop="url">
                        <el-avatar shape="square" :size=200 >
                          <el-image
                            :src="'http://47.93.189.255:8080/'+ personInfos.url"
                            :src="'http://47.93.189.255:8080/'+ personInfos[1].url"
                            :fit="fit"
                          ></el-image>
                        </el-avatar>
@@ -283,6 +283,8 @@
          maritalStatus: undefined,
          politicalOutlook: undefined,
          phoneNumber:undefined,
          wxNo:undefined,
          qqNo:undefined,
          idNum: undefined,
          locationAddress: undefined,
          alwaysAddress:undefined,
@@ -292,6 +294,8 @@
          position:undefined,
          outStatus:undefined,
          idNo: undefined,
          constellation:undefined,
          shengXiao:undefined,
          img: undefined,
          spouseId: undefined,
          fatherId: undefined,