4.10提交

Tcsm

2023-04-10 3ca2523e54e60eb4bd20f525f91f264c2e8d45f2

4.10提交

 ruoyi-ui/src/api/contacts/index.js

@@ -1 +1,63 @@
import request from '@/utils/request'
// 查询所有通讯录
export function getContactList() {
  return request({
    url: '/zfContact/all' ,
    method: 'get',

  })
}

// 根据id查询通讯录详细信息
export function getContactIdList() {
  return request({
    url: '/zfContact/2' ,
    method: 'get',

  })
}

//新增通讯录
export function addContact(data)
{
  return request({
    url: '/zfContact',
    method: 'post',
    data: data
  })
}

//修改通讯录
export function updateContact(data) {
  return request({
    url: '/zfContact',
    method: 'put',
    data: data
  })
}

// 删除通讯录
export function delContact(ids) {
  return request({
    url: '/zfContact/' +ids,
    method: 'delete'
  })
}

//上传文件
export function uploadPic(data) {
  return request({
    url: '/common/upload',
    method: 'post',
    data: data
  })
}
//下载文件
export function download(data) {
  return request({
    url: '/common/downLoadFile',
    method: 'get',
    params: data,
    responseType: 'blob'
  })
}

 ruoyi-ui/src/api/self/index.js

@@ -19,9 +19,9 @@
}

