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

Tcsm

2023-06-11 2c8b26bef24ccfde85cce836fea1681b204aa74c

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

@@ -1,73 +1,83 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">

      <el-col  :span="6" >
        <el-input size="medium" v-model="input" placeholder="搜索" clearable>
      <el-form-item label="" prop="phone wx qq twitter isAlways remark" >
        <el-input
          v-model:phone="queryParams.phone"
          v-model:wx="queryParams.wx"
          v-model:qq="queryParams.qq"
          v-model:twitter="queryParams.twitter"
          v-model:isAlways="queryParams.isAlways"
          v-model:remark="queryParams.remark"
          placeholder="在“通讯录”中搜索"
          clearable
          style="width: 240px"
          @keyup.enter.native="handleQuery">
          <i slot="prefix" class="el-input__icon el-icon-search"></i>
        </el-input>
      </el-col>

      <el-form-item label="时间" style="padding-left:80px">
          <el-date-picker
            v-model="dateRange"
            style="width: 240px"
            value-format="yyyy-MM-dd HH-MM"
            type="daterange"
            range-separator="-"
            start-placeholder="开始日期"
            end-placeholder="结束日期"
          ></el-date-picker>
        <!--        v-model="queryParams.id"-->
      </el-form-item>

      <el-form-item label="类别" prop="type">
          <el-select
            v-model="queryParams.type"
            placeholder="所有类别"
      <el-form-item label="家人姓名" prop="myName" style="padding-left:180px">
        <el-input
          v-model="queryParams.myName"
          placeholder="请输入家人姓名"
          clearable
          style="width: 240px"
          @keyup.enter.native="handleQuery">
          <i slot="prefix" class="el-input__icon el-icon-search"></i>
        </el-input>

      </el-form-item>

      <el-form-item label="通讯录中称呼" prop="nickName">
        <el-input
          v-model="queryParams.nickName"
          placeholder="请输入通讯录中称呼"
          clearable
          style="width: 240px"
          @keyup.enter.native="handleQuery">
          <i slot="prefix" class="el-input__icon el-icon-search"></i>
        </el-input>
      </el-form-item>

        <el-form-item label="姓名" prop="name">
          <el-input
            v-model="queryParams.name"
            placeholder="请输入姓名"
            clearable
            style="width: 240px"
            @keyup.enter.native="handleQuery">
            <i slot="prefix" class="el-input__icon el-icon-search"></i>
          </el-input>
        </el-form-item>
        <el-form-item label="工作单位" prop="work">
          <el-input
            v-model="queryParams.work"
            placeholder="请输入工作单位"
            clearable
            style="width: 240px"
            @keyup.enter.native="handleQuery"
          >
            <el-option
              v-for="dict in typeOptions"
              :key="dict.value"
              :label="dict.label"
              :value="dict.value"
            />
          </el-select>
      </el-form-item>
      <el-form-item label="标题" prop="title">
        <el-input
          v-model="queryParams.title"
          placeholder="请输入标题"
          clearable
          style="width: 240px"title
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="持有人" prop="holder">
        <el-input
          v-model="queryParams.holder"
          placeholder="请输入持有人"
          clearable
          style="width: 240px"
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="存放地址" prop="address">
        <el-input
          v-model="queryParams.address"
          placeholder="请输入具体位置"
          clearable
          style="width: 240px"
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>

      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
      </el-form-item>
            <i slot="prefix" class="el-input__icon el-icon-search"></i>
          </el-input>
        </el-form-item>
     <el-form-item>
       <el-button size="mini" @click="handleQuery" style=" width: 67px;height: 27px;background: #FFDDE3;
              border-radius: 7px 7px 7px 7px;opacity: 1; " >搜索</el-button>
       <el-button  size="mini" @click="resetQuery" style=" width: 67px;height: 27px;background: #FFDDE3;
              border-radius: 7px 7px 7px 7px;opacity: 1; ">重置</el-button>
     </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>-->

    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
@@ -80,7 +90,6 @@
          v-hasPermi="['system:role:add']"
        >新增</el-button>
      </el-col>

      <el-col :span="1.5">
        <el-button
          type="danger"
