From bd40473c9c634005bc7e62e7fc901bcd8b598fa0 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期五, 02 二月 2024 15:20:26 +0800
Subject: [PATCH] 提交了修改

---
 ruoyi-ui/src/views/self/show.vue |  837 ++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 488 insertions(+), 349 deletions(-)

diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index 0a16e7e..ec4ab2b 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -1,7 +1,5 @@
 <template>
-  <div class="app-container" id="printable-content">
-    <!--  鍒锋柊椤甸潰  -->
-<!--    <MyComponent :key="componentKey" />-->
+  <div class="app-container">
     <!--    鍥炲埌椤堕儴-->
     <el-backtop :bottom="150" :right="30">
       <el-button type="primary" circle
@@ -48,202 +46,325 @@
       </div>
     </h1>
     <el-divider />
-    <!--    鍩烘湰淇℃伅-->
-    <h2 style="font-size:16px">鍩烘湰淇℃伅</h2>
-    <el-container>
-      <div >
-        <el-container >
-          <el-col >
-            <el-form ref="elForm" :model="individualList" :rules="rules" size="medium"  label-position="left"
-                     v-loading="loading" :data="individualList" @selection-change="handleSelectionChange" >
-              <el-row :span="6">
-                <el-form-item label="濮撳悕" prop="nickName" label-width="40px">
-                  <el-input v-model="individualList.nickName" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
-                  </el-input>
-                </el-form-item>
-              </el-row>
-              <el-row :span="6">
-                <el-form-item label="鏇剧敤鍚�" prop="oldName" label-width="60px">
-                  <el-input v-model="individualList.oldName" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
-                  </el-input>
-                </el-form-item>
-              </el-row>
-              <el-row :span="6">
-                <el-form-item label="韬唤璇佸彿" prop="idNum" label-width="70px">
-                  <el-input v-model="individualList.idNum" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
-                  </el-input>
-                </el-form-item>
-              </el-row>
-            </el-form>
-          </el-col>
-        </el-container>
-      </div>
-      <div style="padding-left:60px">
-        <el-container>
-          <el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
-            <el-form ref="elForm" :model="individualList" :rules="rules" size="medium"  label-position="left">
-              <el-row :span="5">
-                <el-form-item label="鎬у埆" prop="sex" label-width="40px">
-<!--                  <el-input v-model="individualList.sex === 1 ? '鐢�':'濂�' " placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">-->
-<!--                  </el-input>-->
-                  <template v-if="!isEditing">
-                    <el-input v-model="individualList.sex === 1 ? inds='鐢�':inds='濂�'" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
-                  </template>
-                  <template v-else>
-                    <el-select v-model="inds" placeholder="璇烽�夋嫨鎬у埆" clearable :style="{width: '100%'}" :disabled="dsb">
-                      <el-option label="鐢�" value='1'></el-option>
-                      <el-option label="濂�" value='0'></el-option>
-                    </el-select>
-                  </template>
-                </el-form-item>
-              </el-row>
-              <el-row :span="5">
-                <el-form-item label="姘戞棌" prop="nation"label-width="40px">
-                  <el-input v-model="individualList.nation" placeholder="" clearable :style="{width: '100%'}":disabled="dsb">
-                  </el-input>
-                </el-form-item>
-              </el-row>
-              <el-row :span="5">
-                <el-form-item label="鑱旂郴鏂瑰紡" prop="phoneNumber" label-width="70px">
-                  <el-input v-model="individualList.phoneNumber" placeholder="" clearable :style="{width: '100%'}":disabled="dsb">
-                  </el-input>
-                </el-form-item>
-              </el-row>
-            </el-form>
-          </el-col>
-        </el-container>
-      </div>
-      <div style="padding-left:60px">
-        <el-container>
-          <el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
-            <el-form ref="elForm" :model="individualList" :rules="rules" size="medium"  label-position="left":disabled="dsb">
-              <el-row :span="5">
-                <el-form-item label="鍥界睄" prop="nationality" label-width="40px">
-                  <el-input v-model="individualList.nationality" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
-                  </el-input>
-                </el-form-item>
-              </el-row>
-              <el-row :span="5">
-                <el-form-item label="濠氬Щ鐘跺喌" prop="maritalStatus" label-width="70px">
-                  <template v-if="!isEditing" >
-                    <el-input v-if="individualList.maritalStatus===0" placeholder="鏈"></el-input>
-                    <el-input v-if="individualList.maritalStatus===1" placeholder="宸插"></el-input>
-                    <el-input v-if="individualList.maritalStatus===2" placeholder="鏈"></el-input>
+    <!--  鍒锋柊椤甸潰  -->
+    <el-form :model="queryParams1" ref="queryForm" size="small" :inline="true" v-show="showSearch">
 