// 删除个人信息
export function delIndividual(Ids) {
export function delIndividual(ids) {
  return request({
    url: '/self/user' ,
    url: '/self/user' +ids,
    method: 'delete'
  })
}
@@ -49,7 +49,6 @@

//查询所有个人经历
export function listExperience(query) {
  
  return request({
    url: '/zExperience/all',
    method: 'get',
@@ -191,3 +190,31 @@
    data: data
  })
}

//拿到自传
export function getAutobiography()
{
  return request({
    url: '/zDict/byId',
    method: 'get',
    params: {'id':23}
  })
}

//上传文件
export function uploadPic(data) {
  return request({
    url: '/common/upload',
    method: 'post',
    data: data
  })
}
//下载文件
export function download(data) {
  return request({
    url: '/common/downLoadFile',
    method: 'get',
    params: data,
    responseType: 'blob'
  })
}

 ruoyi-ui/src/router/index.js

@@ -121,7 +121,7 @@
    children: [
      {
        path: 'propertyInfo/:id(\\d+)',
        component: () => import('@/views/note/propertylnfo'),
        component: () => import('@/views/note/propertyInfo'),
        name: 'propertyInfo',
        meta: { title: '查询详情'}
      }
@@ -143,27 +143,10 @@
      }
    ]
  },
  //家庭设备详情页
  {
    path: '/jiatingshebei/device',
    component: Layout,
    // permissions: [],
    permissions: ['jiatingshebei:device:list'],
    hidden: true,
    children: [
      {
        path: 'equipmentInfo/:id(\\d+)',
        component: () => import('@/views/device/equipmentInfo'),
        name: 'equipmentInfo',
        meta: { title: '查询详情'}
      }
    ]
  },


  //编辑个人信息
  {
    path: '/self/user',
    path: '/self/self',
    component: Layout,
    permissions: ['self:self:list'],


 ruoyi-ui/src/views/bignote/familyInfo.vue

New file
@@ -0,0 +1,363 @@
<template>
    <div class="app-container">
      <div class="form-header mt">
        <h4 class="dt h4">资产详细信息 </h4>
        <el-button type="primary" class="pt"  icon="el-icon-edit" @click="handleEdit()" :disabled="btn">编辑</el-button>
      </div>
  
      <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px">
        <el-form-item label="id" prop="id">
          <el-input v-model="formData.id" placeholder="请输入id" :maxlength="11" show-word-limit :disabled="true"
                    clearable prefix-icon='el-icon-mobile' :style="{width: '100%'}"></el-input>
        </el-form-item>
        <el-form-item label="类别" prop="type">
          <el-select v-model="formData.type" placeholder="请选择类别" clearable :style="{width: '100%'}" :disabled="dsb" >
            <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
                       :disabled="item.disabled"></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="标题" prop="title">
          <el-input v-model="formData.title" placeholder="请输入标题" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
        </el-form-item>
        <el-form-item label="存储地址" prop="location">
          <el-input v-model="formData.location" placeholder="请输入存储地址" clearable :style="{width: '100%'}" :disabled="dsb">
          </el-input>
        </el-form-item>
        <el-form-item label="持有人" prop="holder">
          <el-input v-model="formData.holder" placeholder="请输入持有人" clearable :style="{width: '100%'}" :disabled="dsb">
          </el-input>
        </el-form-item>
        <el-form-item label="具体位置" prop="address">
          <el-input v-model="formData.address" placeholder="请输入具体位置" clearable :style="{width: '100%'}" :disabled="dsb">
          </el-input>
        </el-form-item>
        <el-form-item label="备注" prop="remark">
          <el-input v-model="formData.remark" placeholder="请输入备注" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
        </el-form-item>
  
        <h4 class="form-header">相关图片 </h4>
        <el-upload
          action="#"
          list-type="picture-card"
          multiple
          :http-request="requestUpload"
          :file-list="fileList"
        >
          <i slot="default" class="el-icon-plus"></i>
          <div slot="file" slot-scope="{file}">
            <img
              class="el-upload-list__item-thumbnail"
              :src="file.url"
              alt=""
              style="width: 147px; height: 147px"
              fit="cover"
              :preview-src-list="[file.url]"
            >
            <span class="el-upload-list__item-actions">
          <span
            class="el-upload-list__item-preview"
            @click="handlePictureCardPreview(file)"
          >
            <i class="el-icon-zoom-in"></i>
          </span>
          <span
            v-if="!disabled"
            class="el-upload-list__item-delete"
            @click="handleDownload(file.url)"
          >
            <i class="el-icon-download"></i>
          </span>
          <span
            v-if="!disabled"
            class="el-upload-list__item-delete"
            @click="handleRemove(file)"
          >
            <i class="el-icon-delete"></i>
          </span>
        </span>
  
  
          </div>
        </el-upload>
  
        <h4 class="form-header">其他附件 </h4>
        <el-upload
          action=""
          :file-list="fileListOther"
          class="upload-demo"
          multiple
          :on-preview="handlePreview"
  
          :on-remove="handleRemove"
          :http-request="requestUpload"
          :show-file-list="true"
        >
          <el-button type="primary">Click to upload</el-button>
          <template #tip>
            <div class="el-upload__tip">
            </div>
          </template>
  
  
        </el-upload>
  
        <el-form-item size="large">
          <el-button type="primary" @click="submitForm" :disabled="dsb">修改</el-button>
        </el-form-item>
      </el-form>
  
      <el-dialog  :visible.sync="dialogVisible">
        <img w-full :src="dialogImageUrl" alt="Preview Image" />
      </el-dialog>
    </div>
  </template>
  <script>
  import {getPropertyInfo, updateProperty, uploadPic, download, getCategory} from "@/api/note/index";
  import {addRole, updateRole} from "@/api/system/role";
  import {blobValidate} from "@/utils/ruoyi";
  import errorCode from "@/utils/errorCode";
  import {Message} from "element-ui";
  
  export default {
    components: {},
    props: [],
    data() {
      return {
        cdi:"资产详细信息",
        udi:"资产信息修改",
        fot:[".jpg",".jif"],
        fileList:[
        ],
        fileListOther:[
  
        ],
        dsb:true,
        btn:false,
        formData: {
          id: undefined,
          type: undefined,
          title: undefined,
          location: undefined,
          holder: undefined,
          address: undefined,
          remark: undefined,
          url: undefined,
        },
        dialogImageUrl: '',
        dialogVisible: false,
        disabled: false,
        rules: {
          id: [{
            required: true,
            message: '请输入id',
            trigger: 'blur'
          }],
          type: [{
            required: true,
            message: '请选择类别',
            trigger: 'change'
          }],
          title: [{
            required: true,
            message: '请输入标题',
            trigger: 'blur'
          }],
          location: [{
            required: true,
            message: '请输入存储地址',
            trigger: 'blur'
          }],
          holder: [{
            required: true,
            message: '请输入持有人',
            trigger: 'blur'
          }],
          address: [{
            required: true,
            message: '请输入具体位置',
            trigger: 'blur'
          }],
          remark: [{
            required: true,
            message: '请输入备注',
            trigger: 'blur'
          }],
  
        },
        typeOptions: [],
      }
    },
    computed: {},
    watch: {},
    created() {
      const id = this.$route.params && this.$route.params.id;
      let jd;
      if(this.$route.query.detail!=undefined)
      {
        jd =  this.$route.query.detail
        this.btn= jd
        this.dsb = !jd
        document.title = "修改资产详细信息";
        this.$route.meta.title = "修改资产详细信息";//列表的名称
      }
      else{
        document.title = "查看资产详细信息";
        this.$route.meta.title = "查看资产详细信息";//列表的名称
      }
  
      let _this = this
      if (id) {
        this.loading = true;
        getPropertyInfo(id).then((response) => {
          this.formData = response.data;
          let paths = response.data.url.split(",");
          for(let i = 0; i < paths.length; i++)
          {
            if(paths[i]!="") {
  
              let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
  
              if (_this.fot.includes(pth) === true)
                _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
              else {
                // alert(paths[i])
                let nms = paths[i].split("\/")
                let nm = nms[nms.length - 1]
                _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
              }
            }
          }
          this.loading = false;
        });
        this.getCateInfor()
  
      }
    },
    mounted() {},
    methods: {
      /** 查询类别信息 */
      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]})
          })
        })
      },
      submitForm() {
        let ul = this.fileList.map(function (elem){
          return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
        }).join(",")
        let uls = this.fileListOther.map(function (elem){
          return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
        }).join(",")
        this.formData.url = ul+","+uls
  
        this.$refs['elForm'].validate(valid => {
  
  
          if (valid) {
            if (this.formData.id != undefined) {
              updateProperty(this.formData).then(response => {
                this.$modal.msgSuccess("修改成功");
                // this.open = false;
                this.btn=false
              });
            } else {
              this.$modal.msgSuccess("修改失败");
  
            }
          }
        })
      },
      resetForm() {
        this.$refs['elForm'].resetFields()
      },
      handlePreview(file)
      {
        let formData = {'path':"/"+file.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")};
        let lens = formData.path.split(".")
        let suffix = lens[lens.length-1]
        download(formData).then(async (response) => {
          const isLogin = await blobValidate(response);
          let nt = new Date().getTime()
          let filename = 'property_'+nt+'.'+suffix
          const blob = new Blob([response])
          saveAs(blob, filename)
        })
      },
      handleRemoveFile(file) {
        alert(23)
      },
      handleRemove(file) {
        alert(323)
      },
      handlePictureCardPreview(file) {
        this.dialogImageUrl = file.url;
        this.dialogVisible = true;
      },
      handleDownload(url) {
        var formData = {'path':"/"+url.replace(process.env.VUE_APP_BASE_TRUE_API,"")};
  
        let lens = formData.path.split(".")
        let suffix = lens[lens.length-1]
        download(formData).then(async (response) => {
          const isLogin = await blobValidate(response);
          let nt = new Date().getTime()
          let filename = 'property_'+nt+'.'+suffix
          const blob = new Blob([response])
          saveAs(blob, filename)
        })
      },
      handleEdit()
      {
        this.dsb = false
        this.btn = true
      },
      requestUpload(params)
      {
        var file = params.file;
        var formData = new FormData();
        formData.append('uploadFile', file);
        let _this = this
  
        uploadPic(formData).then(response => {
          let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
  
          if(_this.fot.includes(pth) === true)
          {
            _this.fileList.push({name:response.data.fileName, "url":response.data.url})
  
          }
  
          else{
            _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
  
          }
        })
  
      }
  
    }
  }
  
  </script>
  <style>
  .mt
  {
    position: relative;
  }
  .dt{
    display: block;
  
  }
  .pt{
    right: 10px;
    top:-3px;
    display: block;
    position: absolute;
  }
  </style>
  

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