@@ -101,24 +110,100 @@
          @click="handleExport"
          v-hasPermi="['family:note:export']"
        >导出</el-button>
      </el-col>
              </el-col>
      <el-col :span="1.5">
          <el-button
            type="warning"
            plain
            icon="el-icon-download"
            size="mini"
            @click="handleExportTemplate"
            v-hasPermi="['family:note:export']"
          >导入模板下载</el-button>
        </el-col>
      <el-col :span="1.2">

          <el-upload
            action=""

            class="upload-demo"
            :show-file-list="false"
            :http-request="handleEnport"
          >
            <el-button size="mini"   type="primary"
            plain
            icon="el-icon-plus" >导入</el-button>

          </el-upload>
        </el-col>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>

    <el-table v-loading="loading" :data="propertyList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55"  align="center" />
      <el-table-column label="资产编号" prop="id" sortable width="120" />
      <el-table-column label="类型" prop="type" sortable :show-overflow-tooltip="true" width="150" />
      <el-table-column label="标题" prop="title" sortable :show-overflow-tooltip="true" width="150" />
      <el-table-column label="存储地址" prop="location" sortable width="100" />
      <el-table-column label="持有人" prop="holder" sortable width="100" />
      <el-table-column label="具体位置" prop="address" sortable width="100" />
      <el-table-column label="备注信息" prop="remark" sortable width="100" />
      <el-table-column label="创建时间" align="center" sortable prop="createTime" width="180">
  </div>
    <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" >
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.createTime) }}</span>
          <div>
            <a href="javascript:;" @click="handleCheck(scope.row)">{{scope.row.myName}}</a>
          </div>
        </template>

      </el-table-column>
      <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>
      </el-table-column>
      <el-table-column label="手机" prop="phone" sortable width="120" align="center" >
        <template slot-scope="scope">{{scope.row.phone? scope.row.phone: '————'}}</template>
      </el-table-column>
      <el-table-column label="其它联系方式" prop="wx qq twitter" sortable width="180" align="center" >
        <template slot-scope="scope">
          <span v-if="scope.row.wx || scope.row.qq || scope.row.twitter == true">
            {{scope.row.wx}}<br>
            {{scope.row.qq}}<br>
            {{scope.row.twitter}}
          </span>
          <span v-else>————</span>
        </template>
      </el-table-column>
      <el-table-column label="是否常联系" prop="isAlways" sortable width="170" align="center" >
        <template slot-scope="scope">
          <span v-if="scope.row.isAlways===1">是</span>
          <span v-if="scope.row.isAlways===0">否</span>
          <span v-if="scope.row.isAlways== null">——</span>
        </template>
      </el-table-column>

      <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" align="center">
           <template slot-scope="scope" >
             <img
               class="el-upload-list__item-thumbnail"
               src="../../assets/images/deviceLis.png"
               alt=""
               style="width: 35px; height: 35px;"
               fit="cover"
                v-if="scope.row.url !== ','"
             >
      <img
               class="el-upload-list__item-thumbnail"
               src="../../assets/images/deviceA.png"
               alt=""
               style="width: 35px; height: 35px;"
               fit="cover"
                v-if="scope.row.url === ','"
             >
           </template>
        </el-table-column>


      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope" v-if="scope.row.roleId !== 1">
          <el-button
@@ -135,18 +220,12 @@
            @click="handleDelete(scope.row)"
            v-hasPermi="['system:role:remove']"
          >删除</el-button>
          <el-dropdown
            size="mini"
            @command="(command) => handleCommand(command, scope.row)"
            v-hasPermi="['system:role:edit']">
            <el-button
              size="mini"
              type="text"
              icon="el-icon-d-arrow-right"
              @click="handleCheck(scope.row)"
            >查看详情</el-button>

          </el-dropdown>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-d-arrow-right"
             @click="handleCheck(scope.row)">
查看详情</el-button>
        </template>
      </el-table-column>
    </el-table>
@@ -156,40 +235,56 @@
      :total="total"
      :page.sync="queryParams.pageNum"
      :limit.sync="queryParams.pageSize"
      style="background: #FEF7FC;"
      @pagination="getList"
    />

    <!-- 添加或修改资产信息配置对话框 -->

    <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="type">
          <el-select v-model="formDat.type" placeholder="请选择类别" clearable :style="{width: '100%'}"  >
            <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
            ></el-option>
          </el-select>
        <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="title">
          <el-input v-model="formDat.title" 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="location">
          <el-input v-model="formDat.location" placeholder="请输入存储地址" clearable :style="{width: '100%'}" >
        <el-form-item label="姓名" prop="name">
          <el-input v-model="formDat.name" placeholder="请输入姓名" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="持有人" prop="holder">
          <el-input v-model="formDat.holder" placeholder="请输入持有人" clearable :style="{width: '100%'}" >
        <el-form-item label="工作单位" prop="work">
          <el-input v-model="formDat.work" placeholder="请输入工作单位" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="具体位置" prop="address">
          <el-input v-model="formDat.address" placeholder="请输入具体位置" clearable :style="{width: '100%'}" >
        <el-form-item label="手机" prop="phone">
          <el-input v-model="formDat.phone" placeholder="请输入手机" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="备注" prop="remark">
        <el-form-item label="微信" prop="wx">
          <el-input v-model="formDat.wx" placeholder="请输入微信" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="QQ" prop="qq">
          <el-input v-model="formDat.qq" placeholder="请输入QQ" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="twitter" prop="twitter">
          <el-input v-model="formDat.twitter" placeholder="请输入twitter" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="是否常联系" prop="isAlways">
          <el-input v-model="formDat.isAlways" placeholder="是否常联系" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>

        <el-form-item label="备注（是否存在金钱关系）" prop="remark">
          <el-input v-model="formDat.remark" placeholder="请输入备注" clearable :style="{width: '100%'}" ></el-input>
        </el-form-item>

        <h4 class="form-header">相关图片 </h4>
        <h4 class="form-header">电子名片 </h4>
        <el-upload
          action="#"
          list-type="picture-card"