-                  </template>
-                  <template v-else>
-                    <el-select v-model="mrs" placeholder="璇烽�夋嫨鎬у埆" clearable :style="{width: '100%'}">
-                      <el-option label="鏈" value='0'></el-option>
-                      <el-option label="宸插" value='1'></el-option>
-                      <el-option label="绂诲" value='2'></el-option>
-                    </el-select>
-                  </template>
-                </el-form-item>
-              </el-row>
+      <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>
-          </el-col>
-        </el-container>
-      </div>
-      <div style="padding-left:100px;padding-top:30px">
-        <el-col :span="6" :data="individualList">
-          <div class="block" :model="individualList">
+      <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-upload ref="uploadDemo"
-			                  action=""
-			                  :file-list="fileList1"
-			                  list-type="picture-card"
-			                  accept="image/*"
-			                  :multiple="false"
-			                  :http-request="requestUpload"
-			                  :on-success="handleSucess"
-			                  :limit="1">
-
-			         <el-avatar shape="square"  style="width: 200px;;height: 200px;" >
-			            <el-image
-			              :src="'https://www.bendudu.com:8080/'+ individualList.url"
-			              :fit="fit" style="width: 100%;height: 100%;border-radius: 0px 0px 0px 0px;opacity: 1;border: 1px solid rgba(0,0,0,0.5);"
-			            ></el-image>
-
-
-			          </el-avatar>
-			       </el-upload>
-            <div class="edit-text" v-if="isEditing" @click="uploadImage">鐐瑰嚮鏇存崲鍥剧墖</div>
-          </div>
+      <el-row :gutter="10" class="mb8">
+        <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"
+            size="mini"
+            :disabled="multiple"
+            @click="handleDelete1"
+            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="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="handleExportTemplatem"
+            v-hasPermi="['family:note:export']"
+          >瀵煎叆妯℃澘涓嬭浇</el-button>
+        </el-col>
+        <el-col :span="1.5">
+
+          <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>
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      </el-row>
+    </div>
+
+    <el-table v-loading="loading" :data="noteList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange"  :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
+      <el-table-column type="selection" :reserve-selection="true" width="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" 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  @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 label="鎿嶄綔" align="center" width="250" class-name="small-padding fixed-width">
+        <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>
+          </div>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      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="requestUploadm"
+          :file-list="fileList"
+        >
+          <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>
+        <h4 class="form-header">鍏朵粬闄勪欢 </h4>
+        <el-upload
+          action=""
+          :file-list="fileListOther"
+          class="upload-demo"
+          multiple
+
+          :on-remove="handleRemove"
+          :http-request="requestUpload1m"
+          :show-file-list="true"
+        >
+          <el-button type="primary">鐐瑰嚮涓婁紶</el-button>
+          <div v-if="uploading1" class="upload-status">姝e湪涓婁紶...</div>
+          <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="submitDataScopem">淇� 瀛�</el-button>
+        <el-button @click="cancelData">鍙� 娑�</el-button>
       </div>
+    </el-dialog>
 
-      <div style="padding-left:30px;padding-top:30px" >
+    <!-- 鍒嗛厤瑙掕壊鏁版嵁鏉冮檺瀵硅瘽妗� -->
+    <el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
 
-      </div>
-      <!--      </el-dialog> self:user:export-->
-    </el-container>
-    <el-container>
-      <div>
-        <el-container>
-          <el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
-            <el-form ref="elForm" :model="individualList" :rules="rules" size="medium"  label-position="left">
-              <el-row :span="16" >
-                <el-form-item label="鍗曚綅" prop="unit" label-width="40px">
-                  <el-input v-model="individualList.unit" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
-                  </el-input>
-                </el-form-item>
-              </el-row>
-              <el-row :span="16">
-                <el-form-item label="鎴风睄鍦板潃" prop="locationAddress" label-width="70px">
-                  <el-input type="textarea" v-model="individualList.locationAddress" placeholder="" clearable :style="{width: '280px'}" :disabled="dsb">
-                  </el-input>
-                </el-form-item>
-              </el-row>
+    </el-dialog>
 
