From 1e264767dd2ac93e83b57b4e8e6626621fff4c6f Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 20 五月 2025 22:41:03 +0800
Subject: [PATCH] 修改了bug

---
 ruoyi-ui/src/views/self/show.vue | 1838 +++++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 1,356 insertions(+), 482 deletions(-)

diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index 8441e99..5069bdd 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -1,377 +1,556 @@
 <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 />
-<!--    鍩烘湰淇℃伅-->
-    <h2 style="font-size:16px">鍩烘湰淇℃伅</h2>
+    <!--    鍥炲埌椤堕儴-->
 
-<!--      <el-column prop="nickName" label="濮撳悕"></el-column>-->
-
-    <el-container>
-<!--      <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>-->
-      <div style="padding-left:30px">
-
-<!--        <el-form-item label="userId" prop="userId">-->
-<!--          <el-select v-model="formDat.userId"  clearable :style="{width: '100%'}"  >-->
-<!--            <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"-->
-<!--            ></el-option>-->
-<!--          </el-select>-->
-<!--        </el-form-item>-->
-
-        <el-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-row :span="6">
-                <el-form-item label="濮撳悕" prop="nickName">
-                  <el-input v-model="formData.nickName" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
-                  </el-input>
-                </el-form-item>
-              </el-row>
-              <el-row :span="6">
-                <el-form-item label="鏇剧敤鍚�" prop="oldName">
-                  <el-input v-model="formData.oldName" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
-                  </el-input>
-                </el-form-item>
-              </el-row>
-              <el-row :span="8">
-                <el-form-item label="韬唤璇佸彿" prop="idNum">
-                  <el-input v-model="formData.idNum" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
-                  </el-input>
-                </el-form-item>
-              </el-row>
-            </el-form>
-          </el-col>
-        </el-container>
-      </div>
-      <div style="padding-left:70px">
-        <el-container>
-          <el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
-            <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="70px" label-position="left">
-              <el-row :span="6">
-                <el-form-item label="鎬у埆" prop="sex">
-                  <el-input v-model="formData.sex" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
-                  </el-input>
-                </el-form-item>
-              </el-row>
-              <el-row :span="6">
-                <el-form-item label="姘戞棌" prop="nation">
-                  <el-input v-model="formData.nation" placeholder="" clearable :style="{width: '100%'}":disabled="dsb">
-                  </el-input>
-                </el-form-item>
-              </el-row>
-              <el-row :span="8">
-                <el-form-item label="鑱旂郴鏂瑰紡" prop="phoneNumber">
-                  <el-input v-model="formData.phoneNumber" placeholder="" clearable :style="{width: '100%'}":disabled="dsb">
-                  </el-input>
-                </el-form-item>
-              </el-row>
-            </el-form>
-          </el-col>
-        </el-container>
-      </div>
-      <div style="padding-left:70px">
-        <el-container>
-          <el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
-            <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="70px" label-position="left":disabled="dsb">
-              <el-row :span="6">
-                <el-form-item label="鍥界睄" prop="nationality">
-                  <el-input v-model="formData.nationality" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
-                  </el-input>
-                </el-form-item>
-              </el-row>
-              <el-row :span="6">
-                <el-form-item label="濠氬Щ鐘跺喌" prop="maritalStatus">
-                  <el-input v-model="formData.maritalStatus" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
-                  </el-input>
-                </el-form-item>
-              </el-row>
-
-            </el-form>
-          </el-col>
-        </el-container>
-      </div>
-      <div style="padding-left:90px;padding-top:30px">
-        <el-row :gutter="6" >
-          <el-upload ref="ref1"
-                     action=""
-                     :file-list="fileList"
-                     list-type="picture-card"
-                     accept="image/*"
-                     :auto-upload="false"
-                     :multiple="false"
-                     :limit="1">
-            <i class="el-icon-plus"></i>
-          </el-upload>
-        </el-row>
-      </div>
-      <div style="padding-left:50px;padding-top:30px"  >
-        <el-container >
-<!--          <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>-->
-
-<!--          </template>-->
-          <el-row :span="2" style="flex-direction: column;">
-            <el-button
-              type="primary"
-              @click="edit(scope.row)"
-              v-hasPermi="['system:role:edit']"
-
-
-            >缂栬緫</el-button>
-            <br>
-            <el-button type="primary" @click="submitForm">瀵煎叆</el-button>
-          </el-row>
-        </el-container>
-      </div>
-<!--      </el-dialog>-->
-    </el-container>
-    <el-container>
-      <div style="padding-left:30px">
-        <el-container>
-          <el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
-            <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="110px" label-position="left">
-              <el-row :span="15">
-                <el-form-item label="鎴风睄鍦板潃" prop="locationAddress">
-                  <el-input v-model="formData.locationAddress" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
-                  </el-input>
-                </el-form-item>
-              </el-row>
-              <el-row :span="15">
-                <el-form-item label="甯镐綇鍦板潃" prop="alwaysAddress">
-                  <el-input v-model="formData.alwaysAddress" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
-                  </el-input>
-                </el-form-item>
-              </el-row>
-              <el-row :span="15">
-                <el-form-item label="鍗曚綅鍙婅亴鍔¤亴绉�" prop="unit position ">
-                  <el-input v-model="formData.unit,formData.position" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
-                  </el-input>
-                </el-form-item>
-              </el-row>
-
-            </el-form>
-          </el-col>
-        </el-container>
-      </div>
-      <div style="padding-left:30px">
-        <el-container>
-          <el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
-            <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="110px" label-position="left">
-              <el-row :span="12">
-                <el-form-item label="鎴风睄鍦板叕瀹夋満鍏�" prop="locationPolice">
-                  <el-input v-model="formData.locationPolice" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
-                  </el-input>
-                </el-form-item>
-              </el-row>
-              <el-row :span="12">
-                <el-form-item label="甯镐綇鍦板叕瀹夋満鍏�" prop="alwaysPolice">
-                  <el-input v-model="formData. alwaysPolice" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
-                  </el-input>
-                </el-form-item>
-              </el-row>
-
-            </el-form>
-          </el-col>
-        </el-container>
-      </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">
+    <h1 style="font-size:21px;padding-top:30px;display: flex;">
+      <span>涓汉璁颁簨鏈�</span>
+	   <div class="button-container" ></div>
+    <!--  <div class="button-container" >
           <el-button
             size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
+            style="background: #E0EEFE;
+            border-radius: 7px 7px 7px 7px;opacity: 1; margin-left: 20px;"
+            @click="handleEdit()"
+            v-if="isShow"
             v-hasPermi="['system:role:edit']"
-          >淇敼</el-button>
+          >缂栬緫</el-button>
+          <el-button v-if="isShow_2" size="mini"
+                     style=" width: 67px;height: 27px;background:#E0EEFE;
+            border-radius: 7px 7px 7px 7px;opacity: 1;margin-left: 20px; "@click="submitForm" :disabled="dsb">瀹屾垚</el-button>
+
           <el-button
             size="mini"
