From 601c3e854e74a15932fb502145f48cc0a773a611 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期五, 07 四月 2023 16:31:44 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web

---
 ruoyi-ui/src/views/note/propertylnfo.vue       |    6 
 /dev/null                                      |  362 -------
 ruoyi-ui/src/views/self/show.vue               |  312 +++--
 zhangshi_app_web                               |    2 
 ruoyi-ui/src/views/bignote/index.vue           |  967 ++++++++++--------
 ruoyi-ui/src/views/contacts/index.vue          |  571 +++++++++++
 ruoyi-ui/src/api/self/index.js                 |  111 ++
 ruoyi-ui/src/views/bignote/familyeventInfo.vue |  678 ++++++------
 ruoyi-ui/src/api/contacts/index.js             |    1 
 ruoyi-ui/src/router/index.js                   |   20 
 ruoyi-ui/src/views/note/index.vue              |   22 
 11 files changed, 1,750 insertions(+), 1,302 deletions(-)

diff --git a/ruoyi-ui/src/api/contacts/index.js b/ruoyi-ui/src/api/contacts/index.js
new file mode 100644
index 0000000..543ea86
--- /dev/null
+++ b/ruoyi-ui/src/api/contacts/index.js
@@ -0,0 +1 @@
+import request from '@/utils/request'
diff --git a/ruoyi-ui/src/api/self/index.js b/ruoyi-ui/src/api/self/index.js
index 434c6a0..7c2c640 100644
--- a/ruoyi-ui/src/api/self/index.js
+++ b/ruoyi-ui/src/api/self/index.js
@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 
 // 鏌ヨ涓汉淇℃伅
-export function getIndividualInfo(id) {
+export function getIndividualList() {
   return request({
     url: '/self/user' ,
     method: 'get',
@@ -81,6 +81,113 @@
 {
   return request({
     url: '/zExperience' +ids,
-    method: 'del',
+    method: 'delete',
+  })
+}
+
+// 鏌ヨ鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐�
+export function getCertificateList() {
+  return request({
+    url: '/zCertificate/all' ,
+    method: 'get',
+  })
+}
+
+//澧炲姞鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐�
+export function addCertificate(data)
+{
+  return request({
+    url: '/zCertificate',
+    method: 'post',
+    data: data
+  })
+}
+
+//淇敼鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐�
+export function updateCertificate(data) {
+  return request({
+    url: '/zCertificate',
+    method: 'put',
+    data: data
+  })
+}
+
+//鍒犻櫎鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐�
+export function delCertificate(ids)
+{
+  return request({
+    url: '/zCertificate' +ids,
+    method: 'delete',
+  })
+}
+
+// 鏌ヨ鍑哄浗鎯呭喌
+export function getAbroadList() {
+  return request({
+    url: '/zAbroad/all' ,
+    method: 'get',
+  })
+}
+
+//澧炲姞鍑哄浗鎯呭喌
+export function addAbroad(data)
+{
+  return request({
+    url: '/zAbroad',
+    method: 'post',
+    data: data
+  })
+}
+
+//淇敼鍑哄浗鎯呭喌
+export function updateAbroad(data) {
+  return request({
+    url: '/zAbroad',
+    method: 'put',
+    data: data
+  })
+}
+
+//鍒犻櫎鍑哄浗鎯呭喌
+export function delAbroad()
+{
+  return request({
+    url: '/zAbroad/1' ,
+    method: 'delete',
+  })
+}
+
+//鏌ヨ涓汉鎵�鏈夎嚜浼�
+export function getAutobiographyList() {
+  return request({
+    url: '/zAutobiography/all' ,
+    method: 'get',
+  })
+}
+
+//鏍规嵁涓嶅悓鏃舵湡鏌ヨ涓汉鎵�鏈夎嚜浼�
+export function getAutobiographyTermList() {
+  return request({
+    url: '/zAutobiography/byTerm' ,
+    method: 'get',
+  })
+}
+
+//淇敼涓汉鑷紶
+export function updateAutobiography(data) {
+  return request({
+    url: '/zAutobiography/',
+    method: 'put',
+    data: data
+  })
+}
+
+//鏂板涓汉鑷紶
+export function addAutobiography(data)
+{
+  return request({
+    url: '/zAutobiography/',
+    method: 'post',
+    data: data
   })
 }
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index 953febd..dcfd368 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -132,7 +132,7 @@
     path: '/family1/bignote',
     component: Layout,
     // permissions: [],
-       permissions: ['family1:bignote:list'],
+    permissions: ['family1:bignote:list'],
     hidden: true,
     children: [
       {
@@ -143,6 +143,24 @@
       }
     ]
   },
+
+  //缂栬緫涓汉淇℃伅
+  {
+    path: '/self/user',
+    component: Layout,
+    permissions: ['self:self:list'],
+
+    hidden: true,
+    children: [
+      {
+        path: 'edit/:id(\\d+)',
+        component: () => import('@/views/self/edit'),
+        name: 'edit',
+        meta: { title: '缂栬緫'}
+      }
+    ]
+  },
+
   {
     path: '/system/role-auth',
     component: Layout,
diff --git a/ruoyi-ui/src/views/bignote/familyInfo.vue b/ruoyi-ui/src/views/bignote/familyInfo.vue
deleted file mode 100644
index 341b702..0000000
--- a/ruoyi-ui/src/views/bignote/familyInfo.vue
+++ /dev/null
@@ -1,363 +0,0 @@
-<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="璇疯緭鍏d" :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: '璇疯緭鍏d',
-            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>
-  
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/bignote/familyeventInfo.vue b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
index 2bcb7ed..5688836 100644
--- a/ruoyi-ui/src/views/bignote/familyeventInfo.vue
+++ b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
@@ -1,59 +1,64 @@
 <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="璇疯緭鍏d" :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="people">
-          <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">
+  <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="璇疯緭鍏d" :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="people">
+        <el-input v-model="formData.people" 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="familyId">
+        <el-input v-model="formData.familyId" placeholder="璇疯緭鍏ュ搴彿" :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="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)"
@@ -75,289 +80,290 @@
             <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>
-        </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 {getFamilyeventInfo, updateFamilyevent, uploadPic, download} from "@/api/bignote/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,
-          people: undefined,
-          address: undefined,
-          remark: undefined,
-          url: undefined,
-        },
-        dialogImageUrl: '',
-        dialogVisible: false,
-        disabled: false,
-        rules: {
-          id: [{
-            required: true,
-            message: '璇疯緭鍏d',
-            trigger: 'blur'
-          }],
-          // type: [{
-          //   required: true,
-          //   message: '璇烽�夋嫨绫诲埆',
-          //   trigger: 'change'
-          // }],
-          title: [{
-            required: true,
-            message: '璇疯緭鍏ュぇ浜嬫爣棰�',
-            trigger: 'blur'
-          }],
-          // location: [{
-          //   required: true,
-          //   message: '璇疯緭鍏ュ瓨鍌ㄥ湴鍧�',
-          //   trigger: 'blur'
-          // }],
-          people: [{
-            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;
-        getFamilyeventInfo(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) {
-              updateFamilyevent(this.formData).then(response => {
-                this.$modal.msgSuccess("淇敼鎴愬姛");
-                // this.open = false;
-                this.btn=false
-              });
-            } else {
-              this.$modal.msgSuccess("淇敼澶辫触");
-  
-            }
-          }
-        })
+        </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 {getFamilyeventInfo, updateFamilyevent, uploadPic, download} from "@/api/bignote/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,
+        people: undefined,
+        address: undefined,
+        remark: undefined,
+        url: undefined,
       },
-      resetForm() {
-        this.$refs['elForm'].resetFields()
+      dialogImageUrl: '',
+      dialogVisible: false,
+      disabled: false,
+      rules: {
+        id: [{
+          required: true,
+          message: '璇疯緭鍏d',
+          trigger: 'blur'
+        }],
+        // type: [{
+        //   required: true,
+        //   message: '璇烽�夋嫨绫诲埆',
+        //   trigger: 'change'
+        // }],
+        title: [{
+          required: true,
+          message: '璇疯緭鍏ュぇ浜嬫爣棰�',
+          trigger: 'blur'
+        }],
+        familyId: [{
+          required: true,
+          message: '璇疯緭鍏ュ搴彿',
+          trigger: 'blur'
+        }],
+        people: [{
+          required: true,
+          message: '璇疯緭鍏ヤ汉鐗�',
+          trigger: 'blur'
+        }],
+        address: [{
+          required: true,
+          message: '璇疯緭鍏ュ湴鐐�',
+          trigger: 'blur'
+        }],
+        remark: [{
+          required: true,
+          message: '璇疯緭鍏ュ娉�',
+          trigger: 'blur'
+        }],
+
       },
-      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 = 'familyevent_'+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})
-  
-          }
-        })
-  
-      }
-  
+      typeOptions: [],
     }