-              <el-row :span="28">
-                <el-form-item label="甯镐綇鍦板潃" prop="alwaysAddress" label-width="70px">
-                  <el-input type="textarea" v-model="individualList.alwaysAddress" placeholder="" clearable :style="{width: '280px'}" :disabled="dsb">
-                  </el-input>
-                </el-form-item>
-              </el-row>
+<!--    <MyComponent :key="componentKey" />-->
 
+    <!--    鍩烘湰淇℃伅-->
 
-            </el-form>
-          </el-col>
-        </el-container>
-      </div>
-      <div style="padding-left:60px">
-        <el-container>
-          <el-col v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
-            <el-form ref="elForm" :model="individualList" :rules="rules" size="medium"  label-position="left">
-              <el-row :span="12" >
-                <el-form-item label="鑱屽姟鑱岀О" prop="position" label-width="70px">
-                  <el-input v-model="individualList.position" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
-                  </el-input>
-                </el-form-item>
-              </el-row>
-              <el-row :span="12">
-                <el-form-item label="鎴风睄鍦板叕瀹夋満鍏�" prop="locationPolice" label-width="110px">
-                  <el-input type="textarea" v-model="individualList.locationPolice" placeholder="" clearable :style="{width: '280px'}" :disabled="dsb">
-                  </el-input>
-                </el-form-item>
-              </el-row>
-              <el-row :span="12">
-                <el-form-item label="甯镐綇鍦板叕瀹夋満鍏�" prop="alwaysPolice" label-width="110px">
-                  <el-input type="textarea" v-model="individualList.alwaysPolice" placeholder="" clearable :style="{width: '280px'}" :disabled="dsb">
-                  </el-input>
-                </el-form-item>
-              </el-row>
-
-            </el-form>
-          </el-col>
-        </el-container>
-      </div>
-    </el-container>
 
     <!--鎶樺彔闈㈡澘-->
     <el-collapse  v-model="activeNames" @change="handleChange">
-      <el-collapse-item title="绉诲眳鍥斤紙澧冿級鎯呭喌" name="3" >
+      <!-- <el-collapse-item title="绉诲眳鍥斤紙澧冿級鎯呭喌" name="3" >
       <div>
         <el-form v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
           <el-form-item label="鏄惁鎷ユ湁澶栫睄銆佸澶栧眳鐣欐潈銆侀暱鏈熷眳鐣欒鍙�" >
@@ -266,7 +387,7 @@
 
       </div>
 
-    </el-collapse-item>
+    </el-collapse-item> -->
 
       <!--涓昏瀛︿範鍙婂伐浣滅粡鍘�-->
       <el-collapse-item name="1"  >
@@ -730,7 +851,14 @@
   getAutobiographyList, getAutobiographyTermList, addAutobiography, updateAutobiography,delAutobiography,
   getCategory,
 } from "@/api/self/index";
-import { delFamilyevent, uploadPic } from '../../api/bignote'
+// 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} from "@/api/memo/index";
+
+import { Notification, MessageBox, Message, Loading } from 'element-ui'
+//import { delFamilyevent, uploadPic } from '../../api/bignote'
 import { blobValidate } from '../../utils/ruoyi'
 
 
@@ -761,6 +889,7 @@
       showSearch: true,
       // 鎬绘潯鏁�
       total: 0,
+      totalm: 0,
       //澶村儚涓婁紶
       showBtnDealImg:true,
       noneBtnImg:false,
@@ -824,7 +953,7 @@
      // 鏁版嵁鑼冨洿閫夐」
      fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
-     
+
       fileList:[],
       fileListOther:[],
       dsb:true,
@@ -893,6 +1022,17 @@
       menuOptions: [],
       // 閮ㄩ棬鍒楄〃
       deptOptions: [],