@@ -1,74 +1,79 @@
<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="id" style="padding-left:30px">
        <el-input
          v-model="queryParams.id"
          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>
      </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-cntainer>
        <el-col :span="9" >
         <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>
        </el-col>
      </el-cntainer>
        <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>
            <i slot="prefix" class="el-input__icon el-icon-search"></i>
          </el-input>
        </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>
    </el-form>

    <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">
        <el-button
@@ -105,20 +110,28 @@
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>

    <el-table v-loading="loading" :data="propertyList" @selection-change="handleSelectionChange">
    <el-table v-loading="loading" :data="contactList" @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">
      <el-table-column label="成员姓名" prop="myName" sortable width="100" />
      <el-table-column label="称呼" prop="nickName" sortable :show-overflow-tooltip="true" width="100" />
      <el-table-column label="姓名" prop="name" sortable :show-overflow-tooltip="true" width="100" />
      <el-table-column label="工作单位" prop="work" sortable width="100" />
      <el-table-column label="手机" prop="phone" sortable width="120" />
      <el-table-column label="其它联系方式" prop="wx qq twitter" sortable width="150" >
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.createTime) }}</span>
          {{scope.row.wx}}/
          {{scope.row.qq}}/
          {{scope.row.twitter}}
        </template>
      </el-table-column>
      <el-table-column label="是否常联系" prop="isAlways" sortable width="120" />
      <el-table-column label="电子名片" prop="url" align="center" sortable  width="180">
<!--        <el-image-->
<!--          :src="'http://47.93.189.255:8080/'+ contactList.url"-->
<!--          :fit="fit"-->
<!--        ></el-image>-->
      </el-table-column>
      <el-table-column label="备注（是否存在金钱关系）" prop="remark" sortable width="120" />
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope" v-if="scope.row.roleId !== 1">
          <el-button
@@ -159,37 +172,44 @@
      @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 ref="elForm" :model="contactList" :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="contactList.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="contactList.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="contactList.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="contactList.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="contactList.phone" 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 label="其它联系方式" prop="wx">
          <el-input v-model="contactList.wx" placeholder="请输入其它联系方式" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="是否常联系" prop="isAlways">
          <el-input v-model="contactList.isAlways" placeholder="是否常联系" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>

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

        <h4 class="form-header">电子名片 </h4>
        <el-upload
          action="#"
          list-type="picture-card"
@@ -238,7 +258,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>
@@ -269,9 +289,9 @@