+  },
+  //鍦╟reated锛堬級涓皟鐢ㄦ帴鍙ｏ紝鎷垮埌鏁版嵁
+  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;
+      getFamilyeventInfo(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) {
+            updateFamilyevent(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 = 'familyevent_'+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 = 'familyevent_'+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>
-  
\ No newline at end of file
+}
+
+</script>
+<style>
+.mt
+{
+  position: relative;
+}
+.dt{
+  display: block;
+
+}
+.pt{
+  right: 10px;
+  top:-3px;
+  display: block;
+  position: absolute;
+}
+</style>
diff --git a/ruoyi-ui/src/views/bignote/index.vue b/ruoyi-ui/src/views/bignote/index.vue
index 444c419..27b8e72 100644
--- a/ruoyi-ui/src/views/bignote/index.vue
+++ b/ruoyi-ui/src/views/bignote/index.vue
@@ -1,177 +1,213 @@
 <template>
-    <div class="app-container">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+  <div class="app-container" style="opacity: 1;">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
 
-          <el-form-item label="澶т簨鏍囬" prop="title">
-            <el-input
-              v-model="queryParams.title"
-              placeholder="璇疯緭鍏ユ爣棰�"
-              clearable
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
+      <el-form-item label="澶т簨鏍囬" prop="title">
+        <el-input
 
-          <el-form-item label="浜虹墿" prop="people">
-            <el-input
-              v-model="queryParams.people"
-              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"
-            />
+          v-model="queryParams.title"
+          placeholder="璇疯緭鍏ユ爣棰�"
+          clearable
+          style="
+              width: 197px;
+              height: 30px;
+              background: #FFFFFF;
+              border-radius: 14px 14px 14px 14px;
+              opacity: 0.5;
+              border: 1px solid rgba(0,0,0,0.25);"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
 
-        </el-form-item>
-        <el-form-item label="鏃堕棿">
-          <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>
-          <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>
+      <el-form-item label="浜虹墿" prop="people">
+        <el-input
+          v-model="queryParams.people"
+          placeholder="璇疯緭鍏ヤ汉鐗�"
+          clearable
+          style="width: 197px;
+              height: 30px;
+background: #FFFFFF;
+border-radius: 14px 14px 14px 14px;
+opacity: 0.5;
+border: 1px solid rgba(0,0,0,0.25);"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="鍦扮偣" prop="address">
+        <el-input
+          v-model="queryParams.address"
+          placeholder="璇疯緭鍏ュ湴鐐�"
+          clearable
+          style="width: 197px;
+height: 30px;
+background: #FFFFFF;
+border-radius: 14px 14px 14px 14px;
+opacity: 0.5;
+border: 1px solid rgba(0,0,0,0.25);"
+          @keyup.enter.native="handleQuery"
+        />
 
-      <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5">
+      </el-form-item>
+      <el-form-item label="鏃堕棿">
+        <el-date-picker
+          v-model="dateRange"
+          style=" width: 197px;
+height: 30px;
+background: #FFFFFF;
+border-radius: 14px 14px 14px 14px;
+opacity: 0.5;
+border: 1px solid rgba(0,0,0,0.25);"
+          value-format="yyyy-MM-dd HH-MM"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="寮�濮嬫棩鏈�"
+          end-placeholder="缁撴潫鏃ユ湡"
+        ></el-date-picker>
+      </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
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:role:add']"
+        >鏂板</el-button>
+      </el-col>
+
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:role:remove']"
+        >鍒犻櫎</el-button>
+
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['family:note:export']"
+        >瀵煎嚭</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+    <!-- 搴忓彿銆佹椂闂淬�佷汉鐗┿�佸湴鐐广�佸ぇ浜嬫爣棰樸�佺數瀛愭枃浠躲�佸娉� -->
+    <!-- 杩欓噷鏈変釜familyList鏁扮粍 鏄湪data()涓畾涔夌殑 -->
+    <el-table v-loading="loading"  :data="familyList" @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="鏃堕棿" align="center" sortable prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="浜虹墿" prop="people" sortable width="100" />
+      <el-table-column label="鍦扮偣" prop="address" sortable width="100" />
+      <el-table-column label="澶т簨鏍囬" prop="title" sortable :show-overflow-tooltip="true" width="150" />
+
+      <el-table-column label="澶囨敞" prop="remark" sortable width="100" />
+      <el-table-colum label="鐢靛瓙鏂囦欢" prop="fujian" sortable width="100"/>
+      <el-table-column label="瀹跺涵鍙�" prop="familyId" sortable width="100" />
+      <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope" v-if="scope.row.roleId !== 1">
           <el-button
-            type="primary"
-            plain
-            icon="el-icon-plus"
             size="mini"
-            @click="handleAdd"
-            v-hasPermi="['system:role:add']"
-          >鏂板</el-button>
-        </el-col>
-
-        <el-col :span="1.5">
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:role:edit']"
+          >淇敼</el-button>
           <el-button
-            type="danger"
-            plain
+            size="mini"
+            type="text"
             icon="el-icon-delete"
-            size="mini"
-            :disabled="multiple"
-            @click="handleDelete"
+            @click="handleDelete(scope.row)"
             v-hasPermi="['system:role:remove']"
           >鍒犻櫎</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <el-button
-            type="warning"
-            plain
-            icon="el-icon-download"
-            size="mini"
-            @click="handleExport"
-            v-hasPermi="['family:note:export']"
-          >瀵煎嚭</el-button>
-        </el-col>
-        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-      </el-row>
-      <!-- 搴忓彿銆佹椂闂淬�佷汉鐗┿�佸湴鐐广�佸ぇ浜嬫爣棰樸�佺數瀛愭枃浠躲�佸娉� -->
-      <!-- 杩欓噷鏈変釜familyList鏁扮粍 鏄湪data()涓畾涔夌殑 -->
-      <el-table v-loading="loading" :data="familyList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55"  align="center" />
-        <el-table-column label="搴忓彿" prop="id" sortable width="120" />
+          <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-table-column label="鏃堕棿" align="center" sortable prop="createTime" width="180">
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.createTime) }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="浜虹墿" prop="people" sortable width="100" />
-        <el-table-column label="鍦扮偣" prop="address" sortable width="100" />
-        <el-table-column label="澶т簨鏍囬" prop="title" sortable :show-overflow-tooltip="true" width="150" />
+          </el-dropdown>
+        </template>
+      </el-table-column>
+    </el-table>
 