-            type="text"
+            style=" width: 67px;height: 27px;background: #D2F3E0;
+            border-radius: 7px 7px 7px 7px;opacity: 1;margin-left: 20px; "
+            @click="handleExport"
+            v-hasPermi="['family:note:export']"
+          >瀵煎嚭</el-button>
+
+          <el-button
+            size="mini"
+            style=" width: 67px;height: 27px;background: #FFDDE3;
+            border-radius: 7px 7px 7px 7px;opacity: 1; margin-left: 20px;"
+            v-print="'#printable-content'"
+            v-hasPermi="['family:note:export']"
+          >鎵撳嵃</el-button>
+      </div> -->
+      <div style="display: flex; align-items: center;">
+        <el-button size="mini" type="text" @click="toMemo" v-hasPermi="['person:information:memo']" style="margin-left: 20px">
+          <div class="form" ><el-icon  style="padding-right:100px;"></el-icon>
+          <span class="text" style="width: 69px;height: 26px;font-size: 16px;
+            font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">涓汉绠�鍘�</span></div>
+        </el-button>
+      </div>
+    </h1>
+    <el-divider />
+    <!--  鍒锋柊椤甸潰  -->
+    <el-form :model="queryParams1" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+
+      <el-form-item label="鏃堕棿" prop="happenTime">
+        <el-date-picker
+          v-model="dateRange"
+          style="width: 240px;
+                   height: 35px;
+                   border-radius: 16px 16px 16px 16px;
+                   opacity: 0.5;"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="寮�濮嬫棩鏈�"
+          end-placeholder="缁撴潫鏃ユ湡"
+          @keyup.enter.native="handleQuery"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="浜虹墿" prop="people">
+        <el-input
+          v-model="queryParams1.people"
+          placeholder="璇疯緭鍏ヤ汉鐗�"
+          clearable
+          style="width: 200px;
+                   height: 35px;
+                   border-radius: 16px 16px 16px 16px;
+                   opacity: 0.5;"
+          @keyup.enter.native="handleQuery">
+          <i slot="prefix" class="el-input__icon el-icon-search"></i>
+        </el-input>
+      </el-form-item>
+
+      <el-form-item label="鍦扮偣" prop="address">
+        <el-input
+          v-model="queryParams1.address"
+          placeholder="璇疯緭鍏ュ湴鐐�"
+          clearable
+          style="width: 200px;
+                   height: 35px;
+                   border-radius: 16px 16px 16px 16px;
+                   opacity: 0.5;"
+          @keyup.enter.native="handleQuery">
+          <i slot="prefix" class="el-input__icon el-icon-search"></i>
+        </el-input>
+      </el-form-item>
+      <el-form-item label="浜嬩欢鏍囬" prop="title">
+        <el-input
+          v-model="queryParams1.title"
+          placeholder="璇疯緭鍏ヤ簨浠舵爣棰�"
+          clearable
+          style="width: 200px;
+                   height: 35px;
+                   border-radius: 16px 16px 16px 16px;
+                   opacity: 0.5;"
+          @keyup.enter.native="handleQuery">
+          <i slot="prefix" class="el-input__icon el-icon-search"></i>
+        </el-input>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button size="mini" @click="handleQuery" style=" width: 67px;height: 27px;background: #FFDDE3;
+            border-radius: 7px 7px 7px 7px;opacity: 1; " >鎼滅储</el-button>
+        <el-button  size="mini" @click="resetQuery" style=" width: 67px;height: 27px;background: #FFDDE3;
+            border-radius: 7px 7px 7px 7px;opacity: 1; ">閲嶇疆</el-button>
+      </el-form-item>
+    </el-form>
+    <div>
+
+      <el-row :gutter="10" class="mb8" v-if="userId != 2">
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAdd1"
+            v-hasPermi="['system:role:add']"
+          >鏂板</el-button>
+        </el-col>
+
+        <el-col :span="1.5">
+          <el-button
+            type="danger"
+            plain
             icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
+            size="mini"
+            :disabled="multiple"
+            @click="handleDelete1"
             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-col>
+        <el-col :span="1.5">
+          <el-button
+            type="warning"
+            plain
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExportm"
+            v-hasPermi="['family:note:export']"
+          >瀵煎嚭</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="warning"
+            plain
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExportTemplate"
+            v-hasPermi="['family:note:export']"
+          >瀵煎叆妯℃澘涓嬭浇</el-button>
+        </el-col>
 
-          </el-dropdown>
+        <el-col :span="1.5" v-if="userId != 2">
+          <el-upload
+            action=""
+
+            class="upload-demo"
+            :show-file-list="false"
+            :http-request="handleEnportm"
+          >
+            <el-button size="mini"   type="primary"
+                       plain
+                  icon="el-icon-top" >瀵煎叆</el-button>
+
+          </el-upload>
+        </el-col>
+
+        <el-dropdown placement="鍒嗕韩鐩稿叧">
+            <el-button size="mini"   type="primary"
+                       plain
+                       icon="el-icon-top">鍒嗕韩鐩稿叧</el-button>
+             <template #dropdown>
+               <el-dropdown-menu>
+                 <el-dropdown-item     :disabled="multiple" icon="el-icon-top" style="height: 32px;width:240px;color: #0099ff;" @click.native="handleShare">鍒嗕韩</el-dropdown-item>
+
+        		          <el-dropdown-item    icon="el-icon-top" @click.native="whoShare">鍒嗕韩缁欐垜鐨勬暟鎹�</el-dropdown-item>
+        		      <el-dropdown-item    icon="el-icon-top" @click.native="handleWho">鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�</el-dropdown-item>
+                 <el-dropdown-item    icon="el-icon-top" @click.native="showData">灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-dropdown-item>
+               </el-dropdown-menu>
+             </template>
+        </el-dropdown>
+
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      </el-row>
+    </div>
+
+    <el-table v-loading="loading" border :data="noteList" :row-key="getRowId1" ref="multipleTable" @selection-change="handleSelectionChange"  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
+      <el-table-column type="selection" :reserve-selection="true" width="55"  align="center" />
+      <el-table-column fixed label="搴忓彿" sortable type="index" align="center" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/>
+
+      <el-table-column label="鏃堕棿" prop="happenTime" sortable :show-overflow-tooltip="true" width="150" align="center" >
+        <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template>
+      </el-table-column>
+      <el-table-column label="浜虹墿" prop="people" sortable :show-overflow-tooltip="true" width="150" align="center" >
+        <template slot-scope="scope">{{scope.row.people? scope.row.people: '鈥斺�斺�斺��'}}</template>
+      </el-table-column>
+      <el-table-column label="鍦扮偣" prop="address" sortable :show-overflow-tooltip="true" width="160" align="center" >
+        <template slot-scope="scope">{{scope.row.address? scope.row.address: '鈥斺�斺�斺��'}}</template>
+      </el-table-column>
+      <el-table-column label="浜嬩欢鏍囬" prop="title" sortable :show-overflow-tooltip="true" align="center">
+        <template slot-scope="scope">{{scope.row.title? scope.row.title: '鈥斺�斺�斺��'}}</template>
+      </el-table-column>
+      <el-table-column label="澶囨敞" prop="remark" sortable :show-overflow-tooltip="true" width="150" align="center">
+        <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template>
+      </el-table-column>
+      <el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="160" align="center">
+        <template slot-scope="scope" >
+          <div  @click="handleCheck1(scope.row)">
+            <img
+              class="el-upload-list__item-thumbnail"
+              src="../../assets/images/deviceLis.png"
+              alt=""
+              style="width: 35px; height: 35px;"
+              fit="cover"
+              v-if="!(scope.row.url === '' || scope.row.url === ',' || scope.row.url === null)"
+            >
+            <img
+              v-else
+              class="el-upload-list__item-thumbnail"
+              src="../../assets/images/deviceA.png"
+              alt=""
+              style="width: 35px; height: 35px;"
+              fit="cover"
+
+            ></div>
+        </template>
+      </el-table-column>
+
+      <!--      </el-table-column>-->
+      <el-table-column fixed="right" label="鎿嶄綔" align="center" width="250" class-name="small-padding fixed-width" v-if="userId != 2">
+        <template slot-scope="scope" v-if="scope.row.roleId !== 1">
+          <div class="button-container">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleUpdate1(scope.row)"
+              v-hasPermi="['system:role:edit']"
+            >
+              <span style="font-size: 14px;">淇敼</span>
+            </el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete1(scope.row)"
+              v-hasPermi="['system:role:remove']"
+            ><span style="font-size: 14px;">鍒犻櫎</span></el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-d-arrow-right"
+              @click="handleCheck1(scope.row)">
+              <span style="font-size: 14px;">鏌ョ湅璇︽儏</span></el-button>
+              <el-button
+                 size="mini"
+                  type="text"
+                 icon="el-icon-d-arrow-right"
+                  @click="handleShare(scope.row)">
+                <span style="font-size: 14px;">鍒嗕韩</span></el-button>
+          </div>
         </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-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="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">