//在system/note/index.js中导入接口函数
import {listProperty, getPropertyInfo, delProperty, getCategory, addProperty, uploadPic} from "@/api/note/index";
import {getContactList, getContactIdList, addContact,updateContact, delContact,uploadPic} from "@/api/contacts/index";
export default {
  name: "Role",
  name: "index",
  dicts: ['sys_normal_disable'],
  data() {
    return {
@@ -290,8 +310,8 @@
      showSearch: true,
      // 总条数
      total: 0,
      // 资产表格数据
      propertyList: [],
      // 通讯录表格数据
      contactList: [],
      // 弹出层标题
      title: "",
      // 是否显示弹出层
@@ -313,14 +333,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,12 +367,11 @@
      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,
      },
      // 表单参数
      form: {},
@@ -345,48 +381,39 @@
      },
      // 表单校验
      rules: {
        type: [{
        id: [{
          required: true,
          message: '请选择类别',
          trigger: 'change'
        }],
        title: [{
          required: true,
          message: '请输入标题',
          message: '请输入id',
          trigger: 'blur'
        }],
        location: [{
        myName: [{
          required: true,
          message: '请输入存储地址',
          message: '请输入成员姓名',
          trigger: 'blur'
        }],
        holder: [{
        nickName: [{
          required: true,
          message: '请输入持有人',
          message: '请输入称呼',
          trigger: 'blur'
        }],
        address: [{
        name: [{
          required: true,
          message: '请输入具体位置',
          message: '请输入姓名',
          trigger: 'blur'
        }],
        remark: [{
        work: [{
          required: true,
          message: '请输入备注',
          message: '请输入工作单位',
          trigger: 'blur'
        }],
        createTime: [{
          required: true,
          message: '请选择日期选择',
          trigger: 'change'
        }],

      },
      typeOptions: [],
    };
  },
  created() {
    this.getList();
    this.getCateInfor()
    // this.getCateInfor()

  },
  methods: {
@@ -395,15 +422,16 @@
      this.open = false;
      this.reset();
    },
    /** 查询角色列表 */

    /** 查询通讯录列表 */
    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 +439,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)
@@ -481,12 +509,12 @@
    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("/tongxunlu/contacts/propertyInfo/" + id);
    },
    /** 修改按钮操作 */
    handleUpdate(row) {
@@ -494,7 +522,7 @@
      let jd = true

      this.$router.push({
        path:"/family/note1/propertyInfo/" + id,
        path:"/tongxunlu/contacts/propertyInfo/" + id,
        query:{
          detail:jd
        }
@@ -519,7 +547,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();
@@ -554,7 +582,7 @@
    handleDelete(row) {
      const Ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除资产编号为"' + Ids + '"的数据项？').then(function() {
        return delProperty(Ids);
        return delContact(Ids);
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");

 ruoyi-ui/src/views/note/propertyInfo.vue

New file
@@ -0,0 +1,362 @@
<template>
  <div class="app-container">
    <div class="form-header mt">
      <h4 class="dt h4">资产详细信息 </h4>
      <el-button type="primary" class="pt"  icon="el-icon-edit" @click="handleEdit()" :disabled="btn">编辑</el-button>
    </div>

    <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px">
      <el-form-item label="id" prop="id">
        <el-input v-model="formData.id" placeholder="请输入id" :maxlength="11" show-word-limit :disabled="true"
          clearable prefix-icon='el-icon-mobile' :style="{width: '100%'}"></el-input>
      </el-form-item>
      <el-form-item label="类别" prop="type">
        <el-select v-model="formData.type" placeholder="请选择类别" clearable :style="{width: '100%'}" :disabled="dsb" >
          <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
            :disabled="item.disabled"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="标题" prop="title">
        <el-input v-model="formData.title" placeholder="请输入标题" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
      </el-form-item>
      <el-form-item label="存储地址" prop="location">
        <el-input v-model="formData.location" placeholder="请输入存储地址" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
      </el-form-item>
      <el-form-item label="持有人" prop="holder">
        <el-input v-model="formData.holder" placeholder="请输入持有人" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
      </el-form-item>
      <el-form-item label="具体位置" prop="address">
        <el-input v-model="formData.address" placeholder="请输入具体位置" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
      </el-form-item>
      <el-form-item label="备注" prop="remark">
        <el-input v-model="formData.remark" placeholder="请输入备注" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
      </el-form-item>

      <h4 class="form-header">相关图片 </h4>
      <el-upload
      action="#"
      list-type="picture-card"
      multiple
      :http-request="requestUpload"
      :file-list="fileList"
      >
      <i slot="default" class="el-icon-plus"></i>
      <div slot="file" slot-scope="{file}">
        <img
          class="el-upload-list__item-thumbnail"
          :src="file.url"
          alt=""
          style="width: 147px; height: 147px"
          fit="cover"
          :preview-src-list="[file.url]"
        >
       <span class="el-upload-list__item-actions">
        <span
          class="el-upload-list__item-preview"
          @click="handlePictureCardPreview(file)"
        >
          <i class="el-icon-zoom-in"></i>
        </span>
        <span
          v-if="!disabled"
          class="el-upload-list__item-delete"
          @click="handleDownload(file.url)"
        >
          <i class="el-icon-download"></i>
        </span>
        <span
          v-if="!disabled"
          class="el-upload-list__item-delete"
          @click="handleRemove(file)"
        >
          <i class="el-icon-delete"></i>
        </span>
      </span>


    </div>
    </el-upload>

      <h4 class="form-header">其他附件 </h4>
      <el-upload
        action=""
        :file-list="fileListOther"
        class="upload-demo"
        multiple
        :on-preview="handlePreview"

        :on-remove="handleRemove"
        :http-request="requestUpload"
        :show-file-list="true"
      >
        <el-button type="primary">Click to upload</el-button>
        <template #tip>
          <div class="el-upload__tip">
          </div>
        </template>


      </el-upload>

      <el-form-item size="large">
        <el-button type="primary" @click="submitForm" :disabled="dsb">修改</el-button>
      </el-form-item>
    </el-form>

    <el-dialog  :visible.sync="dialogVisible">
      <img w-full :src="dialogImageUrl" alt="Preview Image" />
    </el-dialog>
  </div>
</template>
<script>
import {getPropertyInfo, updateProperty, uploadPic, download, getCategory} from "@/api/note/index";
import {addRole, updateRole} from "@/api/system/role";
import {blobValidate} from "@/utils/ruoyi";
import errorCode from "@/utils/errorCode";
import {Message} from "element-ui";

export default {
  components: {},
  props: [],
  data() {
    return {
      cdi:"资产详细信息",
      udi:"资产信息修改",
      fot:[".jpg",".jif"],
      fileList:[
      ],
      fileListOther:[

      ],
      dsb:true,
      btn:false,
      formData: {
        id: undefined,
        type: undefined,
        title: undefined,
        location: undefined,
        holder: undefined,
        address: undefined,
        remark: undefined,
        url: undefined,
      },
        dialogImageUrl: '',
        dialogVisible: false,
        disabled: false,
      rules: {
        id: [{
          required: true,
          message: '请输入id',
          trigger: 'blur'
        }],
        type: [{
          required: true,
          message: '请选择类别',
          trigger: 'change'
        }],
        title: [{
          required: true,
          message: '请输入标题',
          trigger: 'blur'
        }],
        location: [{
          required: true,
          message: '请输入存储地址',
          trigger: 'blur'
        }],
        holder: [{
          required: true,
          message: '请输入持有人',
          trigger: 'blur'
        }],
        address: [{
          required: true,
          message: '请输入具体位置',
          trigger: 'blur'
        }],
        remark: [{
          required: true,
          message: '请输入备注',
          trigger: 'blur'
        }],

      },
      typeOptions: [],
    }
  },
  computed: {},
  watch: {},
  created() {
    const id = this.$route.params && this.$route.params.id;
    let jd;
    if(this.$route.query.detail!=undefined)
    {
      jd =  this.$route.query.detail
      this.btn= jd
      this.dsb = !jd
      document.title = "修改资产详细信息";
      this.$route.meta.title = "修改资产详细信息";//列表的名称
    }
    else{
      document.title = "查看资产详细信息";
      this.$route.meta.title = "查看资产详细信息";//列表的名称
    }

    let _this = this
    if (id) {
      this.loading = true;
      getPropertyInfo(id).then((response) => {
        this.formData = response.data;
        let paths = response.data.url.split(",");
        for(let i = 0; i < paths.length; i++)
        {
          if(paths[i]!="") {

            let pth = paths[i].substr(paths[i].length - 4, paths[i].length)

            if (_this.fot.includes(pth) === true)
              _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
            else {
              // alert(paths[i])
              let nms = paths[i].split("\/")
              let nm = nms[nms.length - 1]
              _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
            }
          }
        }
        this.loading = false;
      });
      this.getCateInfor()

    }
  },
  mounted() {},
  methods: {
    /** 查询类别信息 */
    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]})
        })
      })
    },
    submitForm() {
      let ul = this.fileList.map(function (elem){
        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
      }).join(",")
      let uls = this.fileListOther.map(function (elem){
        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
       }).join(",")
        this.formData.url = ul+","+uls

      this.$refs['elForm'].validate(valid => {


        if (valid) {
          if (this.formData.id != undefined) {
            updateProperty(this.formData).then(response => {
              this.$modal.msgSuccess("修改成功");
              // this.open = false;
              this.btn=false
            });
          } else {
            this.$modal.msgSuccess("修改失败");

          }
        }
      })
    },
    resetForm() {
      this.$refs['elForm'].resetFields()
    },
    handlePreview(file)
    {
      let formData = {'path':"/"+file.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")};
      let lens = formData.path.split(".")
      let suffix = lens[lens.length-1]
      download(formData).then(async (response) => {
        const isLogin = await blobValidate(response);
        let nt = new Date().getTime()
        let filename = 'property_'+nt+'.'+suffix
        const blob = new Blob([response])
        saveAs(blob, filename)
      })
    },
    handleRemoveFile(file) {
      alert(23)
    },
    handleRemove(file) {
      alert(323)
      },
      handlePictureCardPreview(file) {
        this.dialogImageUrl = file.url;
        this.dialogVisible = true;
      },
      handleDownload(url) {
        var formData = {'path':"/"+url.replace(process.env.VUE_APP_BASE_TRUE_API,"")};

        let lens = formData.path.split(".")
        let suffix = lens[lens.length-1]
        download(formData).then(async (response) => {
          const isLogin = await blobValidate(response);
          let nt = new Date().getTime()
          let filename = 'property_'+nt+'.'+suffix
          const blob = new Blob([response])
          saveAs(blob, filename)
        })
      },
    handleEdit()
    {
      this.dsb = false
      this.btn = true
    },
    requestUpload(params)
    {
      var file = params.file;
      var formData = new FormData();
      formData.append('uploadFile', file);
      let _this = this

      uploadPic(formData).then(response => {
        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)

        if(_this.fot.includes(pth) === true)
        {
          _this.fileList.push({name:response.data.fileName, "url":response.data.url})

        }

        else{
          _this.fileListOther.push({name:response.data.fileName, url:response.data.url})

        }
      })

    }

  }
}

</script>
<style>
.mt
{
  position: relative;
}
.dt{
  display: block;

}
.pt{
  right: 10px;
  top:-3px;
  display: block;
  position: absolute;
}
</style>

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

File was deleted

 ruoyi-ui/src/views/self/show.vue

@@ -5,48 +5,26 @@
    <el-divider />
<!--    基本信息-->
    <h2 style="font-size:16px">基本信息</h2>

<!--      <el-column prop="nickName" label="姓名"></el-column>-->

    <el-container>
<!--      <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>-->
      <div style="padding-left:30px">

<!--        <el-form-item label="userId" prop="userId">-->
<!--          <el-select v-model="formDat.userId"  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>-->
<!--        <el-table-->
<!--           v-loading="loading" :data="individualList" @selection-change="handleSelectionChange"-->
<!--        >-->
<!--          <el-table-column prop="nickName" label="姓名" min-width="5%">-->
<!--            <template slot-scope="scope">-->
<!--              {{ scope.row.nickName }}-->
<!--            </template>-->
<!--          </el-table-column>-->
<!--        </el-table>-->


        <el-container >
          <el-col >
            <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="70px" label-position="left"
            <el-form ref="elForm" :model="individualList" :rules="rules" size="medium"  label-position="left"
                     v-loading="loading" :data="individualList" @selection-change="handleSelectionChange" >
              <el-row :span="6">
                <el-form-item label="姓名" prop="nickName">
              <el-row :span="7">
                <el-form-item label="姓名" prop="nickName" label-width="40px">
                  <el-input v-model="individualList.nickName" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                  </el-input>
                </el-form-item>
              </el-row>
              <el-row :span="6">
                <el-form-item label="曾用名" prop="oldName">
              <el-row :span="7">
                <el-form-item label="曾用名" prop="oldName" label-width="60px">
                  <el-input v-model="individualList.oldName" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                  </el-input>
                </el-form-item>
              </el-row>
              <el-row :span="8">
                <el-form-item label="身份证号" prop="idNum">
              <el-row :span="7">
                <el-form-item label="身份证号" prop="idNum" label-width="70px">
                  <el-input v-model="individualList.idNum" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                  </el-input>
                </el-form-item>
@@ -54,51 +32,25 @@
            </el-form>
          </el-col>
        </el-container>

<!--         -->
<!--        <el-container>-->
<!--        <el-table-->
<!--          v-loading="listLoading"-->
<!--          :data="individualList"-->
<!--          element-loading-text="数据加载中"-->
<!--          style="width: 100%"-->
<!--        />-->
<!--          <el-table-column >-->
<!--            <template slot-scope="props">-->
<!--              <el-form label-position="left"  >-->
<!--                <el-form-item label="用户昵称">-->
<!--                  <span>{{ props.row.nickName }}</span>-->
<!--                </el-form-item>-->
<!--                <el-form-item label="联系方式">-->
<!--                  <span>{{ props.row.oldName }}</span>-->
<!--                </el-form-item>-->
<!--                <el-form-item label="用户 ID">-->
<!--                  <span>{{ props.row.idNum }}</span>-->
<!--                </el-form-item>-->

<!--              </el-form>-->
<!--            </template>-->
<!--          </el-table-column>-->
<!--        </el-container>-->
      </div>
      <div style="padding-left:70px">
        <el-container>
          <el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
            <el-form ref="elForm" :model="individualList" :rules="rules" size="medium" label-width="70px" label-position="left">
            <el-form ref="elForm" :model="individualList" :rules="rules" size="medium"  label-position="left">
              <el-row :span="6">
                <el-form-item label="性别" prop="sex">
                <el-form-item label="性别" prop="sex" label-width="40px">
                  <el-input v-model="individualList.sex" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                  </el-input>
                </el-form-item>
              </el-row>
              <el-row :span="6">
                <el-form-item label="民族" prop="nation">
                <el-form-item label="民族" prop="nation"label-width="40px">
                  <el-input v-model="individualList.nation" placeholder="" clearable :style="{width: '100%'}":disabled="dsb">
                  </el-input>
                </el-form-item>
              </el-row>
              <el-row :span="8">
                <el-form-item label="联系方式" prop="phoneNumber">
                <el-form-item label="联系方式" prop="phoneNumber" label-width="70px">
                  <el-input v-model="individualList.phoneNumber" placeholder="" clearable :style="{width: '100%'}":disabled="dsb">
                  </el-input>
                </el-form-item>
@@ -107,19 +59,18 @@
          </el-col>
        </el-container>
      </div>

      <div style="padding-left:70px">
        <el-container>
          <el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
            <el-form ref="elForm" :model="individualList" :rules="rules" size="medium" label-width="70px" label-position="left":disabled="dsb">
            <el-form ref="elForm" :model="individualList" :rules="rules" size="medium"  label-position="left":disabled="dsb">
              <el-row :span="6">
                <el-form-item label="国籍" prop="nationality">
                <el-form-item label="国籍" prop="nationality" label-width="40px">
                  <el-input v-model="individualList.nationality" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                  </el-input>
                </el-form-item>
              </el-row>
              <el-row :span="6">
                <el-form-item label="婚姻状况" prop="maritalStatus">
                <el-form-item label="婚姻状况" prop="maritalStatus" label-width="70px">
                  <el-input v-model="individualList.maritalStatus" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                  </el-input>
                </el-form-item>
@@ -130,19 +81,48 @@
        </el-container>
      </div>
      <div style="padding-left:90px;padding-top:30px">
        <el-row :gutter="6" >
          <el-upload ref="ref1"
                     action=""
                     :file-list="fileList"
                     list-type="picture-card"
                     accept="image/*"
                     :auto-upload="false"
                     :multiple="false"
                     :limit="1">
            <i class="el-icon-plus"></i>
          </el-upload>
        </el-row>
        <el-col :span="6" :data="individualList">
            <div class="block" :model="individualList" >
              <el-col v-model="individualList.url" prop="url">
              <el-avatar shape="square" :size=200 >
                <el-image
                  :src="'http://47.93.189.255:8080/'+ individualList.url"
                  :fit="fit"
                ></el-image>
              </el-avatar>
              </el-col>
            </div>

        </el-col>


<!--        <el-row>-->
<!--&lt;!&ndash;          <el-table  border style="width: 100%">&ndash;&gt;-->
<!--&lt;!&ndash;            <el-table-column&ndash;&gt;-->
<!--&lt;!&ndash;              prop="img"&ndash;&gt;-->
<!--&lt;!&ndash;              v-model="individualList.img"&ndash;&gt;-->
<!--&lt;!&ndash;              placeholder=""&ndash;&gt;-->
<!--&lt;!&ndash;              width="180">&ndash;&gt;-->
<!--&lt;!&ndash;              <template slot-scope="scope">&ndash;&gt;-->
<!--&lt;!&ndash;                <img :src="scope.row.src" style="width:100px;height:50px;"/>&ndash;&gt;-->
<!--&lt;!&ndash;              </template>&ndash;&gt;-->
<!--&lt;!&ndash;            </el-table-column>&ndash;&gt;-->

<!--&lt;!&ndash;          </el-table>&ndash;&gt;-->
<!--&lt;!&ndash;          <el-upload :class="{uoloadSty:showBtnDealImg,disUoloadSty:noneBtnImg}"&ndash;&gt;-->
<!--&lt;!&ndash;                      ref="ref1"&ndash;&gt;-->
<!--&lt;!&ndash;                     action=""&ndash;&gt;-->
<!--&lt;!&ndash;                     :file-list="fileList"&ndash;&gt;-->
<!--&lt;!&ndash;                     list-type="picture-card"&ndash;&gt;-->
<!--&lt;!&ndash;                     accept="image/*"&ndash;&gt;-->
<!--&lt;!&ndash;                     :auto-upload="false"&ndash;&gt;-->
<!--&lt;!&ndash;                     :multiple="false"&ndash;&gt;-->
<!--&lt;!&ndash;                     :limit="limitCountImg">&ndash;&gt;-->
<!--&lt;!&ndash;            <i class="el-icon-plus"></i>&ndash;&gt;-->
<!--&lt;!&ndash;          </el-upload>&ndash;&gt;-->
<!--        </el-row>-->
      </div>

      <div style="padding-left:50px;padding-top:30px"  >
        <el-container >
<!--          <template slot-scope="scope" v-if="scope.row.roleId !== 1">-->
@@ -155,31 +135,40 @@
<!--            >修改</el-button>-->

<!--          </template>-->

          <el-row :span="2" style="flex-direction: column;">
            <el-button
              type="primary"
              @click="edit(scope.row)"

              @click="handleUpdate(scope.row)"
              v-hasPermi="['system:role:edit']"


            >编辑</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-->
<!--              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-dropdown>-->
            <br>
            <el-button type="primary" @click="submitForm">导入</el-button>

              <el-button
                type="primary"

                @click="handleExport"
                v-hasPermi="['self:user:export']"
              >导出</el-button>

          </el-row>

        </el-container>
      </div>
<!--      </el-dialog>-->
@@ -188,25 +177,22 @@
      <div style="padding-left:30px">
        <el-container>
          <el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
            <el-form ref="elForm" :model="individualList" :rules="rules" size="medium" label-width="110px" label-position="left">
              <el-row :span="15">
                <el-form-item label="户籍地址" prop="locationAddress">
            <el-form ref="elForm" :model="individualList" :rules="rules" size="medium"  label-position="left">
              <el-row :span="16">
                <el-form-item label="户籍地址" prop="locationAddress" label-width="70px">
                  <el-input v-model="individualList.locationAddress" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                  </el-input>
                </el-form-item>
              </el-row>
              <el-row :span="15">
                <el-form-item label="常住地址" prop="alwaysAddress">
              <el-row :span="16">
                <el-form-item label="常住地址" prop="alwaysAddress" label-width="70px">
                  <el-input v-model="individualList.alwaysAddress" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                  </el-input>
                </el-form-item>
              </el-row>
              <el-row :span="15">
                <el-form-item label="单位及职务职称" prop="unit position ">
                  <el-input v-model:unit="individualList.unit" v-model:position="individualList.position" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                    <template slot-scope="scope">
                      {{scope.row.unit}}/{{scope.row.position}}
                    </template>
              <el-row :span="16" >
                <el-form-item label="单位" prop="unit" label-width="40px">
                  <el-input v-model="individualList.unit" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                  </el-input>
                </el-form-item>
              </el-row>
@@ -218,26 +204,32 @@
      <div style="padding-left:30px">
        <el-container>
          <el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
            <el-form ref="elForm" :model="individualList" :rules="rules" size="medium" label-width="110px" label-position="left">
            <el-form ref="elForm" :model="individualList" :rules="rules" size="medium"  label-position="left">
              <el-row :span="12">
                <el-form-item label="户籍地公安机关" prop="locationPolice">
                <el-form-item label="户籍地公安机关" prop="locationPolice" label-width="110px">
                  <el-input v-model="individualList.locationPolice" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                  </el-input>
                </el-form-item>
              </el-row>
              <el-row :span="12">
                <el-form-item label="常住地公安机关" prop="alwaysPolice">
                <el-form-item label="常住地公安机关" prop="alwaysPolice" label-width="110px">
                  <el-input v-model="individualList.alwaysPolice" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                  </el-input>
                </el-form-item>
              </el-row>

              <el-row :span="12" >
                <el-form-item label="职务职称" prop="position" label-width="70px">
                  <el-input v-model="individualList.position" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                  </el-input>
                </el-form-item>
              </el-row>
            </el-form>
          </el-col>
        </el-container>
      </div>
    </el-container>

<!--折叠面板-->
    <el-collapse v-model="activeNames" @change="handleChange">
      <el-collapse-item title="主要学习及工作经历" name="1" >
        <el-table v-loading="loading" :data="experienceList" @selection-change="handleSelectionChange">
@@ -305,56 +297,76 @@
      </el-collapse-item>
      <el-collapse-item title="移居国（境）情况" name="3" >
        <div>
          <el-form>
          <el-form v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
            <el-form-item label="是否拥有外籍、境外居留权、长期居留许可">
              <el-radio-group v-model="form.outStatus" style="margin-bottom: 0">
                <el-radio :label="true">是</el-radio>
                <el-radio :label="false">否</el-radio>
              <el-radio-group v-model="individualList.outStatus" style="margin-bottom: 0">
                <el-radio :label="1">是</el-radio>
                <el-radio :label="0">否</el-radio>
              </el-radio-group>
              <el-container >
                <el-row :span="7">
                  <el-form v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
                    <el-form-item label="证件号码" prop="idNo" label-width="70px">
                      <el-input v-model="individualList.idNo" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
                      </el-input>
                    </el-form-item>
                  </el-form>
                </el-row>
              </el-container>
            </el-form-item>
          </el-form>
          <div>
            <el-table :data="individualList.idNo" border stripe>
              <el-table-column label="证件号码"  width="80" align="center">
              </el-table-column>
            </el-table>
          </div>

        </div>

      </el-collapse-item>
      <el-collapse-item title="持有出入境证件情况" name="4" >
        <el-table v-loading="loading" :data="certificateList" @selection-change="handleSelectionChange">
          <el-table-column label="证件名称"  sortable width="280" align="center" />
          <el-table-column label="持有情况"  sortable width="280" align="center" />
          <el-table-column label="证件号码"  sortable width="280" align="center" />
          <el-table-column label="有效期"  sortable width="280" align="center">
          <el-table-column label="证件名称" prop="cerName" sortable width="280" align="center" />
          <el-table-column label="持有情况" prop="ownStatus" sortable width="280" align="center" />
          <el-table-column label="证件号码" prop="idNo" sortable width="280" align="center" />
          <el-table-column label="有效期" prop="validityDate"  sortable width="280" align="center">
          </el-table-column>
        </el-table>
      </el-collapse-item>
      <el-collapse-item title="出国（境）情况" name="5" >
        <el-table v-loading="loading" :data="AbroadList" @selection-change="handleSelectionChange">
          <el-table-column label="起止日期" prop="startDate" sortable width="350" align="center" />
          <el-table-column label="所到国家或者地区" prop="content" sortable width="350" align="center" />
          <el-table-column label="事由（旅游、走访、探亲、继承财产、其他）" prop="witness" sortable width="400" align="center" />
          <el-table-column label="所到国家或者地区" prop="destination" sortable width="350" align="center" />
          <el-table-column label="事由（旅游、走访、探亲、继承财产、其他）" prop="cause" sortable width="400" align="center" />

        </el-table>
      </el-collapse-item>
    </el-collapse>

  <!--    自传-->
<!--    自传-->
    <div style="padding-top:30px">
      <el-container>
        <div style="width:100%"><h2 style="font-size:15px" >自传</h2></div>
      </el-container>
      <el-tabs type="border-card" v-model="activeName" @tab-click="handleClick">
        <el-tab-pane label="0~3岁(婴儿期)" name="1" index="1"></el-tab-pane>
        <el-tab-pane label="6~12(小学)" name="2"></el-tab-pane>
      <el-tabs type="border-card" v-model="activeName" @tab-click="handleClick"
        v-loading="loading" :data="AutobiographyList" @selection-change="handleSelectionChange">
<!--        <el-tab-pane label="总览" name="0">-->

<!--        </el-tab-pane>-->
<!--        <div :model="AutobiographyList">-->
        <el-tab-pane label="0~3岁(婴儿期)" name="1" >
          <el-input v-model="AutobiographyList.content" prop="content" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
          </el-input>
        </el-tab-pane>
        <el-tab-pane label="6~12(小学)" name="2" ></el-tab-pane>
        <el-tab-pane label="12~15(初中)" name="3"></el-tab-pane>
        <el-tab-pane label="15~18(高中)" name="4"></el-tab-pane>
        <el-tab-pane label="18~22(大学)" name="5"></el-tab-pane>
        <el-tab-pane label="22~25(研究生)" name="6"></el-tab-pane>
        <el-tab-pane label="26~ (工作)" name="7"></el-tab-pane>
        <el-tab-pane label="？岁结婚" name="8"></el-tab-pane>
<!--    </div>-->
<!--        <el-tab-pane-->
<!--          v-for="(item, index) in AutobiographyTermList"-->
<!--          :key="index"-->
<!--          :name="item"-->
<!--          :label="item"-->
<!--        />-->
      </el-tabs>


@@ -383,7 +395,16 @@
//在system/note/index.js中导入接口函数  --接好了
import {getIndividualList, getIndividualRelation, delIndividual, updateIndividual, addIndividual,listExperience,updateExperience,
  addExperience,delExperience} from "@/api/self/index";
import { getAbroadList, getAutobiographyTermList, getCertificateList } from '../../api/self'
import {
  getAbroadList,
  getAutobiography,
  getAutobiographyList,
  getAutobiographyTermList,
  getCertificateList
} from '../../api/self'
import { delFamilyevent, uploadPic } from '../../api/bignote'
import { blobValidate } from '../../utils/ruoyi'

export default {
  name: "show",
  dicts: ['sys_normal_disable'],
@@ -404,8 +425,13 @@
      showSearch: true,
      // 总条数
      total: 0,
      //头像上传
      showBtnDealImg:true,
      noneBtnImg:false,
      limitCountImg:1,//上传图片的最大数量
      //个人信息数据
      individualList:[],
      fit:['fill'],
      // 个人经历数据
      experienceList: [],
      //家庭成员关系数据
@@ -414,8 +440,23 @@
      certificateList:[],
      //出国情况
      AbroadList:[],

      //个人自传
      activeName: '0',
      AutobiographyList:[],
      //不同时段个人自传
      AutobiographyTermList:[],
      // AutobiographyTermList:[],
      // // 访问后台的数据
      // query: {
      //   current: 1,
      //   termId: "",
      // },
      // // 后台返回的数据
      // AutobiographyTermList: {
      //   rows: [{}],
      // },
      // current: 0,

      //下拉实现
      activeNames:['1'],
      // 弹出层标题
@@ -440,8 +481,7 @@
      ],
      dsb:true,
      btn:false,
      //个人自传
      activeName: '1',


      formDat: {
        //个人基本信息
@@ -468,6 +508,7 @@
        birth:undefined,
        familyId:undefined,


        //主要学习及工作经历
        id:undefined,
        userId:undefined,
@@ -476,11 +517,14 @@
        witness:undefined,
        remark: undefined,
        //家庭成员及主要社会关系情况

        relation:undefined,


        //
        //持有出入境证件情况
        cerName:undefined,
        validityDate:undefined,
        ownStatus:undefined,
        //出国（境）情况
        destination:undefined,
        cause:undefined,
        url: undefined,
      },
      // 菜单列表
@@ -583,7 +627,7 @@
  },
  created() {
    this.getList();
    //   this.getCateInfor()
    this.getAutobiographyInfor()
  },
  methods: {
    // 取消按钮
@@ -595,17 +639,21 @@
    handleChange(val) {
      console.log(val);
    },
    //编辑按钮
    edit(row){
      const id= row.id;
      this.reset();
      // this.$router.push('/self/self/edit')
      this.title='编辑个人信息';
      this.$router.push('/family2/self/edit/' + id);
    },

    // edit(row){
    //   const id= row.id;
    //   this.reset();
    //   this.title='编辑个人信息';
    //   this.$router.push('/self/self/edit/' + id);
    // },
    //个人自传
    handleClick(tab, event) {
      console.log(tab, event);
      // console.log(tab, event);
      this.getAutobiographyInfor();
      if(tab.name == 0) {

      }

      //根据不同时段的个人自传
      getAutobiographyTermList(this.queryParams).then(response => {
        //  alert(123)
@@ -614,10 +662,21 @@
        this.total = response.data.total;
        this.loading = false;
      });

      getAutobiographyList(this.queryParams).then(response => {
        //  alert(123)
        //   console.log(response.data)
        this.AutobiographyList = response.data;
        this.total = response.data.total;
        this.loading = false;
      });
    },




    /** 查询角色列表 */
    //列表显示家大事记


    getList() {
      this.loading = true;
@@ -645,10 +704,8 @@
      getIndividualList(this.queryParams).then(response => {
          //  alert(123)
          //   console.log(response.data)
          //alert(123)
          this.individualList = response.data;
         // this.total = response.data.total;
        //  console.log(this.individualList)
          this.total = response.data.total;
          this.loading = false;
        }
      );
@@ -674,6 +731,7 @@

    },

    //图片的上传及上传按钮隐藏


    // 取消按钮
@@ -754,10 +812,41 @@
      });
    },


    handleRemoveFile(file) {
      alert(23)
    },
    handleRemove(file) {
      alert(323)
    },
    handlePictureCardPreview(file) {
      this.dialogImageUrl = file.url;
      this.dialogVisible = true;
    },
    //点击下载函数
    handleDownload(url) {
      var formData = {'path':"/"+url.replace(process.env.VUE_APP_BASE_TRUE_API,"")};

      let lens = formData.path.split(".")
      let suffix = lens[lens.length-1]
      download(formData).then(async (response) => {
        const isLogin = await blobValidate(response);
        let nt = new Date().getTime()
        let filename = 'selfevent_'+nt+'.'+suffix
        const blob = new Blob([response])
        saveAs(blob, filename)
      })
    },

    /** 查询自传信息 */
    getAutobiographyInfor()
    {
      let _this = this
      getAutobiography().then(response=>{

        response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
          _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
        })
      })
    },
    /** 提交按钮（数据权限） */
    submitDataScope: function() {
@@ -815,10 +904,21 @@
    },
    /** 导出按钮操作 */
    handleExport() {
      this.download('/family/zfEvent/export', {
      this.download('/self/user/export', {
        ...this.queryParams
      }, `zfEvent_${new Date().getTime()}.xlsx`)
      }, `self_${new Date().getTime()}.xlsx`)
    }
  }
};
</script>

<style>
.uoloadSty {
  width:110px;
  height:110px;
  line-height:110px;
}
.disUoloadSty {
  display:none;   /* 上传按钮隐藏 */
}
</style>