-        <el-table-column label="澶囨敞" prop="remark" sortable width="100" />
-        <el-table-colum label="鐢靛瓙鏂囦欢" prop="fujian" sortable width="100"/>
-        <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
-          <template slot-scope="scope" v-if="scope.row.roleId !== 1">
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              @click="handleUpdate(scope.row)"
-              v-hasPermi="['system:role:edit']"
-            >淇敼</el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              @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>
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
 
-            </el-dropdown>
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @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-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="title">
-            <el-input v-model="formDat.title" 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>
 
-          <el-form-item label="浜虹墿" prop="people">
-            <el-input v-model="formDat.holder" 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-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>
+        <el-form-item label="浜虹墿" prop="people">
+          <el-input v-model="formDat.people" 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-input>
+        </el-form-item>
+        <el-form-item label="瀹跺涵鍙�" prop="familyId">
+          <el-input v-model="formDat.familyId" 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>
-          <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: 126px; height: 126px"
-                fit="cover"
-                :preview-src-list="[file.url]"
-              >
-              <span class="el-upload-list__item-actions">
+        <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: 126px; height: 126px"
+              fit="cover"
+              :preview-src-list="[file.url]"
+            >
+            <span class="el-upload-list__item-actions">
           <span
             class="el-upload-list__item-preview"
             @click="handlePictureCardPreview(file)"
@@ -189,327 +225,344 @@
         </span>
 
 
+          </div>
+        </el-upload>
+        <h4 class="form-header">鍏朵粬闄勪欢 </h4>
+        <el-upload
+          action=""
+          :file-list="fileListOther"
+          class="upload-demo"
+          multiple
+
+          :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>
-          </el-upload>
-          <h4 class="form-header">鍏朵粬闄勪欢 </h4>
-          <el-upload
-            action=""
-            :file-list="fileListOther"
-            class="upload-demo"
-            multiple
+          </template>
+        </el-upload>
 
-            :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>
+      <h4 class="form-header"> </h4>
 
-        </el-form>
-        <h4 class="form-header"> </h4>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitDataScope">纭� 瀹�</el-button>
+        <el-button @click="cancelData">鍙� 娑�</el-button>
+      </div>
+    </el-dialog>
 
-        <div slot="footer" class="dialog-footer">
-          <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 :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
+    </el-dialog>
 
-      </el-dialog>
-
-    </div>
-  </template>
-
-  <script>
-  import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
-  import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
+  </div>
+</template>
 
 
 