-              <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>
-      <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-form>
-        </el-container>
-      </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-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-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>
-
-      </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="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>
 
     <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      v-show="totalm>0"
+      :total="totalm"
+      :page.sync="queryParams1.pageNum"
+      :limit.sync="queryParams1.pageSize"
+      style="background: #FEF7FC;"
       @pagination="getList"
     />
 
+    <!-- 娣诲姞涓汉璁颁簨鏈厤缃璇濇 -->
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
+
+        <el-form-item label="鏃堕棿" prop="happenTime">
+          <el-date-picker v-model="formDat.happenTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+                          :editable="false" :style="{width: '100%'}"  value-format="yyyy-MM-dd"
+          ></el-date-picker></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="title">
+          <el-input v-model="formDat.title" 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="#"
+          accept="image/jpeg, image/png,image/jpg, image/WMF,image/gif"
+          list-type="picture-card"
+          multiple
+          :http-request="requestUpload1m"
+          :file-list="fileList"
+          :on-change="handleChange"
+          :auto-upload="false"
+          ref="upload"
+        >
+          <i slot="default" class="el-icon-plus"></i>
+          <div slot="file" slot-scope="{ file }">
+            <template v-if="fileList">
+              <img
+                class="el-upload-list__item-thumbnail"
+                :src="file.url"
+                alt=""
+                style="width: 100%; height: 100%; object-fit: cover;"
+                fit="cover"
+                :preview-src-list="[file.url]"
+              >
+            </template>
+            <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>
+        <br>
+        <el-button
+                 style="margin-left: 10px"
+                 size="small"
+                 type="success"
+
+                 @click="picUpload"
+               >涓婁紶鍒版湇鍔″櫒</el-button>
+        <h4 class="form-header">鍏朵粬闄勪欢 </h4>
+
+
+        <el-upload
+          action=""
+          :file-list="fileListOther"
+          class="upload-demo"
+          multiple
+          ref="upload1"
+          :on-change="handleChange1"
+          :auto-upload="false"
+          list-type="picture-card"
+          :on-remove="handleRemove"
+          :http-request="requestUpload1m"
+          :show-file-list="true"
+        >
+
+        <i slot="default" class="el-icon-plus"></i>
+          <div slot="file" slot-scope="{file}">
+            <!-- 娣诲姞video鍏冪礌鐢ㄤ簬鏄剧ず瑙嗛 -->
+            <video
+              v-if="file.url.includes('.mp4')"
+              class="el-upload-list__item-thumbnail"
+              :src="file.url"
+              style="width: 147px; height: 147px"
+              fit="cover"></video>
+            <img v-else
+                 class="el-upload-list__item-thumbnail"
+                 src="../../assets/images/deviceLis.png"
+                 alt=""
+                 style="width: 100%; height: 100%"
+                 fit="cover"></img>
+
+            <span class="el-upload-list__item-actions">
+                 <span class="el-upload-list__item-name">{{ file.name }}</span>
+                      <span
+                        class="el-upload-list__item-preview"
+                        @click="handleFileCardPreview(file)"
+                      >
+                        <i class="el-icon-zoom-in"></i>
+                      </span>
+
+                      <span
+
+                        class="el-upload-list__item-delete"
+                        @click="handleRemoveFile(file)"
+                      >
+                        <i class="el-icon-delete"></i>
+                      </span>
+                </span>
+
+          </div>
+
+        </el-upload>
+        <br>
+        <el-button
+		          style="margin-left: 10px"
+		          size="small"
+		          type="success"
+		          @click="fileUpload"
+		      >涓婁紶鍒版湇鍔″櫒</el-button>
+      </el-form>
+      <h4 class="form-header"> </h4>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitDataScopem">淇� 瀛�</el-button>
+        <el-button @click="cancelDataPer">鍙� 娑�</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 鍒嗛厤瑙掕壊鏁版嵁鏉冮檺瀵硅瘽妗� -->
+    <el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
+
+    </el-dialog>
+
+<!--    <MyComponent :key="componentKey" />-->
+
+    <!--    鍩烘湰淇℃伅-->
+
+
+
+
+    <!-- 鍒嗕韩瀵硅瘽妗�1 -->
+    <el-dialog :title="title1" :visible.sync="open1" width="500px" append-to-body @close="handleClose2">
+
+    <el-table v-loading="loading1" :data="listRoot" :row-key="getRowId2" ref="table1"  @selection-change="handleSelectionChange1"  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
+          <el-table-column type="selection" width="55"  align="center" />
+          <el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams1.pageNum-1)*queryParams1.pageSize+1" width="130"/>
+      <!--    <el-table-column label="韬唤" prop="identity" sortable width="130" >
+            <template slot-scope="scope" >
+              <span v-if="scope.row.isMyFamily==1">绗瑊{scope.row.identity}}浠�</span>
+              <span v-else>鈥斺��</span>
+            </template>
+          </el-table-column> -->
+          <el-table-column label="濮撳悕" prop="nickName" sortable :show-overflow-tooltip="true" width="145" align="center"/>
+        </el-table>
+
+                <div slot="footer" class="dialog-footer">
+                  <el-button type="primary" @click="subShare">鍒� 浜�</el-button>
+                </div>
+
+    </el-dialog>
+
+    <!-- 鍒嗕韩瀵硅瘽妗�2 -->
+    <el-dialog :title="title2" :visible.sync="open2" width="85%" append-to-body @close="handleClose">
+      <div>
+      <el-select v-if="ifNum == 1"
+                v-model="user" id="userSelect"
+                placeholder="璇烽�夋嫨鍒嗕韩鐨勫璞�" clearable
+                 style="width: 240px;
+                 height: 35px;
+                 border-radius: 16px 16px 16px 16px;
+                 margin-bottom: 5px;
+                 opacity: 0.5;" filterable allow-create
+                 @change="selectValue">
+        <el-option v-for="item in userOptions"
+          :key="item.value" :label="item.label" :value="item.value"/>
+      </el-select>
+            </div>
+
+      <el-table v-loading="loading2" :data="shareList1" :row-key="getRowId3" ref="multipleTable"  @selection-change="handleSelectionChange2"  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
+            <el-table-column label="鏃堕棿" prop="happenTime" sortable :show-overflow-tooltip="true" width="150" align="center" >
+              <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template>
+            </el-table-column>
+            <el-table-column label="浜虹墿" prop="people" sortable :show-overflow-tooltip="true" width="150" align="center" >
+              <template slot-scope="scope">{{scope.row.people? scope.row.people: '鈥斺�斺�斺��'}}</template>
+            </el-table-column>
+            <el-table-column label="鍦扮偣" prop="address" sortable :show-overflow-tooltip="true" width="160" align="center" >
+              <template slot-scope="scope">{{scope.row.address? scope.row.address: '鈥斺�斺�斺��'}}</template>
+            </el-table-column>
+            <el-table-column label="浜嬩欢鏍囬" prop="title" sortable :show-overflow-tooltip="true" width="160" align="center">
+              <template slot-scope="scope">{{scope.row.title? scope.row.title: '鈥斺�斺�斺��'}}</template>
+            </el-table-column>
+            <el-table-column label="澶囨敞" prop="remark" sortable :show-overflow-tooltip="true" width="150" align="center">
+              <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template>
+            </el-table-column>
+              <el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="160" align="center">
+                   <template slot-scope="scope" >
+                     <div>
+                       <img
+                         class="el-upload-list__item-thumbnail"
+                         src="../../assets/images/deviceLis.png"
+                         alt=""
+                         style="width: 35px; height: 35px;"
+                         fit="cover"
+                         v-if="!(scope.row.url === '' || scope.row.url === ',' || scope.row.url === null)"
+                       >
+                       <img
+                         v-else
+                         class="el-upload-list__item-thumbnail"
+                         src="../../assets/images/deviceA.png"
+                         alt=""
+                         style="width: 35px; height: 35px;"
+                         fit="cover"
+
+                       ></div>
+                   </template>
+                </el-table-column>
+
+            <el-table-column label="鎿嶄綔" align="center" width="330" class-name="small-padding fixed-width" v-if="userId != 2">
+              <template slot-scope="scope" v-if="scope.row.roleId !== 1">
+                <div class="button-container">
+                <el-button
+                  v-if="ifNum == 2"
+                  size="mini"
+                  type="text"
+                  icon="el-icon-d-arrow-right"
+                  @click="handleDown(scope.row)">
+                  <span style="font-size: 14px;">涓嬭浇</span></el-button>
+                  <el-button
+                    v-if="ifNum == 1"
+                    size="mini"
+                    type="text"
+                    icon="el-icon-d-arrow-right"
+                    @click="handleBack(scope.row)">
+                    <span style="font-size: 14px;">鏀跺洖</span></el-button>
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-d-arrow-right"
+                  @click="handleCheck1(scope.row)">
+                  <span style="font-size: 14px;">鏌ョ湅璇︽儏</span></el-button>
+                </div>
+              </template>
+            </el-table-column>
+          </el-table>
+
+          <pagination
+            v-show="total1>0"
+            :total="total1"
+            :page.sync="queryParams2.pageNo"
+            :limit.sync="queryParams2.pageSize"
+            @pagination='fenYe'
+            style="background: #FEF7FC;"
+          />
+
+    </el-dialog>
 
   </div>
 </template>
