From 52bbd96db03f32b8d750622116d2b7720eed3d51 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期五, 23 八月 2024 10:43:30 +0800
Subject: [PATCH] 修改了一些bug
---
ruoyi-ui/src/views/self/show.vue | 762 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 697 insertions(+), 65 deletions(-)
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index fd5e651..59779a3 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -8,7 +8,8 @@
</el-backtop>
<h1 style="font-size:21px;padding-top:30px;display: flex;">
<span>涓汉璁颁簨鏈�</span>
- <div class="button-container" >
+ <div class="button-container" ></div>
+ <!-- <div class="button-container" >
<el-button
size="mini"
style="background: #E0EEFE;
@@ -36,7 +37,7 @@
v-print="'#printable-content'"
v-hasPermi="['family:note:export']"
>鎵撳嵃</el-button>
- </div>
+ </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>
@@ -114,7 +115,7 @@
</el-form>
<div>
- <el-row :gutter="10" class="mb8">
+ <el-row :gutter="10" class="mb8" v-if="userId != 2">
<el-col :span="1.5">
<el-button
type="primary"
@@ -153,7 +154,7 @@
plain
icon="el-icon-download"
size="mini"
- @click="handleExportTemplatem"
+ @click="handleExportTemplate"
v-hasPermi="['family:note:export']"
>瀵煎叆妯℃澘涓嬭浇</el-button>
</el-col>
@@ -172,11 +173,54 @@
</el-upload>
</el-col>
+
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ plain
+ icon="el-icon-top"
+ size="mini"
+ :disabled="multiple"
+ @click="handleShare"
+
+ >鍒嗕韩</el-button>
+ </el-col>
+
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ plain
+ icon="el-icon-top"
+ size="mini"
+ @click="handleWho"
+ >鍒嗕韩缁欒皝浜嗕粈涔堟暟鎹�</el-button>
+ </el-col>
+
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ plain
+ icon="el-icon-top"
+ size="mini"
+ @click="whoShare"
+ >鍒嗕韩缁欐垜鐨勬暟鎹�</el-button>
+ </el-col>
+
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ plain
+ icon="el-icon-top"
+ size="mini"
+ @click="showData"
+ >灞曠ず涓嬭浇鐨勫垎浜暟鎹�</el-button>
+ </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 v-loading="loading" border :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"/>
@@ -219,7 +263,7 @@
</el-table-column>
<!-- </el-table-column>-->
- <el-table-column label="鎿嶄綔" align="center" width="250" class-name="small-padding fixed-width">
+ <el-table-column 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
@@ -244,6 +288,12 @@
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>
@@ -289,8 +339,11 @@
accept="image/jpeg, image/png,image/jpg, image/WMF,image/gif"
list-type="picture-card"
multiple
- :http-request="requestUploadm"
+ :http-request="requestUpload"
: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 }">
@@ -324,31 +377,81 @@
</div>
</el-upload>
+ <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"
>
- <el-button type="primary">鐐瑰嚮涓婁紶</el-button>
- <div v-if="uploading1" class="upload-status">姝ｅ湪涓婁紶...</div>
- <template #tip>
- <div class="el-upload__tip">
- </div>
- </template>
+
+ <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>
+ <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="cancelData">鍙� 娑�</el-button>
+ <el-button @click="cancelDataPer">鍙� 娑�</el-button>
</div>
</el-dialog>
@@ -363,7 +466,7 @@
<!--鎶樺彔闈㈡澘-->
- <el-collapse v-model="activeNames" @change="handleChange">
+ <el-collapse v-model="activeNames" @change="handleChange5">
<!-- <el-collapse-item title="绉诲眳鍥斤紙澧冿級鎯呭喌" name="3" >
<div>
<el-form v-loading="loading" :data="individualList" @selection-change="handleSelectionChange">
@@ -400,7 +503,7 @@
</div>
</div>
</template>
- <el-table v-loading="loading" :data="experienceList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
+ <el-table v-loading="loading" border :data="experienceList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column label="寮�濮嬫棩鏈�" prop="startDate" sortable width="250" align="center" >
<template slot-scope="scope">
<template v-if="!scope.row.isEdit">{{ scope.row.startDate }}</template>
@@ -431,7 +534,7 @@
</template>
</el-table-column>
<!-- 鎿嶄綔-->
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" v-if="userId != 2">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
<el-button size="mini" type="text" icon="el-icon-edit" v-if="!editStatus[scope.row.id]"
@click="editRow(scope.row)" v-hasPermi="['system:role:edit']">淇敼</el-button>
@@ -454,7 +557,7 @@
</div>
</div>
</template>
- <el-table v-loading="loading" :data="relationList" @selection-change="handleSelectionChange"
+ <el-table v-loading="loading" border :data="relationList" @selection-change="handleSelectionChange"
:row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column label="涓庢湰浜哄叧绯�" prop="relation" sortable width="260" align="center" >
<template slot-scope="scope">
@@ -486,7 +589,7 @@
<template v-else><el-input v-model="scope.row.otherPolitical"></el-input></template>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" v-if="userId != 2">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
<el-button size="mini" type="text" icon="el-icon-edit" v-if="!editStatus[scope.row.id]"
@click="editRow(scope.row)" v-hasPermi="['system:role:edit']">淇敼</el-button>
@@ -507,7 +610,7 @@
<sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button>
</div>
</template>
- <el-table v-loading="loading" :data="certificateList" @selection-change="handleSelectionChange"
+ <el-table v-loading="loading" border :data="certificateList" @selection-change="handleSelectionChange"
:row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column label="璇佷欢鍚嶇О" prop="cerName" sortable width="230" align="center" >
<template slot-scope="scope">
@@ -551,7 +654,7 @@
></el-date-picker></template>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" v-if="userId != 2">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
<el-button size="mini" type="text" icon="el-icon-edit" v-if="!editStatus[scope.row.id]"
@click="editRow(scope.row)" v-hasPermi="['system:role:edit']">淇敼</el-button>
@@ -572,7 +675,7 @@
<sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button>
</div>
</template>
- <el-table v-loading="loading" :data="AbroadList" @selection-change="handleSelectionChange"
+ <el-table v-loading="loading" border :data="AbroadList" @selection-change="handleSelectionChange"
:row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column label="寮�濮嬫椂闂�" prop="startTime" sortable width="200" align="center">
<template slot-scope="scope">
@@ -604,7 +707,7 @@
<template v-else><el-input v-model="scope.row.cause"></el-input></template>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" v-if="userId != 2">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
<el-button size="mini" type="text" icon="el-icon-edit" v-if="!editStatus[scope.row.id]"
@click="editRow(scope.row)" v-hasPermi="['system:role:edit']">淇敼</el-button>
@@ -833,6 +936,123 @@
</div>
</el-dialog>
+
+ <!-- 鍒嗕韩瀵硅瘽妗�1 -->
+ <el-dialog :title="title1" :visible.sync="open1" width="500px" append-to-body @close="handleClose2">
+
+ <el-table v-loading="loading1" :data="listRoot" :row-key="getRowId1" 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="getRowId2" 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="handleCheck(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>
@@ -849,14 +1069,18 @@
getCertificateList, addCertificate, updateCertificate, delCertificate,
getAbroadList, addAbroad, updateAbroad, delAbroad, listType,
getAutobiographyList, getAutobiographyTermList, addAutobiography, updateAutobiography,delAutobiography,
- getCategory,
+ 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} from "@/api/memo/index";
-
+import {listNote,enload,getNote, addNote,updateNote, delNote,uploadPic,
+ share,shareToWho,getWhoShare,downShareData,deleteShareData,showShareData
+} from "@/api/memo/index";
+import {getInfo} from "@/api/login";
import { Notification, MessageBox, Message, Loading } from 'element-ui'
//import { delFamilyevent, uploadPic } from '../../api/bignote'
import { blobValidate } from '../../utils/ruoyi'
@@ -869,6 +1093,39 @@
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,
@@ -940,7 +1197,7 @@
// 寮瑰嚭灞傛爣棰�
title: "",
- // open:true,
+ open:false,
// 鏄惁鏄剧ず寮瑰嚭灞傦紙鏁版嵁鏉冮檺锛�
openDataScope: false,
menuExpand: false,
@@ -954,6 +1211,7 @@
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
'.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+ fileList1:[],
fileList:[],
fileListOther:[],
dsb:true,
@@ -985,7 +1243,7 @@
momId:undefined,
birth:undefined,
familyId:undefined,
-
+ url: '',
//涓昏瀛︿範鍙婂伐浣滅粡鍘�
id:undefined,
@@ -1011,7 +1269,7 @@
startTime:undefined,
endTime:undefined,
cause:undefined,
- url: undefined,
+
//鑷紶
ageBegin:undefined,
ageEnd:undefined,
@@ -1049,6 +1307,21 @@
},
// 琛ㄥ崟鏍￠獙
rules: {
+ happenTime: [{
+ required: true,
+ message: '璇烽�夋嫨鏃堕棿',
+ trigger: 'blur'
+ }],
+ people: [{
+ required: true,
+ message: '璇疯緭鍏ヤ汉鐗�',
+ trigger: 'blur'
+ }],
+ title: [{
+ required: true,
+ message: '璇疯緭鍏ヤ簨浠舵爣棰�',
+ trigger: 'blur'
+ }],
//鍩烘湰淇℃伅
nickName: [{
// required: true,
@@ -1144,6 +1417,74 @@
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'
+ }]
+
},
selectedOption:'',
typeOptions:[],
@@ -1153,13 +1494,294 @@
};
},
created() {
+ this.getList1();
this.getList();
this.getAutobiographyInfor()
-
+ this.getInfo()
},
methods: {
+ // 鍒嗛〉
+ 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()
+ }
+ },
+ // 鍏抽棴寮圭獥鍚�
+ handleClose(){
+ this.user = ''
+ this.queryParams2.pageNo = 1
+ this.total1 = 0
+ },
+ handleClose2(){
+ this.$refs.table1.clearSelection()
+ },
+
+ // 涓嬭浇浠栦汉缁欐垜鍒嗕韩鐨勬暟鎹�
+ 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
+ },
+ getList1() {
+ this.loading1 = true;
+ this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
+ this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
+ listUserAll(this.queryParams1).then(response => {
+ this.listRoot = response.data.data;
+ const kon = {}
+ 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,'userListuserListuserList')
+ this.loading1 = false;
+ }
+ );
+ },
+ // 纭鍒嗕韩
+ 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.getList();
+ this.$modal.msgSuccess("鍒嗕韩鎴愬姛");
+ this.id1 = undefined
+ this.open1 = false;
+ }).catch(() => {});
+ },
+ // ------------------------------------------------------------------
+
+ getInfo(){
+ console.log('-----------------')
+ getInfo().then(response=>{
+ console.log(response.user.roles[0].roleId,'roleID')
+ this.userId = response.user.roles[0].roleId
+ })
+ },
+ 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
+ },
+
+
+
// 鍙栨秷鎸夐挳
cancelData() {
+ // alert(23)
this.dialogVisible.open = false;
this.dialogVisible.relation1 = false;
this.dialogVisible.certificate =false;
@@ -1167,6 +1789,7 @@
this.dialogVisible.autobiography=false;
this.isEdit1 = false;
this.reset();
+ // alert(32)
// 娓呯┖formDat瀵硅薄鐨勬暟鎹�
Object.keys(this.formDat).forEach(key => {
this.formDat[key] = '';
@@ -1178,7 +1801,7 @@
},
//涓嬫媺
- handleChange(activeNames) {
+ handleChange5(activeNames) {
// console.log(activeNames);
this.reset();
},
@@ -1384,7 +2007,7 @@
deptCheckStrictly: true,
remark: undefined
};
- this.resetForm("form");
+ this.resetForm("elForm");
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
@@ -1431,7 +2054,7 @@
{
var file = params.file;
var formData = new FormData();
- formData.append('uploadFile', file);
+ formData.append('files', file);
let _this = this
this.uploading = true;
uploadPic(formData).then(response => {
@@ -1440,7 +2063,7 @@
this.$modal.msgSuccess("涓婁紶鎴愬姛");
if(_this.fot.includes(pth) === true)
{
- _this.fileList.push({name:response.data.fileName, "url":response.data.url})
+ _this.fileList.push({name:response.fileNames, "url":response.data.url})
}
})
},
@@ -1448,7 +2071,7 @@
{
var file = params.file;
var formData = new FormData();
- formData.append('uploadFile', file);
+ formData.append('files', file);
let _this = this
this.uploading1 = true;
uploadPic(formData).then(response => {
@@ -1457,7 +2080,7 @@
this.$modal.msgSuccess("涓婁紶鎴愬姛");
if(_this.fot.includes(pth) !== true)
{
- _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+ _this.fileListOther.push({name:response.fileNames, url:response.data.url})
}
})
},
@@ -1478,10 +2101,10 @@
}
},
- handleExportTemplatem(){
+ handleExportTemplate(){
this.download('/zSelfNote/model', {
- }, `zSelfNote${new Date().getTime()}.xlsx`)
+ }, `zSelfNote_${new Date().getTime()}.xlsx`)
},
/** 瀵煎叆鎿嶄綔*/
handleEnportm(params){
@@ -1500,18 +2123,20 @@
/** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
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
+ // 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 => {
@@ -1580,7 +2205,13 @@
saveAs(blob, filename)
})
},
+ cancelDataPer()
+ {
+ this.open = false;
+ // alert(123)
+ // alert(this.open)
+ },
/** 鏌ヨ鑷紶淇℃伅 */
getAutobiographyInfor()
@@ -1615,7 +2246,7 @@
_this.dialogVisible.open = false;
addExperience(_this.formDat).then(response => {
_this.$modal.msgSuccess("鏂板鎴愬姛");
-
+
_this.getList();
});
}
@@ -1632,7 +2263,7 @@
this.dialogVisible.relation1 = false;
addRelation(this.formDat).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
-
+
this.getList();
});
}
@@ -1654,6 +2285,7 @@
}
});
// 娓呯┖formDat瀵硅薄鐨勬暟鎹�
+ this.newOption=undefined
Object.keys(this.formDat).forEach(key => {
this.formDat[key] = '';
});
@@ -1725,11 +2357,11 @@
},
//淇敼鍚庣殑淇濆瓨
-
+
//涓昏缁忓巻
saveRowExperienceList(row) {
- this.$refs['elForm'].validate(valid => {
- if (valid) {
+ // this.$refs['elForm'].validate(valid => {
+ // if (valid) {
const foundIndex = this.experienceList.findIndex(item => item.id === row.id);
if (foundIndex !== -1) {
const updatedData = Object.assign({}, this.experienceList[foundIndex], row);
@@ -1742,15 +2374,15 @@
} else {
this.$modal.msgError("淇敼澶辫触");
}
- }
- });
+ //}
+ // });
this.$set(row, 'isEdit', false);
this.$set(this.editStatus, row.id, false);
},
//鎴愬憳鍏崇郴
saveRowRelationList(row) {
- this.$refs['elForm'].validate(valid => {
- if (valid) {
+ // this.$refs['elForm'].validate(valid => {
+ // if (valid) {
const foundIndex = this.relationList.findIndex(item => item.id === row.id);
if (foundIndex !== -1) {
const updatedData = Object.assign({}, this.relationList[foundIndex], row);
@@ -1763,15 +2395,15 @@
} else {
this.$modal.msgError("淇敼澶辫触");
}
- }
- });
+ // }
+ // });
this.$set(row, 'isEdit', false);
this.$set(this.editStatus, row.id, false);
},
//璇佷欢鎯呭喌
saveRowCertificateList(row) {
- this.$refs['elForm'].validate(valid => {
- if (valid) {
+ // this.$refs['elForm'].validate(valid => {
+ // if (valid) {
const foundIndex = this.certificateList.findIndex(item => item.id === row.id);
if (foundIndex !== -1) {
const updatedData = Object.assign({}, this.certificateList[foundIndex], row);
@@ -1784,15 +2416,15 @@
} else {
this.$modal.msgError("淇敼澶辫触");
}
- }
- });
+ // }
+ //});
this.$set(row, 'isEdit', false);
this.$set(this.editStatus, row.id, false);
},
//鍑哄浗鎯呭喌
saveRowAbroadList(row) {
- this.$refs['elForm'].validate(valid => {
- if (valid) {
+ // this.$refs['elForm'].validate(valid => {
+ // if (valid) {
const foundIndex = this.AbroadList.findIndex(item => item.id === row.id);
if (foundIndex !== -1) {
const updatedData = Object.assign({}, this.AbroadList[foundIndex], row);
@@ -1805,8 +2437,8 @@
} else {
this.$modal.msgError("淇敼澶辫触");
}
- }
- });
+ // }
+ // });
this.$set(row, 'isEdit', false);
this.$set(this.editStatus, row.id, false);
},
--
Gitblit v1.9.1