-  //鍦╯ystem/note/index.js涓鍏ユ帴鍙ｅ嚱鏁�  --鎺ュソ浜�
-  import {listFamilyevent , getFamilyeventInfo , delFamilyevent  , addFamilyevent , uploadPic} from "@/api/bignote/index";
-  export default {
-    name: "Role",
-    dicts: ['sys_normal_disable'],
-    data() {
-      return {
-        // 閬僵灞�
-        disabled: false,
+<script>
+import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
+import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
 
-        loading: true,
-        formData:[],
-        // 閫変腑鏁扮粍
-        ids: [],
-        // 闈炲崟涓鐢�
-        single: true,
-        // 闈炲涓鐢�
-        multiple: true,
-        // 鏄剧ず鎼滅储鏉′欢
-        showSearch: true,
-        // 鎬绘潯鏁�
-        total: 0,
-        // 瀹跺ぇ浜嬭琛ㄦ牸鏁版嵁
-        familyList: [],
-        // 寮瑰嚭灞傛爣棰�
-        title: "",
-        // 鏄惁鏄剧ず寮瑰嚭灞�
-        open: false,
-        // 鏄惁鏄剧ず寮瑰嚭灞傦紙鏁版嵁鏉冮檺锛�
-        openDataScope: false,
-        menuExpand: false,
-        menuNodeAll: false,
-        deptExpand: true,
-        deptNodeAll: false,
-        // 鏃ユ湡鑼冨洿
-        dateRange: [],
-        // 鏁版嵁鑼冨洿閫夐」
-        fot:[".jpg",".jif"],
-        fileList:[
-        ],
-        fileListOther:[
 
-        ],
-        dsb:true,
-        btn:false,
-        formDat: {
-          type: undefined,
-          title: undefined,
-          location: undefined,
-          holder: undefined,
-          address: undefined,
-          remark: undefined,
-          url: undefined,
-        },
-        // 鑿滃崟鍒楄〃
-        menuOptions: [],
-        // 閮ㄩ棬鍒楄〃
-        deptOptions: [],
-        // 鏌ヨ鍙傛暟
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-          title:undefined,
-          people:undefined,
-          address:undefined,
-          createTime:undefined
-        },
-        // 琛ㄥ崟鍙傛暟
-        form: {},
-        defaultProps: {
-          children: "children",
-          label: "label"
-        },
-        // 琛ㄥ崟鏍￠獙
-        rules: {
-          title: [{
-            required: true,
-            message: '璇疯緭鍏ュぇ浜嬫爣棰�',
-            trigger: 'blur'
-          }],
 
-          people: [{
-            required: true,
-            message: '璇疯緭鍏ヤ汉鐗�',
-            trigger: 'blur'
-          }],
-          address: [{
-            required: true,
-            message: '璇疯緭鍏ュ湴鐐�',
-            trigger: 'blur'
-          }],
-          remark: [{
-            required: true,
-            message: '璇疯緭鍏ュ娉�',
-            trigger: 'blur'
-          }],
-          createTime: [{
-            required: true,
-            message: '璇烽�夋嫨鏃ユ湡閫夋嫨',
-            trigger: 'change'
-          }],
-        },
-        typeOptions: [],
-      };
-    },
-    created() {
-      this.getList();
+//鍦╯ystem/note/index.js涓鍏ユ帴鍙ｅ嚱鏁�  --鎺ュソ浜�
+import {listFamilyevent , getFamilyeventInfo , delFamilyevent  , addFamilyevent , uploadPic} from "@/api/bignote/index";
+export default {
+  name: "Role",
+  dicts: ['sys_normal_disable'],
+  data() {
+    return {
+      // 閬僵灞�
+      disabled: false,
+
+      loading: true,
+      formData:[],
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: true,
+      // 鎬绘潯鏁�
+      total: 0,
+      // 瀹跺ぇ浜嬭琛ㄦ牸鏁版嵁
+      familyList: [],
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏄惁鏄剧ず寮瑰嚭灞傦紙鏁版嵁鏉冮檺锛�
+      openDataScope: false,
+      menuExpand: false,
+      menuNodeAll: false,
+      deptExpand: true,
+      deptNodeAll: false,
+      // 鏃ユ湡鑼冨洿
+      dateRange: [],
+      // 鏁版嵁鑼冨洿閫夐」
+      fot:[".jpg",".jif"],
+      fileList:[
+      ],
+      fileListOther:[
+
+      ],
+      dsb:true,
+      btn:false,
+      formDat: {
+        type: undefined,
+        title: undefined,
+        location: undefined,
+        holder: undefined,
+        address: undefined,
+        remark: undefined,
+        familyId:undefined,
+        url: undefined,
+      },
+      // 鑿滃崟鍒楄〃
+      menuOptions: [],
+      // 閮ㄩ棬鍒楄〃
+      deptOptions: [],
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        title:undefined,
+        people:undefined,
+        address:undefined,
+        createTime:undefined
+      },
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      defaultProps: {
+        children: "children",
+        label: "label"
+      },
+      // 琛ㄥ崟鏍￠獙
+      rules: {
+        title: [{
+          required: true,
+          message: '璇疯緭鍏ュぇ浜嬫爣棰�',
+          trigger: 'blur'
+        }],
+
+        people: [{
+          required: true,
+          message: '璇疯緭鍏ヤ汉鐗�',
+          trigger: 'blur'
+        }],
+        address: [{
+          required: true,
+          message: '璇疯緭鍏ュ湴鐐�',
+          trigger: 'blur'
+        }],
+        familyId: [{
+          required: true,
+          message: '璇疯緭鍏ュ搴彿',
+          trigger: 'blur'
+        }],
+        createTime: [{
+          required: true,
+          message: '璇烽�夋嫨鏃ユ湡閫夋嫨',
+          trigger: 'change'
+        }],
+      },
+      typeOptions: [],
+    };
+  },
+  created() {
+    this.getList();
     //   this.getCateInfor()
 
+  },
+  methods: {
+    // 鍙栨秷鎸夐挳
+    cancelData() {
+      this.open = false;
+      this.reset();
     },
-    methods: {
-      // 鍙栨秷鎸夐挳
-      cancelData() {
-        this.open = false;
-        this.reset();
-      },
 
-      /** 鏌ヨ瑙掕壊鍒楄〃 */
-      //鍒楄〃鏄剧ず瀹跺ぇ浜嬭
+    //闅旇鍙樿壊
 
-      getList() {
-        this.loading = true;
-        // console.log(this.queryParams)
-        //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-        listFamilyevent(this.queryParams).then(response => {
-            //  alert(123)
-            //   console.log(response.data)
-            this.familyList = response.data.data;
+    //   methods: {
+    //   tableRowClassName({row, rowIndex}) {
+    //     if (rowIndex === 1)  //=>杩欓噷鍙互鏀规垚 rowIndex%2=== 1锛屽悗闈㈢洿鎺lse鍗冲彲杈惧埌闅旇鍙樿壊鏁堟灉銆�
+    //     {
+    //       return 'warning-row';
+    //     } else if (rowIndex === 3) {
+    //       return 'success-row';
+    //     }
+    //     return '';
+    //   }
+    // },
 
-            this.total = response.data.total;
-            this.loading = false;
-          }
-        );
-      },
+    /** 鏌ヨ瑙掕壊鍒楄〃 */
+    //鍒楄〃鏄剧ず瀹跺ぇ浜嬭
 
-      // 鍙栨秷鎸夐挳
-      cancel() {
-        this.open = false;
-        this.reset();
-      },
-      // 鍙栨秷鎸夐挳锛堟暟鎹潈闄愶級
-      cancelDataScope() {
-        this.openDataScope = false;
-        this.reset();
-      },
-      // 琛ㄥ崟閲嶇疆
-      reset() {
-        if (this.$refs.menu != undefined) {
-          this.$refs.menu.setCheckedKeys([]);
+    getList() {
+      this.loading = true;
+      // console.log(this.queryParams)
+      //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+      listFamilyevent(this.queryParams).then(response => {
+          //  alert(123)
+          //   console.log(response.data)
+          this.familyList = response.data.data;
+
+          this.total = response.data.total;
+          this.loading = false;
         }
-        this.menuExpand = false,
-          this.menuNodeAll = false,
-          this.deptExpand = true,
-          this.deptNodeAll = false,
-          this.form = {
-            roleId: undefined,
-            roleName: undefined,
-            roleKey: undefined,
-            roleSort: 0,
-            status: "0",
-            menuIds: [],
-            deptIds: [],
-            menuCheckStrictly: true,
-            deptCheckStrictly: true,
-            remark: undefined
-          };
-        this.resetForm("form");
-      },
-      /** 鎼滅储鎸夐挳鎿嶄綔 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 閲嶇疆鎸夐挳鎿嶄綔 */
-      resetQuery() {
-        this.dateRange = [];
-        this.resetForm("queryForm");
-        this.handleQuery();
-      },
-      // 澶氶�夋閫変腑鏁版嵁
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.id)
-        console.log(this.ids)
-        this.single = selection.length!=1
-        this.multiple = !selection.length
-      },
+      );
+    },
 