@@ -379,24 +558,87 @@
 <script>
 import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
 import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
+import axios from 'axios';
+
+//鍦ˊ/api/self/index.js涓鍏ユ帴鍙e嚱鏁�  --鎺ュソ浜�
+import {
+  getIndividualList, addIndividual, updateIndividual, delIndividual,
+  listExperience, addExperience, updateExperience, delExperience,
+  getIndividualRelation, addRelation, updateRelation, delRelation,
+  getCertificateList, addCertificate, updateCertificate, delCertificate,
+  getAbroadList, addAbroad, updateAbroad, delAbroad, listType,
+  getAutobiographyList, getAutobiographyTermList, addAutobiography, updateAutobiography,delAutobiography,
+  getCategory,download,
+
+} from "@/api/self/index";
+import {listUserAll} from "@/api/root/index";
+// import { listRole, getRole, delRole, addRole, updateRole, dataScope,changeRoleStatus, deptTreeSelect } from "@/api/system/role";
+// import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
+
+//瀵煎叆鎺ュ彛鍑芥暟
+import {listNote,enload,getNote, addNote,updateNote, delNote,uploadPic,
+        share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData
+} from "@/api/memo/index";
+import {showShareUser} from "@/api/bignote/index";
+import {getAllInfo} from "@/api/system/user"
+import {getInfo} from "@/api/login";
+import { Notification, MessageBox, Message, Loading } from 'element-ui'
+//import { delFamilyevent, uploadPic } from '../../api/bignote'
+import { blobValidate } from '../../utils/ruoyi'
 
 
 
