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

Tcsm

2023-06-11 2c8b26bef24ccfde85cce836fea1681b204aa74c

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

@@ -18,10 +18,10 @@
        <!--        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="请输入成员姓名"
          placeholder="请输入家人姓名"
          clearable
          style="width: 240px"
          @keyup.enter.native="handleQuery">
@@ -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">
@@ -70,14 +70,14 @@
     </el-form-item>
    </el-form>
    <div>
      <div style="width: 72px;
      height: 24px;
      font-size: 18px;
      font-family: Microsoft YaHei-Regular, Microsoft YaHei;
      font-weight: 400;
      color: #000000;
      line-height: 21px;
      ">通讯录</div>
<!--      <div style="width: 72px;-->
<!--      height: 24px;-->
<!--      font-size: 18px;-->
<!--      font-family: Microsoft YaHei-Regular, Microsoft YaHei;-->
<!--      font-weight: 400;-->
<!--      color: #000000;-->
<!--      line-height: 21px;-->
<!--      ">通讯录</div>-->

    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
@@ -117,7 +117,7 @@
            plain
            icon="el-icon-download"
            size="mini"
            @click="handleExport"
            @click="handleExportTemplate"
            v-hasPermi="['family:note:export']"
          >导入模板下载</el-button>
        </el-col>
@@ -140,11 +140,11 @@
    </el-row>

  </div>
    <el-table v-loading="loading" :data="contactList"  @selection-change="handleSelectionChange"  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
      <el-table-column type="selection" width="25"  align="center" />
      <el-table-column  label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80"/>
    <el-table v-loading="loading" :data="contactList"  :row-key="getRowId" ref="multipleTable"  @selection-change="handleSelectionChange"  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
      <el-table-column type="selection" :reserve-selection="true" width="25"  align="center" />
      <el-table-column fixed label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80"/>

      <el-table-column label="成员姓名" prop="myName" sortable width="160" >
      <el-table-column label="家人姓名" prop="myName" sortable width="160" >
        <template slot-scope="scope">
          <div>
            <a href="javascript:;" @click="handleCheck(scope.row)">{{scope.row.myName}}</a>
@@ -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>
@@ -178,13 +178,11 @@
        </template>
      </el-table-column>

      <el-table-column label="备注（是否存在金钱关系）" prop="remark" sortable width="220" >


      <el-table-column label="备注（是否存在金钱关系）" prop="remark" sortable width="120" align="center">
        <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '————'}}</template>
      </el-table-column>

      <el-table-column label="电子名片" prop="url" width="160" >
      <el-table-column label="电子名片" prop="url" width="160" align="center">
           <template slot-scope="scope" >
             <img
               class="el-upload-list__item-thumbnail"
@@ -222,19 +220,12 @@
            @click="handleDelete(scope.row)"
            v-hasPermi="['system:role:remove']"
          >删除</el-button>

           <el-button
             size="mini"
             type="text"
             icon="el-icon-d-arrow-right"
             @click="handleCheck(scope.row)">
查看详情</el-button>






        </template>
      </el-table-column>
    </el-table>
@@ -252,13 +243,13 @@
    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
      <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-form-item label="家人姓名" prop="myName">
          <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%'}" >
@@ -480,12 +471,12 @@
        // }],
        myName: [{
          required: true,
          message: '请输入成员姓名',
          message: '请输入家人姓名',
          trigger: 'blur'
        }],
        nickName: [{
          required: true,
          message: '请输入称呼',
          message: '请输入通讯录中称呼',
          trigger: 'blur'
        }],
        name: [{
@@ -545,7 +536,10 @@
      this.open = false;
      this.reset();
    },

    getRowId(row)
    {
      return row.id
    },
    //隔行变色
    tableRowClassName({ row, rowIndex }) {
      if (rowIndex % 2 == 0) {
@@ -721,7 +715,7 @@
    /** 删除按钮操作 */
    handleDelete(row) {
      const Ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除编号为"' + Ids + '"的数据项？').then(function() {
      this.$modal.confirm('是否确认删除数据项？').then(function() {
        return delContact(Ids);
      }).then(() => {
        this.getList();
@@ -730,9 +724,22 @@
    },
    /** 导出按钮操作 */
    handleExport() {
      const Ids = this.ids;

      if(Ids.length==0)
      {
      this.download('zfContact/export', {
        ...this.queryParams
      }, `zfContact_${new Date().getTime()}.xlsx`)
      }else{
        this.download('zfContact/export1/'+Ids, {
        }, `zfContact_${new Date().getTime()}.xlsx`)
      }
    },
    handleExportTemplate(){
      this.download('zfContact/model', {
        ...this.queryParams
      }, `zfContact_${new Date().getTime()}.xlsx`)
    },
    /** 导入操作*/
    handleEnport(params){