-      /** 鏂板鎸夐挳鎿嶄綔 */
-      handleAdd() {
-        this.reset();
-        this.open = true;
-        this.title = "娣诲姞瀹跺涵澶т簨璁颁俊鎭�";
-      },
-
-
-      /** 鏌ョ湅璇︾粏淇℃伅 */
-      handleCheck(row){
-        const id = row.id;
-        this.$router.push("/family1/bignote/familyeventInfo/" + id);
-      },
-      /** 淇敼鎸夐挳鎿嶄綔 */
-      handleUpdate(row) {
-        const id = row.id;
-        let jd = true
-
-        this.$router.push({
-          path:"/family1/bignote/familyeventInfo/" + id,
-          query:{
-            detail:jd
-          }
-        });
-      },
-
-
-      handlePictureCardPreview(file) {
-        this.dialogImageUrl = file.url;
-        this.dialogVisible = true;
-      },
-      /** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
-      submitDataScope: function() {
-
-        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.formDat.url = ul+","+uls
-        this.$refs["elForm"].validate(valid => {
-          if (valid) {
-
-            addFamilyevent(this.formDat).then(response => {
-              this.$modal.msgSuccess("鏂板鎴愬姛");
-              this.open = false;
-              this.getList1();
-            });
-          }
-        });
-      },
-      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})
-
-          }
-        })
-
-      },
-      /** 鍒犻櫎鎸夐挳鎿嶄綔 */
-      handleDelete(row) {
-        const Ids = row.id || this.ids;
-        this.$modal.confirm('鏄惁纭鍒犻櫎搴忓彿涓�"' + Ids + '"鐨勬暟鎹」锛�').then(function() {
-          return delFamilyevent(Ids);
-        }).then(() => {
-          this.getList1();
-          this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-        }).catch(() => {});
-      },
-      /** 瀵煎嚭鎸夐挳鎿嶄綔 */
-      handleExport() {
-        this.download('/family/zfEvent/export', {
-          ...this.queryParams
-        }, `zfEvent_${new Date().getTime()}.xlsx`)
+    // 鍙栨秷鎸夐挳
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 鍙栨秷鎸夐挳锛堟暟鎹潈闄愶級
+    cancelDataScope() {
+      this.openDataScope = false;
+      this.reset();
+    },
+    // 琛ㄥ崟閲嶇疆
+    reset() {
+      if (this.$refs.menu != undefined) {
+        this.$refs.menu.setCheckedKeys([]);
       }
+      this.menuExpand = false,
+        this.menuNodeAll = false,
+        this.deptExpand = true,
+        this.deptNodeAll = false,
+        this.form = {
+          roleId: undefined,
+          roleName: undefined,
+          roleKey: undefined,
+          roleSort: 0,
+          status: "0",
+          menuIds: [],
+          deptIds: [],
+          menuCheckStrictly: true,
+          deptCheckStrictly: true,
+          remark: undefined
+        };
+      this.resetForm("form");
+    },
+    /** 鎼滅储鎸夐挳鎿嶄綔 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 閲嶇疆鎸夐挳鎿嶄綔 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 澶氶�夋閫変腑鏁版嵁
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      console.log(this.ids)
+      this.single = selection.length!=1
+      this.multiple = !selection.length
+    },
+
+    /** 鏂板鎸夐挳鎿嶄綔 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "娣诲姞瀹跺涵澶т簨璁颁俊鎭�";
+    },
+
+
+    /** 鏌ョ湅璇︾粏淇℃伅 */
+    handleCheck(row){
+      const id = row.id;
+      this.$router.push("/family/zfEvent/bignote/familyeventInfo/" + id);
+    },
+    /** 淇敼鎸夐挳鎿嶄綔 */
+    handleUpdate(row) {
+      const id = row.id;
+      let jd = true
+
+      this.$router.push({
+        path:"/family/zfEvent/bignote/familyeventInfo/" + id,
+        query:{
+          detail:jd
+        }
+      });
+    },
+
+
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url;
+      this.dialogVisible = true;
+    },
+    /** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
+    submitDataScope: function() {
+
+      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.formDat.url = ul+","+uls
+      this.$refs["elForm"].validate(valid => {
+        if (valid) {
+
+          addFamilyevent(this.formDat).then(response => {
+            this.$modal.msgSuccess("鏂板鎴愬姛");
+            this.open = false;
+            this.getList1();
+          });
+        }
+      });
+    },
+    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})
+
+        }
+      })
+
+    },
+    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+    handleDelete(row) {
+      const Ids = row.id || this.ids;
+      this.$modal.confirm('鏄惁纭鍒犻櫎搴忓彿涓�"' + Ids + '"鐨勬暟鎹」锛�').then(function() {
+        return delFamilyevent(Ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+      }).catch(() => {});
+    },
+    /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+    handleExport() {
+      this.download('/family/zfEvent/export', {
+        ...this.queryParams
+      }, `zfEvent_${new Date().getTime()}.xlsx`)
     }
-  };
-  </script>
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/contacts/index.vue b/ruoyi-ui/src/views/contacts/index.vue
new file mode 100644
index 0000000..6b3eee4
--- /dev/null
+++ b/ruoyi-ui/src/views/contacts/index.vue
@@ -0,0 +1,571 @@
+<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>
+          <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="鎵�鏈夌被鍒�"
+            clearable
+            style="width: 240px"
+          >
+            <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>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:role:add']"
+        >鏂板</el-button>
+      </el-col>
+
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:role:remove']"
+        >鍒犻櫎</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['family:note:export']"
+        >瀵煎嚭</el-button>
+      </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">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </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
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:role:edit']"
+          >淇敼</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @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>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @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>
+
+        <el-form-item label="鏍囬" prop="title">
+          <el-input v-model="formDat.title" 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-input>
+        </el-form-item>
+        <el-form-item label="鎸佹湁浜�" prop="holder">
+          <el-input v-model="formDat.holder" 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-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>
+        <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: 126px; height: 126px"
+              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="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-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>
+      <h4 class="form-header"> </h4>
+
+      <div slot="footer" class="dialog-footer">
+        <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>
+
+  </div>
+</template>
+
+<script>
+import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
+import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
+
+
+
+//鍦╯ystem/note/index.js涓鍏ユ帴鍙ｅ嚱鏁�
+import {listProperty, getPropertyInfo, delProperty, getCategory, addProperty, uploadPic} from "@/api/note/index";
+export default {
+  name: "Role",
+  dicts: ['sys_normal_disable'],
+  data() {
+    return {
+      // 閬僵灞�
+      disabled: false,
+
+      loading: true,
+      formData:[],
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: true,
+      // 鎬绘潯鏁�
+      total: 0,
+      // 璧勪骇琛ㄦ牸鏁版嵁
+      propertyList: [],
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏄惁鏄剧ず寮瑰嚭灞傦紙鏁版嵁鏉冮檺锛�
+      openDataScope: false,
+      menuExpand: false,
+      menuNodeAll: false,
+      deptExpand: true,
+      deptNodeAll: false,
+      // 鏃ユ湡鑼冨洿
+      dateRange: [],
+      // 鏁版嵁鑼冨洿閫夐」
+      fot:[".jpg",".jif"],
+      fileList:[
+      ],
+      fileListOther:[
+
+      ],
+      dsb:true,
+      btn:false,
+      formDat: {
+        type: undefined,
+        title: undefined,
+        location: undefined,
+        holder: undefined,
+        address: undefined,
+        remark: undefined,
+        url: undefined,
+      },
+      // 鑿滃崟鍒楄〃
+      menuOptions: [],
+      // 閮ㄩ棬鍒楄〃
+      deptOptions: [],
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        type:undefined,
+        title:undefined,
+        location:undefined,
+        holder:undefined,
+        address:undefined,
+        createTime:undefined
+      },
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      defaultProps: {
+        children: "children",
+        label: "label"
+      },
+      // 琛ㄥ崟鏍￠獙
+      rules: {
+        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'
+        }],
+        createTime: [{
+          required: true,
+          message: '璇烽�夋嫨鏃ユ湡閫夋嫨',
+          trigger: 'change'
+        }],
+      },
+      typeOptions: [],
+    };
+  },
+  created() {
+    this.getList();
+    this.getCateInfor()
+
+  },
+  methods: {
+    // 鍙栨秷鎸夐挳
+    cancelData() {
+      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 => {
+          //  alert(123)
+          //   console.log(response.data)
+          this.propertyList = response.data.data;
+
+          this.total = response.data.total;
+          this.loading = false;
+        }
+      );
+    },
+    /** 鏌ヨ绫诲埆淇℃伅 */
+    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)
+    },
+    // 鍙栨秷鎸夐挳
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 鍙栨秷鎸夐挳锛堟暟鎹潈闄愶級
+    cancelDataScope() {
+      this.openDataScope = false;
+      this.reset();
+    },
+    // 琛ㄥ崟閲嶇疆
+    reset() {
+      if (this.$refs.menu != undefined) {
+        this.$refs.menu.setCheckedKeys([]);
+      }
+      this.menuExpand = false,
+        this.menuNodeAll = false,
+        this.deptExpand = true,
+        this.deptNodeAll = false,
+        this.form = {
+          roleId: undefined,
+          roleName: undefined,
+          roleKey: undefined,
+          roleSort: 0,
+          status: "0",
+          menuIds: [],
+          deptIds: [],
+          menuCheckStrictly: true,
+          deptCheckStrictly: true,
+          remark: undefined
+        };
+      this.resetForm("form");
+    },
+    /** 鎼滅储鎸夐挳鎿嶄綔 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 閲嶇疆鎸夐挳鎿嶄綔 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 澶氶�夋閫変腑鏁版嵁
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      console.log(this.ids)
+      this.single = selection.length!=1
+      this.multiple = !selection.length
+    },
+
+    /** 鏂板鎸夐挳鎿嶄綔 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "娣诲姞璧勪骇璇︾粏淇℃伅";
+    },
+    /** 鏌ョ湅璇︾粏淇℃伅 */
+    handleCheck(row){
+      const id = row.id;
+      this.$router.push("/family/note1/propertyInfo/" + id);
+    },
+    /** 淇敼鎸夐挳鎿嶄綔 */
+    handleUpdate(row) {
+      const id = row.id;
+      let jd = true
+
+      this.$router.push({
+        path:"/family/note1/propertyInfo/" + id,
+        query:{
+          detail:jd
+        }
+      });
+    },
+
+
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url;
+      this.dialogVisible = true;
+    },
+    /** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
+    submitDataScope: function() {
+
+      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.formDat.url = ul+","+uls
+      this.$refs["elForm"].validate(valid => {
+        if (valid) {
+
+          addProperty(this.formDat).then(response => {
+            this.$modal.msgSuccess("鏂板鎴愬姛");
+            this.open = false;
+            this.getList();
+          });
+        }
+      });
+    },
+    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})
+
+        }
+      })
+
+    },
+    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+    handleDelete(row) {
+      const Ids = row.id || this.ids;
+      this.$modal.confirm('鏄惁纭鍒犻櫎璧勪骇缂栧彿涓�"' + Ids + '"鐨勬暟鎹」锛�').then(function() {
+        return delProperty(Ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+      }).catch(() => {});
+    },
+    /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+    handleExport() {
+      this.download('family/property/export', {
+        ...this.queryParams
+      }, `property_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/note/index.vue b/ruoyi-ui/src/views/note/index.vue
index e51907f..c8a0e53 100644
--- a/ruoyi-ui/src/views/note/index.vue
+++ b/ruoyi-ui/src/views/note/index.vue
@@ -20,7 +20,7 @@
             v-model="queryParams.title"
             placeholder="璇疯緭鍏ユ爣棰�"
             clearable
-            style="width: 240px"title
+            style="width: 240px"
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
@@ -114,11 +114,14 @@
       <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="瀹跺涵鍙�" prop="familyId" sortable width="100" />
       <el-table-column label="鍒涘缓鏃堕棿" align="center" sortable prop="createTime" width="180">
+
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </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
@@ -176,6 +179,11 @@
           <el-input v-model="formDat.address" placeholder="璇疯緭鍏ュ叿浣撲綅缃�" clearable :style="{width: '100%'}" >
           </el-input>
         </el-form-item>
+        <el-form-item label="瀹跺涵鍙�" prop="familyId">
+          <el-input v-model="formDat.familyId" 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>
@@ -312,6 +320,7 @@
         address: undefined,
         remark: undefined,
         url: undefined,
+
       },
       // 鑿滃崟鍒楄〃
       menuOptions: [],
@@ -326,7 +335,8 @@
         location:undefined,
         holder:undefined,
         address:undefined,
-        createTime:undefined
+        createTime:undefined,
+
       },
       // 琛ㄥ崟鍙傛暟
       form: {},
@@ -361,9 +371,9 @@
           message: '璇疯緭鍏ュ叿浣撲綅缃�',
           trigger: 'blur'
         }],
-        remark: [{
+        familyId: [{
           required: true,
-          message: '璇疯緭鍏ュ娉�',
+          message: '璇疯緭鍏amilyId',
           trigger: 'blur'
         }],
         createTime: [{
@@ -477,7 +487,7 @@
     /** 鏌ョ湅璇︾粏淇℃伅 */
     handleCheck(row){
       const id = row.id;
-      this.$router.push("/family/note1/propertyInfo/" + id);
+      this.$router.push("/family/property/note1/propertyInfo/" + id);
     },
     /** 淇敼鎸夐挳鎿嶄綔 */
     handleUpdate(row) {
@@ -485,7 +495,7 @@
       let jd = true
 
       this.$router.push({
-        path:"/family/note1/propertyInfo/" + id,
+        path:"/family/property/note1/propertyInfo/" + id,
         query:{
           detail:jd
         }
diff --git a/ruoyi-ui/src/views/note/propertyInfo.vue b/ruoyi-ui/src/views/note/propertyInfo.vue
deleted file mode 100644
index 2058a66..0000000
--- a/ruoyi-ui/src/views/note/propertyInfo.vue
+++ /dev/null
@@ -1,362 +0,0 @@
-<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="璇疯緭鍏d" :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: '璇疯緭鍏d',
-          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>
diff --git a/ruoyi-ui/src/views/note/propertylnfo.vue b/ruoyi-ui/src/views/note/propertylnfo.vue
index 2485d42..55d5b69 100644
--- a/ruoyi-ui/src/views/note/propertylnfo.vue
+++ b/ruoyi-ui/src/views/note/propertylnfo.vue
@@ -6,7 +6,7 @@
     </div>
 
     <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px">
-      <el-form-item label="id" prop="id">
+      <el-form-item label="搴忓彿" prop="id">
         <el-input v-model="formData.id" placeholder="璇疯緭鍏d" :maxlength="11" show-word-limit :disabled="true"
                   clearable prefix-icon='el-icon-mobile' :style="{width: '100%'}"></el-input>
       </el-form-item>
@@ -34,6 +34,10 @@
       <el-form-item label="澶囨敞" prop="remark">
         <el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
       </el-form-item>
+      <el-form-item label="瀹跺涵鍙�" prop="familyId">
+        <el-input v-model="formData.familyId" placeholder="璇疯緭鍏ュ搴彿" :maxlength="11" show-word-limit :disabled="true"
+                  clearable prefix-icon='el-icon-mobile' :style="{width: '100%'}"></el-input>
+      </el-form-item>
 
       <h4 class="form-header">鐩稿叧鍥剧墖 </h4>
       <el-upload
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index c5a9f73..41ac96b 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -1,11 +1,6 @@
 <template>
   <div class="app-container">
-    <el-col  :span="6" >
-      <el-input size="medium" v-model="input" placeholder="鎼滅储" clearable>
-        <i slot="prefix" class="el-input__icon el-icon-search"></i>
-      </el-input>
-    </el-col>
-    <br>
+
     <h1 style="font-size:21px;padding-top:30px">涓汉绠�鍘�</h1>
     <el-divider />
 <!--    鍩烘湰淇℃伅-->
@@ -23,10 +18,21 @@
 <!--            ></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 v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
-            <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="70px" label-position="left">
+
+        <el-container >
+          <el-col >
+            <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="70px" label-position="left"
+                     v-loading="loading" :data="individualList" @selection-change="handleSelectionChange" >
               <el-row :span="6">
                 <el-form-item label="濮撳悕" prop="nickName">
                   <el-input v-model="formData.nickName" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
@@ -48,6 +54,32 @@
             </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>
@@ -75,6 +107,7 @@
           </el-col>
         </el-container>
       </div>
+
       <div style="padding-left:70px">
         <el-container>
           <el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
@@ -130,6 +163,20 @@
 
 
             >缂栬緫</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>
+
             <br>
             <el-button type="primary" @click="submitForm">瀵煎叆</el-button>
           </el-row>
@@ -156,7 +203,10 @@
               </el-row>
               <el-row :span="15">
                 <el-form-item label="鍗曚綅鍙婅亴鍔¤亴绉�" prop="unit position ">
-                  <el-input v-model="formData.unit,formData.position" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+                  <el-input v-model:unit="formData.unit" v-model:position="formData.position" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+                    <template slot-scope="scope">
+                      {{scope.row.unit}}/{{scope.row.position}}
+                    </template>
                   </el-input>
                 </el-form-item>
               </el-row>
@@ -188,54 +238,46 @@
       </div>
     </el-container>
 
-<!--    涓昏瀛︿範鍙婂伐浣滅粡鍘�-->
-    <div style="padding-top:30px">
-      <el-container>
-        <div style="width:100%"><h2 style="font-size:15px" >涓昏瀛︿範鍙婂伐浣滅粡鍘�</h2></div>
-        <el-button type="primary" icon="el-icon-edit" round></el-button>
-        <el-button type="primary" icon="el-icon-delete" round></el-button>
-      </el-container>
-    <el-table v-loading="loading" :data="experienceList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="25"  align="center" />
-      <el-table-column label="璧锋鏃ユ湡" prop="startDate" sortable width="300" align="center" />
-      <el-table-column label="涓昏瀛︿範缁忓巻銆佸伐浣滃崟浣嶅強浠昏亴鎯呭喌" prop="content" sortable width="350" align="center" />
-      <el-table-column label="璇佹槑浜�" prop="witness" sortable width="300" align="center" />
-      <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope" v-if="scope.row.roleId !== 1">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:role:edit']"
-          >淇敼</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @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-collapse v-model="activeNames" @change="handleChange">
+      <el-collapse-item title="涓昏瀛︿範鍙婂伐浣滅粡鍘�" name="1" >
+        <el-table v-loading="loading" :data="experienceList" @selection-change="handleSelectionChange">
+          <el-table-column label="璧锋鏃ユ湡" prop="startDate" sortable width="300" align="center" />
+          <el-table-column label="涓昏瀛︿範缁忓巻銆佸伐浣滃崟浣嶅強浠昏亴鎯呭喌" prop="content" sortable width="350" align="center" />
+          <el-table-column label="璇佹槑浜�" prop="witness" sortable width="300" align="center" />
+          <!--      鎿嶄綔-->
+          <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+            <template slot-scope="scope" v-if="scope.row.roleId !== 1">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['system:role:edit']"
+              >淇敼</el-button>
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @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>
-        </template>
-      </el-table-column>
-    </el-table>
-    </div>
-<!--    瀹跺涵鎴愬憳鍙婁富瑕佺ぞ浼氬叧绯绘儏鍐�-->
-    <div style="padding-top:30px">
-      <el-container>
-        <div style="width:100%"><h2 style="font-size:15px" >瀹跺涵鎴愬憳鍙婁富瑕佺ぞ浼氬叧绯绘儏鍐�</h2></div>
-        <el-button type="primary" icon="el-icon-edit" round></el-button>
-        <el-button type="primary" icon="el-icon-delete" round></el-button>
-      </el-container>
+              </el-dropdown>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-collapse-item>
+      <el-collapse-item title="瀹跺涵鎴愬憳鍙婁富瑕佺ぞ浼氬叧绯绘儏鍐�" name="2" >
         <el-table v-loading="loading" :data="relationList" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="25"  align="center" />
           <el-table-column label="涓庢湰浜哄叧绯�"  prop="relation" sortable width="260" align="center" />
           <el-table-column label="濮撳悕" prop="nickName" sortable width="260" align="center" />
-          <el-table-column label="鍗曚綅鍙婅亴鍔�" prop="unit position" sortable width="260" align="center" />
+          <el-table-column label="鍗曚綅鍙婅亴鍔�" prop="unit position" sortable width="260" align="center">
+            <template slot-scope="scope">
+              {{scope.row.unit}}/{{scope.row.position}}
+            </template>
+          </el-table-column>
           <el-table-column label="鏀挎不闈㈣矊" prop="politicalOutlook" sortable width="260" align="center"/>
           <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope" v-if="scope.row.roleId !== 1">
@@ -260,104 +302,60 @@
             </template>
           </el-table-column>
         </el-table>
-    </div>
-
-  <!--    绉诲眳鍥斤紙澧冿級鎯呭喌-->
-    <div>
-      <el-container>
-        <div style="width:100%"><h2 style="font-size:15px" >绉诲眳鍥斤紙澧冿級鎯呭喌</h2></div>
-      </el-container>
-
-      <div style="width:100%">
-        <el-container>
-          <span style="font-size:15px" >鏄惁鎷ユ湁澶栫睄銆佸澶栧眳鐣欐潈銆侀暱鏈熷眳鐣欒鍙�</span>
-          <el-radio v-model="formData.outStatus" label="1">鏄�</el-radio>
-          <el-radio v-model="formData.outStatus" label="0">鍚�</el-radio>
-        </el-container>
-      </div>
-      <div style="padding-top:20px">
-        <el-container>
-          <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="80px" label-position="left">
-              <el-form-item label="璇佷欢鍙风爜" prop="idNo">
-                <el-input v-model="formData.idNo" placeholder="" clearable  :disabled="dsb">
-                </el-input>
-              </el-form-item>
+      </el-collapse-item>
+      <el-collapse-item title="绉诲眳鍥斤紙澧冿級鎯呭喌" name="3" >
+        <div>
+          <el-form>
+            <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>
+            </el-form-item>
           </el-form>
-        </el-container>
-      </div>
-    </div>
+          <div>
+            <el-table :data="individualList.idNo" border stripe>
+              <el-table-column label="璇佷欢鍙风爜"  width="80" align="center">
+              </el-table-column>
+            </el-table>
+          </div>
+        </div>
 
-  <!--    鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐�-->
-      <div style="padding-top:30px">
-        <el-container>
-          <div style="width:100%"><h2 style="font-size:15px" >鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐�</h2></div>
-          <el-button type="primary" icon="el-icon-edit" round></el-button>
-          <el-button type="primary" icon="el-icon-delete" round></el-button>
-        </el-container>
-        <el-table v-loading="loading" :data="experiencelList" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="25"  align="center" />
+      </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>
         </el-table>
-
-
-      </div>
-
-
-  <!--    鍑哄浗锛堝锛夋儏鍐�-->
-
-      <div style="padding-top:30px">
-        <el-container>
-          <div style="width:100%"><h2 style="font-size:15px" >鍑哄浗锛堝锛夋儏鍐�</h2></div>
-          <el-button type="primary" icon="el-icon-edit" round></el-button>
-          <el-button type="primary" icon="el-icon-delete" round></el-button>
-        </el-container>
-        <el-table v-loading="loading" :data="experiencelList" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="25"  align="center" />
+      </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>
+      </el-collapse-item>
+    </el-collapse>
 
-      </div>
-
-
-<!--    鑷紶-->
+  <!--    鑷紶-->
     <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="first"></el-tab-pane>
-        <el-tab-pane label="6~12(灏忓)" name="second"></el-tab-pane>
-        <el-tab-pane label="12~15(鍒濅腑)" name="third"></el-tab-pane>
-        <el-tab-pane label="15~18(楂樹腑)" name="fourth"></el-tab-pane>
+        <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-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>
       </el-tabs>
-
-<!--      <el-card class="box-card">-->
-<!--        <div slot="header" class="clearfix">-->
-<!--          <el-button type="primary" round>0~3宀�(濠村効鏈�)</el-button>-->
-<!--          <el-button type="primary" round>6~12(灏忓)</el-button>-->
-<!--          <el-button type="primary" round>12~15(鍒濅腑)</el-button>-->
-<!--          <el-button type="primary" round>15~18(楂樹腑)</el-button>-->
-<!--          <el-button type="primary" round>18~22(澶у)</el-button>-->
-<!--          <el-button type="primary" round>22~25(鐮旂┒鐢�)</el-button>-->
-<!--          <el-button type="primary" round>26~ (宸ヤ綔)</el-button>-->
-<!--          <el-button type="primary" round>锛熷瞾缁撳</el-button>-->
-<!--          <el-button style="float: right; padding: 3px 0" type="text">鎿嶄綔鎸夐挳</el-button>-->
-<!--        </div>-->
-<!--        <div v-for="o in 4" :key="o" class="text item">-->
-<!--          {{ }}-->
-<!--        </div>-->
-<!--      </el-card>-->
 
 
     </div>
@@ -385,6 +383,7 @@
 //鍦╯ystem/note/index.js涓鍏ユ帴鍙ｅ嚱鏁�  --鎺ュソ浜�
 import {getIndividualList, getIndividualRelation, delIndividual, updateIndividual, addIndividual,listExperience,updateExperience,
   addExperience,delExperience} from "@/api/self/index";
+import { getAbroadList, getAutobiographyTermList, getCertificateList } from '../../api/self'
 export default {
   name: "show",
   dicts: ['sys_normal_disable'],
@@ -411,7 +410,14 @@
       experienceList: [],
       //瀹跺涵鎴愬憳鍏崇郴鏁版嵁
       relationList:[],
-
+      //鍑哄叆澧冭瘉浠舵儏鍐�
+      certificateList:[],
+      //鍑哄浗鎯呭喌
+      AbroadList:[],
+      //涓嶅悓鏃舵涓汉鑷紶
+      AutobiographyTermList:[],
+      //涓嬫媺瀹炵幇
+      activeNames:['1'],
       // 寮瑰嚭灞傛爣棰�
       title: "",
       // 鏄惁鏄剧ず寮瑰嚭灞�
@@ -435,7 +441,7 @@
       dsb:true,
       btn:false,
       //涓汉鑷紶
-      activeName: 'second',
+      activeName: '1',
 
       formDat: {
         //涓汉鍩烘湰淇℃伅
@@ -460,6 +466,7 @@
         fatherId:undefined,
         momId:undefined,
         birth:undefined,
+        familyId:undefined,
 
         //涓昏瀛︿範鍙婂伐浣滅粡鍘�
         id:undefined,
@@ -577,13 +584,16 @@
   created() {
     this.getList();
     //   this.getCateInfor()
-
   },
   methods: {
     // 鍙栨秷鎸夐挳
     cancelData() {
       this.open = false;
       this.reset();
+    },
+    //涓嬫媺
+    handleChange(val) {
+      console.log(val);
     },
     //缂栬緫鎸夐挳
     edit(row){
@@ -596,6 +606,14 @@
     //涓汉鑷紶
     handleClick(tab, event) {
       console.log(tab, event);
+      //鏍规嵁涓嶅悓鏃舵鐨勪釜浜鸿嚜浼�
+      getAutobiographyTermList(this.queryParams).then(response => {
+        //  alert(123)
+        //   console.log(response.data)
+        this.AutobiographyTermList = response.data;
+        this.total = response.data.total;
+        this.loading = false;
+      });
     },
 
     /** 鏌ヨ瑙掕壊鍒楄〃 */
@@ -605,35 +623,56 @@
       this.loading = true;
       // console.log(this.queryParams)
       //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+      //涓汉缁忓巻
       listExperience(this.queryParams).then(response => {
-            alert(123)
-             console.log(response.data)
+          //  alert(123)
+          //   console.log(response.data)
           this.experienceList = response.data;
-
           this.total = response.data.total;
           this.loading = false;
         }
       );
+      //鎴愬憳鍏崇郴
       getIndividualRelation(this.queryParams).then(response => {
           //  alert(123)
           //   console.log(response.data)
           this.relationList = response.data;
-
           this.total = response.data.total;
           this.loading = false;
         }
       );
+      //涓汉淇℃伅
       getIndividualList(this.queryParams).then(response => {
           //  alert(123)
           //   console.log(response.data)
           this.individualList = response.data;
-
           this.total = response.data.total;
           this.loading = false;
         }
       );
+      //鍑哄叆澧冭瘉浠舵儏鍐�
+      getCertificateList(this.queryParams).then(response => {
+          //  alert(123)
+          //   console.log(response.data)
+          this.certificateList = response.data;
+          this.total = response.data.total;
+          this.loading = false;
+        }
+      );
+      //鍑哄浗鎯呭喌
+      getAbroadList(this.queryParams).then(response => {
+        //  alert(123)
+        //   console.log(response.data)
+        this.AbroadList = response.data;
+        this.total = response.data.total;
+        this.loading = false;
+      }
+      );
+
 
     },
+
+
 
     // 鍙栨秷鎸夐挳
     cancel() {
@@ -781,3 +820,4 @@
   }
 };
 </script>
+
diff --git a/zhangshi_app_web b/zhangshi_app_web
index d51ebc3..489836d 160000
--- a/zhangshi_app_web
+++ b/zhangshi_app_web
@@ -1 +1 @@
-Subproject commit d51ebc377303183e40049a1222ba1863ba641166
+Subproject commit 489836df6b7f28581e648a2d1c613600521e6fb5

--
Gitblit v1.9.1