-//鍦╯ystem/note/index.js涓鍏ユ帴鍙e嚱鏁�  --鎺ュソ浜�
-import {getIndividualList, getIndividualRelation, delIndividual, updateIndividual, addIndividual,listExperience,updateExperience,
-  addExperience,delExperience} from "@/api/self/index";
 export default {
-  name: "show",
+  name: "Self",
   dicts: ['sys_normal_disable'],
+
   data() {
     return {
+      // 鍒嗕韩缁欒皝鐨刲ist
+      listRoot: [],
+      open1:false,
+      open2:false,
+      id1: undefined,
+      shareList1: [],
+      // shareList2: [],
+      userOptions:[],
+      user:undefined,
+      userList:[],
+      ifNum:undefined,
+      selectWho:undefined,
+      title1: "",
+      title2: "",
+      loading1: false,
+      loading2: false,
+      // 鏌ヨ鍙傛暟1
+      queryParams1: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+      queryParams2: {
+        pageNo: 1,
+        pageSize: 10,
+      },
+      ids1: [],
+      single1: true,
+      multiple1: true,
+      dateRange1: [],
+
+      userId: undefined,
+	    uploadFileList: [],
+      uploadFileList1: [],
       // 閬僵灞�
       disabled: false,
 
       loading: true,
       formData:[],
+      componentKey: 0,
       // 閫変腑鏁扮粍
       ids: [],
+      //鎬у埆
+      inds:undefined,
+      //濠氬Щ绫诲埆
+      mrs:undefined,
       // 闈炲崟涓鐢�
       single: true,
       // 闈炲涓鐢�
@@ -405,18 +647,37 @@
       showSearch: true,
       // 鎬绘潯鏁�
       total: 0,
+      total1: 0,
+      totalm: 0,
+      //澶村儚涓婁紶
+      showBtnDealImg:true,
+      noneBtnImg:false,
+      //涓婁紶鍥剧墖鐨勬渶澶ф暟閲�
+      limitCountImg:1,
       //涓汉淇℃伅鏁版嵁
       individualList:[],
-      // 涓汉缁忓巻鏁版嵁
-      experienceList: [],
-      //瀹跺涵鎴愬憳鍏崇郴鏁版嵁
-      relationList:[],
+      isEditing: false,
+      fit:['cover'],
+  
+   
+      //涓嶅悓鏃舵涓汉鑷紶
+      // AutobiographyTermList:[],
+      // // 璁块棶鍚庡彴鐨勬暟鎹�
+      // query: {
+      //   current: 1,
+      //   termId: "",
+      // },
+      // // 鍚庡彴杩斿洖鐨勬暟鎹�
+      // AutobiographyTermList: {
+      //   rows: [{}],
+      // },
+      // current: 0,
 
+ 
       // 寮瑰嚭灞傛爣棰�
       title: "",
-      // 鏄惁鏄剧ず寮瑰嚭灞�
-      open: false,
-      // open:true,
+
+       open:false,
       // 鏄惁鏄剧ず寮瑰嚭灞傦紙鏁版嵁鏉冮檺锛�
       openDataScope: false,
       menuExpand: false,
@@ -426,17 +687,18 @@
       // 鏃ユ湡鑼冨洿
       dateRange: [],
       // 鏁版嵁鑼冨洿閫夐」
-      fot:[".jpg",".jif"],
-      fileList:[
-      ],
-      fileListOther:[
+     // 鏁版嵁鑼冨洿閫夐」
+     fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+       '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.M4A'],
 
-      ],
+      fileList1:[],
+      fileList:[],
+      fileListOther:[],
       dsb:true,
       btn:false,
-      //涓汉鑷紶
-      activeName: 'second',
-
+      isShow:true,
+      isShow_2:false,
+      isEdit1:false,
       formDat: {
         //涓汉鍩烘湰淇℃伅
         nickName:undefined,
@@ -460,26 +722,55 @@
         fatherId:undefined,
         momId:undefined,
         birth:undefined,
+        familyId:undefined,
+        url: '',
 
         //涓昏瀛︿範鍙婂伐浣滅粡鍘�
         id:undefined,
         userId:undefined,
         startDate:undefined,
+        endDate:undefined,
         content:undefined,
         witness:undefined,
         remark: undefined,
         //瀹跺涵鎴愬憳鍙婁富瑕佺ぞ浼氬叧绯绘儏鍐�
-
         relation:undefined,
+        otherName:undefined,
+        otherUnit:undefined,
+        otherPosition:undefined,
+        otherPolitical:undefined,
+        //鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐�
+        type:undefined,
+        cerName:undefined,
+        validityDate:undefined,
+        ownStatus:undefined,
+        //鍑哄浗锛堝锛夋儏鍐�
+        destination:undefined,
+        startTime:undefined,
+        endTime:undefined,
+        cause:undefined,
 
+        //鑷紶
+        ageBegin:undefined,
+        ageEnd:undefined,
+        term:undefined,
 
-        //
-        url: undefined,
       },
       // 鑿滃崟鍒楄〃
       menuOptions: [],
       // 閮ㄩ棬鍒楄〃
       deptOptions: [],
+      queryParams1: {
+        pageNum: 1,
+        pageSize: 10,
+        happenTime:undefined,
+        people:undefined,
+        address:undefined,
+        title:undefined,
+        remark:undefined
+      },
+      // 涓汉璁颁簨鏈〃鏍兼暟鎹�
+      noteList: [],
       // 鏌ヨ鍙傛暟
       queryParams: {
         pageNum: 1,
@@ -496,6 +787,21 @@
       },
       // 琛ㄥ崟鏍¢獙
       rules: {
+        happenTime: [{
+          required: true,
+          message: '璇烽�夋嫨鏃堕棿',
+          trigger: 'blur'
+        }],
+        people: [{
+          required: true,
+          message: '璇疯緭鍏ヤ汉鐗�',
+          trigger: 'blur'
+        }],
+        title: [{
+          required: true,
+          message: '璇疯緭鍏ヤ簨浠舵爣棰�',
+          trigger: 'blur'
+        }],
         //鍩烘湰淇℃伅
         nickName: [{
           // required: true,
@@ -519,7 +825,7 @@
         }],
         maritalStatus: [{
           // required: true,
-          message: '璇疯緭鍏ユ皯鏃�',
+          message: '璇疯緭鍏ュ濮荤姸鍐�',
           trigger: 'blur'
         }],
         locationAddress: [{
@@ -559,9 +865,14 @@
           message: '璇疯緭鍏ヨ捣濮嬫棩鏈�',
           trigger: 'blur'
         }],
+        endDate: [{
+          // required: true,
+          message: '璇疯緭鍏ョ粨鏉熸棩鏈�',
+          trigger: 'blur'
+        }],
         content: [{
           required: true,
-          message: '璇疯緭鍏ヤ富瑕佸涔犵粡鍘嗐�佸伐浣滃崟浣嶅強浠昏亴鎯呭喌',
+          message: '璇疯緭鍏ユ枃鏈�',
           trigger: 'blur'
         }],
         witness: [{
@@ -569,71 +880,469 @@
           message: '璇疯緭鍏ヨ瘉鏄庝汉',
           trigger: 'blur'
         }],
+        //鑷紶
+        term: [{
+          required: true,
+          message: '璇疯緭鍏ユ椂鏈�',
+          trigger: 'blur'
+        }],
+        ageBegin: [{
+          required: true,
+          message: '',
+          trigger: 'blur'
+        }],
+        ageEnd: [{
+          required: true,
+          message: '',
+          trigger: 'blur'
+        }],
+
+        relation: [{
+          required: true,
+          message: '璇疯緭鍏ュ叧绯�',
+          trigger: 'blur'
+        }],
+        otherName: [{
+          required: true,
+          message: '璇疯緭鍏ュ鍚�',
+          trigger: 'blur'
+        }],
+        otherUnit: [{
+          required: true,
+          message: '璇疯緭鍏ュ崟浣�',
+          trigger: 'blur'
+        }],
+        otherPosition: [{
+          required: true,
+          message: '璇疯緭鍏ヨ亴鍔�',
+          trigger: 'blur'
+        }],
+        otherPolitical: [{
+          required: true,
+          message: '璇疯緭鍏ユ斂娌婚潰璨�',
+          trigger: 'blur'
+        }],
+
+        cerName: [{
+          required: true,
+          message: '璇疯緭鍏ヨ瘉浠跺悕绉�',
+          trigger: 'blur'
+        }],
+        type: [{
+          required: true,
+          message: '璇疯緭鍏ヨ瘉浠剁被鍨�',
+          trigger: 'blur'
+        }],
+        ownStatus: [{
+          required: true,
+          message: '璇疯緭鍏ユ寔鏈夋儏鍐�',
+          trigger: 'blur'
+        }],
+        idNo: [{
+          required: true,
+          message: '璇疯緭鍏ヨ瘉浠跺彿鐮�',
+          trigger: 'blur'
+        }],
+
+        startTime: [{
+          required: true,
+          message: '璇疯緭鍏ュ紑濮嬫椂闂�',
+          trigger: 'blur'
+        }],
+        endTime: [{
+          required: true,
+          message: '璇疯緭鍏ョ粨鏉熸椂闂�',
+          trigger: 'blur'
+        }],
+        destination: [{
+          required: true,
+          message: '璇疯緭鍏ユ墍鍒板湴鍖�',
+          trigger: 'blur'
+        }],
+        cause: [{
+          required: true,
+          message: '璇疯緭鍏ヤ簨鐢�',
+          trigger: 'blur'
+        }]
 
       },
-      typeOptions: [],
+      selectedOption:'',
+      typeOptions:[],
+      typeOption:[],
+      newOption: undefined,
+      showInput: true
     };
   },
   created() {
+	this.getInfo()
     this.getList();
-    //   this.getCateInfor()
-
+	this.getList1();
   },
   methods: {
-    // 鍙栨秷鎸夐挳
-    cancelData() {
-      this.open = false;
-      this.reset();
+    // 鍒嗛〉
+    fenYe(){
+      // @pagination='ifNum === 1 ? selectValue : (ifNum === 2 ? whoShare : showData)'
+      if(this.ifNum === 1){
+        this.selectValue(this.selectWho)
+      }else if(this.ifNum === 2){
+        this.whoShare()
+      }else{
+        this.showData()
+      }
     },
-    //缂栬緫鎸夐挳
-    edit(row){
-      const id= row.id;
-      this.reset();
-      // this.$router.push('/self/self/edit')
-      this.title='缂栬緫涓汉淇℃伅';
-      this.$router.push('/family2/self/edit/' + id);
+    // 鍏抽棴寮圭獥鍚�
+    handleClose(){
+      this.user = ''
+      this.queryParams2.pageNo = 1
+            this.total1 = 0
     },
-    //涓汉鑷紶
-    handleClick(tab, event) {
-      console.log(tab, event);
+	
+	getInfo(){
+	      console.log('-----------------')
+	      getInfo().then(response=>{
+	        console.log(response.user.roles[0].roleId,'roleID')
+	        this.userId = response.user.roles[0].roleId
+	      })
+	    },
+	
+    handleClose2(){
+      this.$refs.table1.clearSelection()
+    },
+ getList1() {
+          this.loading1 = true;
+          		  let userId = this.$store.state.user.userId
+          		 this.userOptions = []
+          		  
+          		  showShareUser(userId, 2010).then(response=>{
+          			  console.log("===========ddddddddddddd")
+          			  console.log(response.data)
+          			  console.log("--------------------")
+          			  response.data.forEach(element =>{
+          				   this.userOptions.push({label: element.oldName,value: element.userId})
+          			  })
+          		  })
+          //         this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
+          //         this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
+          		// //  alert(this.$store.state.user.clanId)
+          		//       this.listRoot = []
+          		 let clanId = this.$store.state.user.clanId
+				  if(clanId!=null){
+                  getAllInfo(clanId).then(response => {
+                      this.listRoot = response.data;
+                      const kon = {}
+          			         console.log(response.data,'userListuserListuserList99999999999999')
+                      this.listRoot.forEach(element => {
+                        kon[element['nickName']] = element['userId']
+                      })
+                      // for(let i in kon){
+                      //   this.userOptions.push({label: i,value: kon[i]})
+                      // }
+                      // for(let i in this.userOptions){
+                      //   this.userList.push(this.userOptions[i].value)
+                      // }
+                      // console.log(this.userList,'userListuserListuserList99999999999999')
+                      this.loading1 = false;
+                    }
+                  );
+				  }
+          },
+    // 涓嬭浇浠栦汉缁欐垜鍒嗕韩鐨勬暟鎹�
+    handleDown(row){
+      const a = {"downloadContent" : row.id}
+      downShareData(a).then(() => {
+        Message({ message: "涓嬭浇鎴愬姛", type: 'success' })
+      })
     },
 
+    // 鏀跺洖鍒嗕韩缁欏埆浜虹殑鏁版嵁
+    handleBack(row){
+      // 鍒嗕韩缁欒皝鐨勶細this.selectWho
+      const list = {"shareIds": [this.selectWho],"shareContents": [row.id]}
+      deleteShareData(list).then(()=>{
+        Message({ message: "鏀跺洖鎴愬姛", type: 'success' })
+
+        const list2 = {"shareIds": [this.selectWho]}
+        shareToWho(list2,this.queryParams2).then(response => {
+          this.shareList1 = response.data.data
+          this.total1 = response.data.total;
+        })
+      })
+    },
+    // 灞曠ず涓嬭浇鐨勫垎浜暟鎹�
+    showData(){
+      this.shareList1 = []
+      this.ifNum = 3
+      this.open2 = true
+      this.title2 = "涓嬭浇鐨勫垎浜暟鎹�";
+      showShareData(this.queryParams2).then(response => {
+        this.shareList1 = response.data.data
+        this.total1 = response.data.total;
+        // console.log(response,'灞曠ず涓嬭浇鐨勫垎浜暟鎹睍绀轰笅杞界殑鍒嗕韩鏁版嵁')
+      })
+    },
+    // 灞曠ず鍒嗕韩缁欐垜鐨勬暟鎹�
+    whoShare(){
+      this.shareList1 = []
+      this.ifNum = 2
+      this.open2 = true
+      this.title2 = "鍒嗕韩缁欐垜鐨勬暟鎹�";
+      // const list = {"shareId": this.userList}
+      // const list = {"shareId": 111}
+      getWhoShare(this.queryParams2).then(response => {
+        const data = response.data.data
+        this.total1 = response.data.total
+        console.log(response,'灞曠ず鍒嗕韩缁欐垜鐨勬暟鎹睍绀哄垎浜粰鎴戠殑鏁版嵁s')
+        for(let i in data){
+          console.log(i,'灞曠ず鍒嗕韩缁欐垜鐨勬暟鎹睍绀哄垎浜粰鎴戠殑鏁版嵁')
+          this.shareList1.push(data[i])
+        }
+      })
+    },
+
+    // 鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�
+    selectValue(value){
+      this.selectWho = value
+      this.shareList1 = []
+      const list = {"shareIds": [this.selectWho]}
+      shareToWho(list,this.queryParams2).then(response => {
+        // this.loading2 = true;
+        response.data.data.forEach(res=>{
+          if(res){
+            this.shareList1.push(res)
+          }
+        })
+        // this.shareList1 = response.data.data
+        this.total1 = response.data.total;
+        // this.loading2 = false;
+        console.log(response.data,'鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹垎浜粰璋佷簡浠�涔堟暟鎹�')
+      })
+    },
+    handleWho(){
+      this.ifNum = 1
+      this.open2 = true
+      this.title2 = "鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�";
+      this.shareList1 = []
+    },
+
+    /** 鍒嗕韩鎿嶄綔 */
+    handleShare(row) {
+      if(row.id){
+        this.id1 = [row.id]
+      }
+      this.open1 = true;
+      this.title1 = "鍒嗕韩";
+    },
+    // 澶氶�夋閫変腑鏁版嵁
+    handleSelectionChange1(selection) {
+      this.ids1 = selection.map(item => item.userId)
+      this.single1 = selection.length!=1
+      this.multiple1 = !selection.length
+    },
+    // 澶氶�夋閫変腑鏁版嵁
+    handleSelectionChange2(selection) {
+      // this.ids1 = selection.map(item => item.userId)
+      // // console.log(selection)
+      // console.log(this.ids1,'ids1ids1ids1ids1')
+      // this.single1 = selection.length!=1
+      // this.multiple1 = !selection.length
+    },
+    getRowId1(row)
+    {
+      return row.id
+    },
+    getRowId2(row)
+    {
+      return row.id
+    },
+    getRowId3(row)
+    {
+      return row.id
+    },
+ 
+    // 纭鍒嗕韩
+    subShare(row) {
+      const shareList = {}
+      shareList.shareContents = this.id1 || this.ids;
+      shareList.shareIds = this.ids1
+      console.log(shareList,'sharelistsharelist')
+      this.$modal.confirm('鏄惁纭鍒嗕韩锛�').then(function() {
+        return share(shareList);
+      }).then(() => {
+this.getList1();
+        this.getList();
+        this.$modal.msgSuccess("鍒嗕韩鎴愬姛");
+        this.id1 = undefined
+        this.open1 = false;
+      }).catch(() => {});
+    },
+    // ------------------------------------------------------------------
+
+ 
+    handleRemoveFile(file) {
+      for(let i = 0; i < this.fileListOther.length; i++)
+      {
+        if(this.fileListOther[i].url==file.url)
+    {
+          this.$delete(this.fileListOther,i);
+      this.$delete(this.uploadFileList1,i);
+      }
+      }
+    },
+    handleRemove(file) {
+      for(let i = 0; i < this.fileList.length; i++)
+      {
+        if(this.fileList[i].url==file.url)
+      {
+          this.$delete(this.fileList,i);
+    		 this.$delete(this.uploadFileList,i);
+    		 }
+      }
+     },
+
+	fileUpload(){
+	//	var file = params.file;
+
+		var formData = new FormData();
+		this.$refs.upload1.submit();
+		// formData.append('uploadFile', file);
+		if(this.uploadFileList1.length==0){
+			  this.$modal.msgSuccess("鏂囨。涓婁紶鍒楄〃涓嶈兘涓虹┖!");
+			  return
+		}
+		this.uploadFileList1.forEach((elem)=>{
+			formData.append("files", elem)
+
+		})
+
+		let _this = this
+
+		this.uploading = true;
+		uploadPic(formData).then(response => {
+		_this.uploadFileList1 = []
+		_this.formDat.url = _this.formDat.url+","+response.fileNames
+		_this.$modal.msgSuccess("鏂囦欢涓婁紶鎴愬姛!");
+		  })
+
+	},
+
+	picUpload()
+	{
+		var formData = new FormData();
+		//alert(976)
+		//this.$refs.upload.submit();
+		//alert(8)
+		//alert(this.uploadFileList.length)
+	if(this.uploadFileList.length==0){
+		  this.$modal.msgSuccess("鍥剧墖涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
+		  return}
+	//console.log(this.uploadFileList)
+  // alert(this.uploadFileList)
+		this.uploadFileList.forEach((elem)=>{
+			formData.append("files", elem)
+
+		})
+		//alert(90)
+		let _this = this
+		//alert(9)
+	    uploadPic(formData).then(response => {
+			// console.log(response,'123123123')
+   //            console.log(_this.formDat.url,'666')
+	      _this.formDat.url = _this.formDat.url+","+response.fileNames
+
+		  	 // alert(_this.formDat.url)
+		  _this.uploadFileList = []
+		  _this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
+
+	  });
+	},
+
+    handleChange(file, fileList1) {
+       //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
+
+     // this.uploadFileList.push(file.raw);
+      console.log("=========5555=========")
+      console.log(file)
+    //  console.log(this.uploadFileList)
+    //  this.fileList = fileList
+    //alert(file)
+        this.uploadFileList.push(file.raw);
+         this.fileList.push({name:file.name,url:file.url})
+    //alert(fileList1.length)
+    },
+    handleChange1(file, fileOtherList1) {
+       //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
+    this.uploadFileList1.push(file.raw);
+     this.fileListOther.push({name:file.name,url:file.url})
+     // this.uploadFileList.push(file.raw);
+      console.log("=========5555=========")
+      //console.log(file)
+    //  console.log(this.uploadFileList)
+    //  this.fileList = fileList
+    },
+
+
+
+
+    //闅旇鍙樿壊
+    tableRowClassName({row, rowIndex}) {
+      if (rowIndex % 2 == 0) {
+        return "statistics-warning-row";
+      } else {
+        return "statistics-warning-row1";
+      }
+      return '';
+    },
+    //璇佷欢绫诲埆
+    getSrc(type) {
+      if (type === '鎶ょ収'){
+        return '鎶ょ収'
+      }else if(type === '閫氳璇�'){
+        return '閫氳璇�'
+      }else if(type === '韬唤璇�'){
+        return '韬唤璇�'
+      }else {
+        return '鈥斺�斺�斺�斺�斺��'
+      }
+    },
+//绫诲埆
+    addNewOption() {
+      const newOption = this.newOption.trim();
+      if (newOption && !this.typeOption.includes(newOption)) {
+        this.typeOption.push(newOption);
+        this.$set(this.formDat, 'type', newOption); // 鏇存柊formDat.type鐨勫�间负鏂扮殑閫夐」
+      }
+    },
     /** 鏌ヨ瑙掕壊鍒楄〃 */
-    //鍒楄〃鏄剧ず瀹跺ぇ浜嬭
-
     getList() {
       this.loading = true;
+      this.queryParams1.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
+      this.queryParams1.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
       // console.log(this.queryParams)
       //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-      listExperience(this.queryParams).then(response => {
-          //  alert(123)
+      listNote(this.queryParams1).then(response => {
+         // alert(321)
           //   console.log(response.data)
-          this.experienceList = response.data.data;
+          this.noteList = response.data.data;
 
-          this.total = response.data.total;
+          this.totalm = response.data.total;
           this.loading = false;
         }
       );
-      getIndividualRelation(this.queryParams).then(response => {
-          //  alert(123)
-          //   console.log(response.data)
-          this.relationList = response.data.data;
+	  let _this = this
+  getIndividualList(this.queryParams).then(response => {
+       //  alert(123)
+       //   console.log(response.data)
+       _this.individualList = 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.data;
-
-          this.total = response.data.total;
-          this.loading = false;
-        }
-      );
+       // this.total = response.data.total;
+       _this.loading = false;
+     }
+   );
 
     },
+
+
+    //鍥剧墖鐨勪笂浼犲強涓婁紶鎸夐挳闅愯棌
 
     // 鍙栨秷鎸夐挳
     cancel() {
@@ -645,9 +1354,10 @@
       this.openDataScope = false;
       this.reset();
     },
+
     // 琛ㄥ崟閲嶇疆
     reset() {
-      if (this.$refs.menu != undefined) {
+      if (this.$refs.menu !== undefined) {
         this.$refs.menu.setCheckedKeys([]);
       }
       this.menuExpand = false,
@@ -666,7 +1376,7 @@
           deptCheckStrictly: true,
           remark: undefined
         };
-      this.resetForm("form");
+      this.resetForm("elForm");
     },
     /** 鎼滅储鎸夐挳鎿嶄綔 */
     handleQuery() {
@@ -686,19 +1396,154 @@
       this.single = selection.length!=1
       this.multiple = !selection.length
     },
-
-    /** 鏂板鎸夐挳鎿嶄綔 */
-    handleAdd() {
+/** 鏂板鎸夐挳鎿嶄綔 */
+    handleAdd1() {
       this.reset();
       this.open = true;
-      this.title = "娣诲姞瀹跺涵澶т簨璁颁俊鎭�";
+      this.title = "娣诲姞涓汉璁颁簨鏈缁嗕俊鎭�";
+    },
+    /** 鏌ョ湅璇︾粏淇℃伅 */
+    handleCheck1(row){
+      const id = row.id;
+	  this.open2 = false; 
+      this.$router.push("/self/self/memoInfo/" + id);
+    },
+    /** 淇敼鎸夐挳鎿嶄綔 */
+    handleUpdate1(row) {
+      const id = row.id;
+      let jd = true
+
+      this.$router.push({
+        path:"/self/self/memoInfo/" + id,
+        query:{
+          detail:jd
+        }
+      });
+    },
+    requestUploadm(params)
+    {
+      var file = params.file;
+      var formData = new FormData();
+      formData.append('files', file);
+      let _this = this
+      this.uploading = true;
+      uploadPic(formData).then(response => {
+        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
+        this.uploading = false;
+        this.$modal.msgSuccess("涓婁紶鎴愬姛");
+        if(_this.fot.includes(pth) === true)
+        {
+          _this.fileList.push({name:response.fileNames, "url":response.data.url})
+        }
+      })
+    },
+    requestUpload1m(params)
+    {
+      var file = params.file;
+      var formData = new FormData();
+      formData.append('files', file);
+      let _this = this
+      this.uploading1 = true;
+      uploadPic(formData).then(response => {
+        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
+        this.uploading1 = false;
+        this.$modal.msgSuccess("涓婁紶鎴愬姛");
+        if(_this.fot.includes(pth) !== true)
+        {
+          _this.fileListOther.push({name:response.fileNames, url:response.data.url})
+        }
+      })
     },
 
+    /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+    handleExportm() {
+      const Ids = this.ids;
+
+      if(Ids.length==0)
+      {
+        this.download('/zSelfNote/export', {
+          ...this.queryParams
+        }, `zSelfNote${new Date().getTime()}.xlsx`)
+      }else{
+        this.download('/zSelfNote/export1/'+Ids, {
+
+        }, `zSelfNote${new Date().getTime()}.xlsx`)
+      }
+    },
+
+    handleExportTemplate(){
+      this.download('/zSelfNote/model', {
+
+      }, `zSelfNote_${new Date().getTime()}.xlsx`)
+    },
+    /** 瀵煎叆鎿嶄綔*/
+    handleEnportm(params){
+      var file = params.file;
+      var formData = new FormData();
+      formData.append('excelImport', file);
+      let _this = this
+
+      enload(formData).then(response => {
+        _this.getList();
+        Message({ message: "瀵煎叆鎴愬姛", type: 'warning' })
+
+      }).catch(() => { Message({ message: "瀵煎叆澶辫触", type: 'error' })});
+
+    },
+    /** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
+    submitDataScopem: 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) {
+
+          addNote(this.formDat).then(response => {
+            console.log(this.formDat)
+            this.$modal.msgSuccess("鏂板鎴愬姛");
+            this.getList();
+            this.open = false;
+            // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
+            Object.keys(this.formDat).forEach(key => {
+              this.formDat[key] = '';
+            });
+            for(let i = 0; i <= this.fileList.length; i++)
+            {
+              this.handleRemove(this.fileList[0]);
+            }
+            for(let i = 0; i < this.fileListOther.length; i++){
+              this.handleRemoveFile(this.fileListOther[0]);
+            }
+            this.getList();
+          });
+        }
+      });
+    },
+   /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+    handleDelete1(row) {
+      const Ids = row.id || this.ids;
+      this.$modal.confirm('鏄惁纭鍒犻櫎鏁版嵁椤癸紵').then(function() {
+        return delNote(Ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+      }).catch(() => {});
+    },
+    //涓汉璁颁簨鏈�
+    toMemo(){
+      this.$router.push("/self/self/memo/" + this.individualList.userId);
+    },
 
     /** 鏌ョ湅璇︾粏淇℃伅 */
     handleCheck(row){
       const id = row.id;
-      this.$router.push("/family1/bignote/familyeventInfo/" + id);
+	  
+      this.$router.push("/self/self/edit/" + id);
     },
     /** 淇敼鎸夐挳鎿嶄綔 */
     handleUpdate(row) {
@@ -706,79 +1551,108 @@
       let jd = true
 
       this.$router.push({
-        path:"/self/self/edit" + id,
+        path:"/self/self/edit/" + id,
         query:{
           detail:jd
         }
       });
     },
 
-
     handlePictureCardPreview(file) {
       this.dialogImageUrl = file.url;
       this.dialogVisible = true;
     },
-    /** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
-    submitDataScope: function() {
+    //鐐瑰嚮涓嬭浇鍑芥暟
+    handleDownload(url) {
+      var formData = {'path':"/"+url.replace(process.env.VUE_APP_BASE_TRUE_API,"")};
 
-      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})
-
-        }
+      let lens = formData.path.split(".")
+      let suffix = lens[lens.length-1]
+      download(formData).then(async (response) => {
+        const isLogin = await blobValidate(response);
+        let nt = new Date().getTime()
+        let filename = 'selfevent_'+nt+'.'+suffix
+        const blob = new Blob([response])
+        saveAs(blob, filename)
       })
+    },
+	cancelDataPer()
+	{
+		this.open = false;
 
-    },
-    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
-    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`)
-    }
+		// alert(123)
+		// alert(this.open)
+	},
+
+   
+
+
   }
 };
 </script>
 
+<style scoped="">
+/*.uoloadSty {*/
+/*  width:110px;*/
+/*  height:110px;*/
+/*  line-height:110px;*/
+/*}*/
+/*.disUoloadSty {*/
+/*  display:none;   !* 涓婁紶鎸夐挳闅愯棌 *!*/
+/*}*/
+.app-container{
+  background-color: #FEF7FC;
+}
+
+.el-icon-top {
+  background: no-repeat center url("../../assets/icons/top.png");
+}
+
+.el-table__row.statistics-warning-row {
+  background: #E0EEFE;
+}
+.el-table__row.statistics-warning-row1 {
+  background: #FFEFF2;
+}
+.el-collapse-item__header {
+  background-color:#FEF7FC;
+  width: 100%;
+}
+.title-wrapper {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  width: calc(100% - 50px);
+}
+.left-content {
+  width: 100%;
+}
+.btn_autobiography{
+  background:center no-repeat url('../../assets/icons/add1.png') ;
+  margin-left: 76vw;
+}
+.btn_edit{
+  background:center no-repeat url('../../assets/icons/edit.png') ;
+}
+.btn_del{
+  background:center no-repeat url('../../assets/images/鍒犻櫎2.png') ;
+}
+.button-container {
+  text-align: right;
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+  flex-grow: 1;
+}
+.button {
+  background:center no-repeat url('../../assets/icons/add1.png') ;
+  /*margin-right: -10px ;*/
+  flex-shrink: 0;
+  width: 30px;
+  height: 28px;
+}
+.form{
+  background:center/11% no-repeat url('../../assets/icons/form.png') ;
+
+}
+</style>

--
Gitblit v1.9.1