@@ -238,7 +333,7 @@
          :http-request="requestUpload"
          :show-file-list="true"
        >
          <el-button type="primary">Click to upload</el-button>
          <el-button type="primary">点击上传</el-button>
          <template #tip>
            <div class="el-upload__tip">
            </div>
@@ -249,12 +344,11 @@
      <h4 class="form-header"> </h4>

      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitDataScope">确 定</el-button>
        <el-button type="primary" @click="submitDataScope">保 存</el-button>
        <el-button @click="cancelData">取 消</el-button>
      </div>
    </el-dialog>

    <!-- 分配角色数据权限对话框 -->
    <el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>

    </el-dialog>
@@ -266,12 +360,12 @@
import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";

import { Notification, MessageBox, Message, Loading } from 'element-ui'


//在system/note/index.js中导入接口函数
import {listProperty, getPropertyInfo, delProperty, getCategory, addProperty, uploadPic} from "@/api/note/index";
//导入接口函数
import {getContactList,enload,  addContact, delContact,uploadPic} from "@/api/contacts/index";
export default {
  name: "Role",
  name: "index",
  dicts: ['sys_normal_disable'],
  data() {
    return {
@@ -290,8 +384,8 @@
      showSearch: true,
      // 总条数
      total: 0,
      // 资产表格数据
      propertyList: [],
      // 通讯录表格数据
      contactList: [],
      // 弹出层标题
      title: "",
      // 是否显示弹出层
@@ -313,14 +407,31 @@
      ],
      dsb:true,
      btn:false,
      fit:['fill'],

      formDat: {
        type: undefined,
        title: undefined,
        location: undefined,
        holder: undefined,
        address: undefined,
        remark: undefined,
        //通讯录
        id:undefined,
        myName:undefined,
        nickName:undefined,
        name:undefined,
        work:undefined,

        phone:undefined,
        wx:undefined,
        qq:undefined,
        twitter:undefined,
        isAlways:undefined,
        remark:undefined,
        url: undefined,

        // type: undefined,
        // title: undefined,
        // location: undefined,
        // holder: undefined,
        // address: undefined,


      },
      // 菜单列表
      menuOptions: [],
@@ -330,13 +441,21 @@
      queryParams: {
        pageNum: 1,
        pageSize: 10,
        type:undefined,
        title:undefined,
        location:undefined,
        holder:undefined,
        address:undefined,
        createTime:undefined
        id:undefined,
        myName:undefined,
        nickName:undefined,
        name:undefined,
        work:undefined,

        phone:undefined,
        wx:undefined,
        qq:undefined,
        twitter:undefined,
        isAlways:undefined,
        remark:undefined,
      },
      // searchVal:"",

      // 表单参数
      form: {},
      defaultProps: {
@@ -345,40 +464,60 @@
      },
      // 表单校验
      rules: {
        type: [{
        // id: [{
        //   required: true,
        //   message: '请输入id',
        //   trigger: 'blur'
        // }],
        myName: [{
          required: true,
          message: '请选择类别',
          trigger: 'change'
        }],
        title: [{
          required: true,
          message: '请输入标题',
          message: '请输入家人姓名',
          trigger: 'blur'
        }],
        location: [{
        nickName: [{
          required: true,
          message: '请输入存储地址',
          message: '请输入通讯录中称呼',
          trigger: 'blur'
        }],
        holder: [{
        name: [{
          required: true,
          message: '请输入持有人',
          message: '请输入姓名',
          trigger: 'blur'
        }],
        address: [{
          required: true,
          message: '请输入具体位置',
        work: [{
          // required: true,
          message: '请输入工作单位',
          trigger: 'blur'
        }],
        phone: [{
          // required: true,
          message: '请输入手机',
          trigger: 'blur'
        }],
        wx: [{
          // required: true,
          message: '请输入微信',
          trigger: 'blur'
        }],
        qq: [{
          // required: true,
          message: '请输入QQ',
          trigger: 'blur'
        }],
        twitter: [{
          // required: true,
          message: '请输入twitter',
          trigger: 'blur'
        }],
        isAlways: [{
          // required: true,
          message: '是否常联系',
          trigger: 'blur'
        }],
        remark: [{
          required: true,
          // required: true,
          message: '请输入备注',
          trigger: 'blur'
        }],
        createTime: [{
          required: true,
          message: '请选择日期选择',
          trigger: 'change'
        }],
      },
      typeOptions: [],
@@ -386,8 +525,10 @@
  },
  created() {
    this.getList();
    this.getCateInfor()

    // this.getCateInfor()
    // for (let i = 0; i < this.contactList.length; i++) {
    //   this.formDat[i] = this.contactList[i];
    // }
  },
  methods: {
    // 取消按钮
@@ -395,15 +536,28 @@
      this.open = false;
      this.reset();
    },
    /** 查询角色列表 */
    getRowId(row)
    {
      return row.id
    },
    //隔行变色
    tableRowClassName({ row, rowIndex }) {
      if (rowIndex % 2 == 0) {
        return "statistics-warning-row1";
      } else {
        return "statistics-warning-row";
      }
    },

    /** 查询通讯录列表 */
    getList() {
      this.loading = true;
      // console.log(this.queryParams)
      //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
      listProperty(this.queryParams).then(response => {
      getContactList(this.queryParams).then(response => {
          //  alert(123)
          //   console.log(response.data)
          this.propertyList = response.data.data;
          this.contactList = response.data.data;

          this.total = response.data.total;
          this.loading = false;
@@ -411,16 +565,16 @@
      );
    },
    /** 查询类别信息 */
    getCateInfor()
    {
      let _this = this
      getCategory().then(response=>{

        response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
          _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
        })
      })
    },
    // getCateInfor()
    // {
    //   let _this = this
    //   getCategory().then(response=>{
    //
    //     response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
    //       _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
    //     })
    //   })
    // },

    handleRemove(file) {
      alert(323)
@@ -476,17 +630,25 @@
      this.single = selection.length!=1
      this.multiple = !selection.length
    },
    // //每次改变input框值时就改变this.myTableData的值
    // inputChange() { //循环每一项 只要content的值含有输入的searchVal值，就加进newList；反之，就无东西加进newList
    //   let newlist = this.formDat.filter(
    //     (item) => item.content.indexOf(this.searchVal) > -1
    //   );
    //   this.contactList = newlist;
    // },


    /** 新增按钮操作 */
    handleAdd() {
      this.reset();
      this.open = true;
      this.title = "添加资产详细信息";
      this.title = "添加通讯录详细信息";
    },
    /** 查看详细信息 */
    handleCheck(row){
      const id = row.id;
      this.$router.push("/family/note1/propertyInfo/" + id);
      this.$router.push("/familymodel/Contact/contactsInfo/" + id);
    },
    /** 修改按钮操作 */
    handleUpdate(row) {
@@ -494,7 +656,7 @@
      let jd = true

      this.$router.push({
        path:"/family/note1/propertyInfo/" + id,
        path:"/familymodel/Contact/contactsInfo/" + id,
        query:{
          detail:jd
        }
@@ -519,7 +681,7 @@
      this.$refs["elForm"].validate(valid => {
        if (valid) {

          addProperty(this.formDat).then(response => {
          addContact(this.formDat).then(response => {
            this.$modal.msgSuccess("新增成功");
            this.open = false;
            this.getList();
@@ -553,8 +715,8 @@
    /** 删除按钮操作 */
    handleDelete(row) {
      const Ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除资产编号为"' + Ids + '"的数据项？').then(function() {
        return delProperty(Ids);
      this.$modal.confirm('是否确认删除数据项？').then(function() {
        return delContact(Ids);
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");
@@ -562,10 +724,56 @@
    },
    /** 导出按钮操作 */
    handleExport() {
      this.download('family/property/export', {
      const Ids = this.ids;

      if(Ids.length==0)
      {
      this.download('zfContact/export', {
        ...this.queryParams
      }, `property_${new Date().getTime()}.xlsx`)
      }, `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){
    var file = params.file;
    var formData = new FormData();
    formData.append('excelImport', file);
    let _this = this
    enload(formData).then(response => {
       _this.getList();
      Message({ message: "导入成功", type: 'warning' })

    }).catch(err)
    {
      Message({ message: "导入失败", type: 'error' })
    }

    }
  }
};
</script>

<style >
.app-container{
  background-color: #FEF7FC;
}

.el-table__row.statistics-warning-row {
  background: #E0EEFE;

}
.el-table__row.statistics-warning-row1 {
  background: #FFEFF2;

}


</style>