+      queryParams1: {
+        pageNum: 1,
+        pageSize: 10,
+        happenTime:undefined,
+        people:undefined,
+        address:undefined,
+        title:undefined,
+        remark:undefined
+      },
+      // 涓汉璁颁簨鏈〃鏍兼暟鎹�
+      noteList: [],
       // 鏌ヨ鍙傛暟
       queryParams: {
         pageNum: 1,
@@ -1101,6 +1241,22 @@
     /** 鏌ヨ瑙掕壊鍒楄〃 */
     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 => {
+      listNote(this.queryParams1).then(response => {
+          alert(321)
+          //   console.log(response.data)
+          this.noteList = response.data.data;
+
+          this.totalm = response.data.total;
+          this.loading = false;
+        }
+      );
+
+
+      this.loading = true;
       // console.log(this.queryParams)
       //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
       //涓汉缁忓巻
@@ -1122,16 +1278,15 @@
           _this.loading = false;
         }
       );
-      //涓汉淇℃伅
-      getIndividualList(this.queryParams).then(response => {
-          //  alert(123)
-          //   console.log(response.data)
-          _this.individualList = response.data;
+  getIndividualList(this.queryParams).then(response => {
+       //  alert(123)
+       //   console.log(response.data)
+       _this.individualList = response.data;
 
-          // this.total = response.data.total;
-          _this.loading = false;
-        }
-      );
+       // this.total = response.data.total;
+       _this.loading = false;
+     }
+   );
       //鍑哄叆澧冭瘉浠舵儏鍐�
       getCertificateList(this.queryParams).then(response => {
           //  alert(123)
@@ -1249,7 +1404,141 @@
       this.single = selection.length!=1
       this.multiple = !selection.length
     },
+/** 鏂板鎸夐挳鎿嶄綔 */
+    handleAdd1() {
+      this.reset();
+      this.open = true;
+      this.title = "娣诲姞涓汉璁颁簨鏈缁嗕俊鎭�";
+    },
+    /** 鏌ョ湅璇︾粏淇℃伅 */
+    handleCheck1(row){
+      const id = row.id;
+      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('uploadFile', 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.data.fileName, "url":response.data.url})
+        }
+      })
+    },
+    requestUpload1m(params)
+    {
+      var file = params.file;
+      var formData = new FormData();
+      formData.append('uploadFile', 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.data.fileName, 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`)
+      }
+    },
+
+    handleExportTemplatem(){
+      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 => {
+            this.$modal.msgSuccess("鏂板鎴愬姛");
+            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);
@@ -1291,21 +1580,7 @@
         saveAs(blob, filename)
       })
     },
-    // 缂栬緫鎸夐挳
-    handleEdit()
-    {
-      this.dsb = false
-      this.btn = true
-      this.isShow=false
-      this.isShow_2=true
-      this.isEditing=true
-      if(this.individualList.maritalStatus == 0)
-          this.mrs = '鏈'
-      else if(this.individualList.maritalStatus == 1)
-          this.mrs = '宸插'
-      else
-          this.mrs = '绂诲'// this.isEdit=false
-    },
+
 
     /** 鏌ヨ鑷紶淇℃伅 */
     getAutobiographyInfor()
@@ -1446,95 +1721,8 @@
       this.$set(this.editStatus, row.id, true);
     },
     //淇敼鍚庣殑淇濆瓨
-    //涓汉鍩烘湰淇℃伅
-    submitForm() {
-      if(this.inds=='1')
-        this.individualList.sex = 1;
-      else
-        this.individualList.sex = 0;
-      if(this.mrs=='0')
-        this.individualList.maritalStatus = 0
-      else if(this.mrs == '1')
-        this.individualList.maritalStatus = 1
-      else
-        this.individualList.maritalStatus = 2
-    //   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.individualList.url = ul+","+uls
-    //  console.log(this.individualList)
-      this.$refs['elForm'].validate(valid => {
-        if (valid) {
-          if (this.individualList.userId !== undefined) {
-            updateIndividual(this.individualList).then(response => {
-              this.$modal.msgSuccess("淇敼鎴愬姛");
-              // 寮哄埗鏇存柊鐩稿叧缁勪欢
-              this.individualList={...this.individualList}
 
-              // this.open = false;
-              this.dsb = true
-              this.btn=false
-              this.isShow_2=false
-              this.isShow=true
-              this.isEditing = false
-            });
-          } else {
-            this.$modal.msgSuccess("淇敼澶辫触");
-
-          }
-        }
-      })
-      // 鍒锋柊椤甸潰
-      // window.location.reload();
-    },
-    //澶村儚淇敼
-    uploadImage() {
-      const inputElement = document.createElement("input");
-      inputElement.type = "file";
-      inputElement.accept = "image/*";
-      inputElement.style.display = "none";
-      document.body.appendChild(inputElement);
-
-      inputElement.addEventListener("change", () => {
-        const file = inputElement.files[0];
-        if (file) {
-          const formData = new FormData();
-          formData.append("image", file);
-
-          // 璋冪敤uploadPic鎺ュ彛涓婁紶鍥剧墖
-          axios.post("/common/upload", formData, {
-            headers: {
-              "Content-Type": "multipart/form-data"
-            }
-          }).then(response => {
-            // 涓婁紶鎴愬姛锛岃幏鍙栨柊鍥剧墖鐨刄RL
-            const newImageUrl = response.data.img;
-
-            // 鍋囪individualList鏄竴涓璞★紝鏇存柊individualList.img
-            this.individualList.img =   newImageUrl;
-
-            // 鍋囪fileList鏄竴涓暟缁勶紝鏇存柊fileList涓搴旂殑鍥剧墖URL
-            // const index = this.fileList.findIndex(item => item.id === fileId);
-            // this.fileList[index].url = newImageUrl;
-
-            // 娓呴櫎input鍏冪礌骞剁Щ闄や簨浠剁洃鍚�
-            document.body.removeChild(inputElement);
-            inputElement.removeEventListener("change", null);
-          }).catch(error => {
-            console.error("涓婁紶澶辫触:", error);
-            // 娓呴櫎input鍏冪礌骞剁Щ闄や簨浠剁洃鍚�
-            document.body.removeChild(inputElement);
-            inputElement.removeEventListener("change", null);
-          });
-        }
-      });
-
-      // 瑙﹀彂鐐瑰嚮浜嬩欢锛屾樉绀烘枃浠堕�夋嫨瀵硅瘽妗�
-      inputElement.click();
-    },
+   
     //涓昏缁忓巻
     saveRowExperienceList(row) {
       this.$refs['elForm'].validate(valid => {
@@ -1619,50 +1807,6 @@
       this.$set(row, 'isEdit', false);
       this.$set(this.editStatus, row.id, false);
     },
-    requestUpload(params)
-    {
-      var file = params.file;
-      var formData = new FormData();
-      formData.append('uploadFile', file);
-      let _this = this
-
-     // console.log(this.individualList)
-      this.$refs.uploadDemo.clearFiles();
-    //  alert(234)
-      uploadPic(formData).then(response => {
-      //  alert(response.data.url)
-      //  alert(response.data.originalFilename)
-        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.fileList.push({name:response.data.fileName, url:response.data.url})
-
-        }
-        _this.individualList.img = response.data.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
-        _this.individualList.url = response.data.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
-        updateIndividual(_this.individualList).then(response => {
-          // 灏嗛�変腑閫夐」鐨勬枃鏈缃负"term"瀛楁鐨勫��
-          // this.formDat.term = selectedOption.value;
-          // this.formDat.id = selectedOption.id;
-          console.log("1")
-          _this.$modal.msgSuccess("淇敼鎴愬姛");
-          _this.dialogVisible.autobiography = false;
-          _this.isEdit1 = false;
-          _this.getList();
-        }).catch(error => {
-          console.log(error);
-          _this.isEdit1 = false;
-          _this.dialogVisible.autobiography = false;
-        });
-      })
-
-    },
 
     /** 鍒犻櫎涓汉缁忓巻鎸夐挳鎿嶄綔 */
     handleExperienceDelete(row) {
@@ -1715,12 +1859,7 @@
       }).catch(() => {});
     },
 
-    /** 瀵煎嚭鎸夐挳鎿嶄綔 */
-    handleExport() {
-      this.download('/self/user/export', {
-        ...this.queryParams
-      }, `self_${new Date().getTime()}.xlsx`)
-    }
+
   }
 };
 </script>

--
Gitblit v1.9.1