From edf97cb2bfe110123a6dacc1cd8c52ce400ff1db Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期三, 19 七月 2023 00:46:03 +0800
Subject: [PATCH] 新增个人记事本展示和详情页
---
ruoyi-ui/src/views/self/memo.vue | 684 +++++++++++++++++++++++++++++++++
ruoyi-ui/src/views/self/show.vue | 5
ruoyi-ui/src/views/self/memoInfo.vue | 425 +++++++++++++++++++++
ruoyi-ui/src/api/memo/index.js | 32
ruoyi-ui/src/router/index.js | 16
5 files changed, 1,137 insertions(+), 25 deletions(-)
diff --git a/ruoyi-ui/src/api/memo/index.js b/ruoyi-ui/src/api/memo/index.js
index 612801c..07ed13e 100644
--- a/ruoyi-ui/src/api/memo/index.js
+++ b/ruoyi-ui/src/api/memo/index.js
@@ -36,14 +36,14 @@
})
}
-// //涓婁紶鏂囦欢
-// export function uploadPic(data) {
-// return request({
-// url: '/common/upload',
-// method: 'post',
-// data: data
-// })
-// }
+//涓婁紶鏂囦欢
+export function uploadPic(data) {
+ return request({
+ url: '/common/upload',
+ method: 'post',
+ data: data
+ })
+}
// //涓嬭浇鏂囦欢
// export function download(data) {
// return request({
@@ -53,12 +53,12 @@
// responseType: 'blob'
// })
// }
-// //涓婁紶鏂囦欢
-// export function enload(data) {
-// return request({
-// url: '/zfDoctor/importData',
-// method: 'post',
-// data: data
-// })
-// }
+//涓婁紶鏂囦欢
+export function enload(data) {
+ return request({
+ url: '/zSelfNote/importData',
+ method: 'post',
+ data: data
+ })
+}
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index a840dff..cf35c69 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -329,6 +329,22 @@
}
]
},
+ //涓汉璁颁簨鏈缁嗕俊鎭�
+ {
+ path: '/self/self',
+ component: Layout,
+ permissions: ['person:information:memoInfo'],
+
+ hidden: true,
+ children: [
+ {
+ path: 'memoInfo/:id(\\d+)',
+ component: () => import('@/views/self/memoInfo'),
+ name: 'memoInfo',
+ meta: { title: '涓汉璁颁簨鏈缁嗕俊鎭�'}
+ }
+ ]
+ },
//璇佷功銆佽祫璐�
{
path: '/self/honor',
diff --git a/ruoyi-ui/src/views/self/memo.vue b/ruoyi-ui/src/views/self/memo.vue
index 7d38ef5..fcb4431 100644
--- a/ruoyi-ui/src/views/self/memo.vue
+++ b/ruoyi-ui/src/views/self/memo.vue
@@ -1,13 +1,685 @@
<template>
-<div>hi</div>
+ <div class="app-container">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+ <el-form-item label="" prop="phone wx qq twitter isAlways remark" >
+ <el-input
+ v-model:phone="queryParams.phone"
+ v-model:wx="queryParams.wx"
+ v-model:qq="queryParams.qq"
+ v-model:twitter="queryParams.twitter"
+ v-model:isAlways="queryParams.isAlways"
+ v-model:remark="queryParams.remark"
+ placeholder="鍦ㄢ�滀釜浜鸿浜嬫湰鈥濅腑鎼滅储"
+ clearable
+ style="width: 240px"
+ @keyup.enter.native="handleQuery">
+ <i slot="prefix" class="el-input__icon el-icon-search"></i>
+ </el-input>
+ </el-form-item>
+
+ <el-form-item label="鏃堕棿">
+ <el-date-picker
+ v-model="dateRange"
+ style="width: 197px;
+ height: 30px;
+ background: #FFFFFF;
+ border-radius: 14px 14px 14px 14px;
+ opacity: 0.5;
+ border: 1px solid rgba(0,0,0,0.25);"
+ value-format="yyyy-MM-dd"
+ type="daterange"
+ range-separator="-"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ ></el-date-picker>
+ </el-form-item>
+ <el-form-item label="浜虹墿" prop="people">
+ <el-input
+ v-model="queryParams.people"
+ placeholder="璇疯緭鍏ヤ汉鐗�"
+ clearable
+ style="width: 240px"
+ @keyup.enter.native="handleQuery">
+ <i slot="prefix" class="el-input__icon el-icon-search"></i>
+ </el-input>
+ </el-form-item>
+
+ <el-form-item label="鍦扮偣" prop="address">
+ <el-input
+ v-model="queryParams.address"
+ placeholder="璇疯緭鍏ュ湴鐐�"
+ clearable
+ style="width: 240px"
+ @keyup.enter.native="handleQuery">
+ <i slot="prefix" class="el-input__icon el-icon-search"></i>
+ </el-input>
+ </el-form-item>
+ <el-form-item label="浜嬩欢鏍囬" prop="title">
+ <el-input
+ v-model="queryParams.title"
+ placeholder="璇疯緭鍏ヤ簨浠舵爣棰�"
+ clearable
+ style="width: 240px"
+ @keyup.enter.native="handleQuery">
+ <i slot="prefix" class="el-input__icon el-icon-search"></i>
+ </el-input>
+ </el-form-item>
+
+ <el-form-item>
+ <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">
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ plain
+ icon="el-icon-plus"
+ size="mini"
+ @click="handleAdd"
+ v-hasPermi="['system:role:add']"
+ >鏂板</el-button>
+ </el-col>
+
+ <el-col :span="1.5">
+ <el-button
+ type="danger"
+ plain
+ icon="el-icon-delete"
+ size="mini"
+ :disabled="multiple"
+ @click="handleDelete"
+ v-hasPermi="['system:role:remove']"
+ >鍒犻櫎</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="warning"
+ plain
+ icon="el-icon-download"
+ size="mini"
+ @click="handleExport"
+ v-hasPermi="['family:note:export']"
+ >瀵煎嚭</el-button>
+ </el-col>
+ <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-col :span="1.2">
+
+ <el-upload
+ action=""
+
+ class="upload-demo"
+ :show-file-list="false"
+ :http-request="handleEnport"
+ >
+ <el-button size="mini" type="primary"
+ plain
+ icon="el-icon-plus" >瀵煎叆</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="25" 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 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 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 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="handleCheck(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 !== ','"
+ >
+ <img
+ class="el-upload-list__item-thumbnail"
+ src="../../assets/images/deviceA.png"
+ alt=""
+ style="width: 35px; height: 35px;"
+ fit="cover"
+ v-if="scope.row.url ===',' "
+ ></div>
+ </template>
+ </el-table-column>
+
+ <!-- </el-table-column>-->
+ <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <template slot-scope="scope" v-if="scope.row.roleId !== 1">
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-edit"
+ @click="handleUpdate(scope.row)"
+ v-hasPermi="['system:role:edit']"
+ >淇敼</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="handleDelete(scope.row)"
+ v-hasPermi="['system:role:remove']"
+ >鍒犻櫎</el-button>
+
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-d-arrow-right"
+ @click="handleCheck(scope.row)">
+ 鏌ョ湅璇︽儏</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+
+ <pagination
+ v-show="total>0"
+ :total="total"
+ :page.sync="queryParams.pageNum"
+ :limit.sync="queryParams.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-input v-model="formDat.happenTime" type='date' placeholder='閫夋嫨鏃ユ湡' clearable :style="{width: '100%'}" ></el-input>
+ </el-form-item>
+ <el-form-item label="浜虹墿" prop="people">
+ <el-input v-model="formDat.people" placeholder="璇疯緭鍏ヤ汉鐗�" clearable :style="{width: '100%'}" >
+ </el-input>
+ </el-form-item>
+ <el-form-item label="鍦扮偣" prop="address">
+ <el-input v-model="formDat.address" placeholder="璇疯緭鍏ュ湴鐐�" clearable :style="{width: '100%'}" >
+ </el-input>
+ </el-form-item>
+ <el-form-item label="浜嬩欢鏍囬" prop="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="#"
+ list-type="picture-card"
+ multiple
+ :http-request="requestUpload"
+ :file-list="fileList"
+ >
+ <i slot="default" class="el-icon-plus"></i>
+ <div slot="file" slot-scope="{file}">
+ <img
+ class="el-upload-list__item-thumbnail"
+ :src="file.url"
+ alt=""
+ style="width: 126px; height: 126px"
+ fit="cover"
+ :preview-src-list="[file.url]"
+ >
+ <span class="el-upload-list__item-actions">
+ <span
+ class="el-upload-list__item-preview"
+ @click="handlePictureCardPreview(file)"
+ >
+ <i class="el-icon-zoom-in"></i>
+ </span>
+
+ <span
+ v-if="!disabled"
+ class="el-upload-list__item-delete"
+ @click="handleRemove(file)"
+ >
+ <i class="el-icon-delete"></i>
+ </span>
+ </span>
+
+
+ </div>
+ </el-upload>
+ <h4 class="form-header">鍏朵粬闄勪欢 </h4>
+ <el-upload
+ action=""
+ :file-list="fileListOther"
+ class="upload-demo"
+ multiple
+
+ :on-remove="handleRemove"
+ :http-request="requestUpload"
+ :show-file-list="true"
+ >
+ <el-button type="primary">鐐瑰嚮涓婁紶</el-button>
+ <template #tip>
+ <div class="el-upload__tip">
+ </div>
+ </template>
+ </el-upload>
+
+ </el-form>
+ <h4 class="form-header"> </h4>
+
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="submitDataScope">淇� 瀛�</el-button>
+ <el-button @click="cancelData">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
+
+ <!-- 鍒嗛厤瑙掕壊鏁版嵁鏉冮檺瀵硅瘽妗� -->
+ <el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
+
+ </el-dialog>
+
+ </div>
</template>
<script>
-export default {
- name: "memo"
-}
-</script>
+import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
+import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
-<style scoped>
+//瀵煎叆鎺ュ彛鍑芥暟
+import {listNote,enload,getNote, addNote,updateNote, delNote,uploadPic} from "@/api/memo/index";
+
+import { Notification, MessageBox, Message, Loading } from 'element-ui'
+export default {
+ name: "memo",
+ dicts: ['sys_normal_disable'],
+ data() {
+ return {
+ // 閬僵灞�
+ disabled: false,
+
+ loading: true,
+ formData:[],
+ // 閫変腑鏁扮粍
+ ids: [],
+ // 闈炲崟涓鐢�
+ single: true,
+ // 闈炲涓鐢�
+ multiple: true,
+ // 鏄剧ず鎼滅储鏉′欢
+ showSearch: true,
+ // 鎬绘潯鏁�
+ total: 0,
+ // 涓汉璁颁簨鏈〃鏍兼暟鎹�
+ noteList: [],
+ // 寮瑰嚭灞傛爣棰�
+ title: "",
+ // 鏄惁鏄剧ず寮瑰嚭灞�
+ open: false,
+ // 鏄惁鏄剧ず寮瑰嚭灞傦紙鏁版嵁鏉冮檺锛�
+ openDataScope: false,
+ menuExpand: false,
+ menuNodeAll: false,
+ deptExpand: true,
+ deptNodeAll: false,
+ // 鏃ユ湡鑼冨洿
+ dateRange: [],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:[".jpg",".jif"],
+ fileList:[
+ ],
+ fileListOther:[
+
+ ],
+ dsb:true,
+ btn:false,
+ fit:['fill'],
+
+ formDat: {
+ //涓汉璁颁簨鏈鎯�
+ id:undefined,
+ happenTime:undefined,
+ people:undefined,
+ address:undefined,
+ title:undefined,
+ remark:undefined,
+ url: undefined,
+ },
+ // 鑿滃崟鍒楄〃
+ menuOptions: [],
+ // 閮ㄩ棬鍒楄〃
+ deptOptions: [],
+ // 鏌ヨ鍙傛暟
+ queryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ happenTime:undefined,
+ people:undefined,
+ address:undefined,
+ title:undefined,
+
+ },
+ // searchVal:"",
+
+ // 琛ㄥ崟鍙傛暟
+ form: {},
+ defaultProps: {
+ children: "children",
+ label: "label"
+ },
+ // 琛ㄥ崟鏍￠獙
+ rules: {
+
+ happenTime: [{
+ required: true,
+ message: '璇烽�夋嫨鏃堕棿',
+ trigger: 'blur'
+ }],
+ people: [{
+ required: true,
+ message: '璇疯緭鍏ヤ汉鐗�',
+ trigger: 'blur'
+ }],
+ address: [{
+ // required: true,
+ message: '璇疯緭鍏ュ湴鐐�',
+ trigger: 'blur'
+ }],
+ title: [{
+ required: true,
+ message: '璇疯緭鍏ヤ簨浠舵爣棰�',
+ trigger: 'blur'
+ }],
+ remark: [{
+ // required: true,
+ message: '璇疯緭鍏ュ娉�',
+ trigger: 'blur'
+ }],
+ },
+ typeOptions: [],
+ };
+ },
+ created() {
+ this.getList();
+ this.getCateInfor()
+ // for (let i = 0; i < this.contactList.length; i++) {
+ // this.formDat[i] = this.contactList[i];
+ // }
+ },
+ methods: {
+ // 鍙栨秷鎸夐挳
+ cancelData() {
+ this.open = false;
+ this.reset();
+ },
+
+ //闅旇鍙樿壊
+ tableRowClassName({ row, rowIndex }) {
+ if (rowIndex % 2 == 0) {
+ return "statistics-warning-row1";
+ } else {
+ return "statistics-warning-row";
+ }
+ },
+ /** 鏌ヨ璁板綍鍒楄〃 */
+ getList() {
+ this.loading = true;
+ // console.log(this.queryParams)
+ // listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+ listNote(this.queryParams).then(response => {
+ // alert(123)
+ // console.log(response.data)
+ this.noteList = response.data.data;
+
+ this.total = response.data.total;
+ this.loading = false;
+ }
+ );
+ },
+ /** 鏌ヨ绫诲埆淇℃伅 */
+ getCateInfor()
+ {
+ let _this = this
+ getCategory().then(response=>{
+
+ response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
+ _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
+ })
+ })
+ },
+ handleRemove(file) {
+ alert(323)
+ },
+ // 鍙栨秷鎸夐挳
+ cancel() {
+ this.open = false;
+ this.reset();
+ },
+ getRowId(row)
+ {
+ return row.id
+ },
+ // 鍙栨秷鎸夐挳锛堟暟鎹潈闄愶級
+ cancelDataScope() {
+ this.openDataScope = false;
+ this.reset();
+ },
+ // 琛ㄥ崟閲嶇疆
+ reset() {
+ if (this.$refs.menu != undefined) {
+ this.$refs.menu.setCheckedKeys([]);
+ }
+ this.menuExpand = false,
+ this.menuNodeAll = false,
+ this.deptExpand = true,
+ this.deptNodeAll = false,
+ this.form = {
+ roleId: undefined,
+ roleName: undefined,
+ roleKey: undefined,
+ roleSort: 0,
+ status: "0",
+ menuIds: [],
+ deptIds: [],
+ menuCheckStrictly: true,
+ deptCheckStrictly: true,
+ remark: undefined
+ };
+ this.resetForm("form");
+ },
+ /** 鎼滅储鎸夐挳鎿嶄綔 */
+ handleQuery() {
+ this.queryParams.pageNum = 1;
+ this.getList();
+ },
+ /** 閲嶇疆鎸夐挳鎿嶄綔 */
+ resetQuery() {
+ this.dateRange = [];
+ this.resetForm("queryForm");
+ this.handleQuery();
+ },
+ // 澶氶�夋閫変腑鏁版嵁
+ handleSelectionChange(selection) {
+ this.ids = selection.map(item => item.id)
+ console.log(this.ids)
+ this.single = selection.length!=1
+ this.multiple = !selection.length
+ },
+ // //姣忔鏀瑰彉input妗嗗�兼椂灏辨敼鍙榯his.myTableData鐨勫��
+ // inputChange() { //寰幆姣忎竴椤� 鍙content鐨勫�煎惈鏈夎緭鍏ョ殑searchVal鍊硷紝灏卞姞杩沶ewList锛涘弽涔嬶紝灏辨棤涓滆タ鍔犺繘newList
+ // let newlist = this.formDat.filter(
+ // (item) => item.content.indexOf(this.searchVal) > -1
+ // );
+ // this.contactList = newlist;
+ // },
+
+
+ /** 鏂板鎸夐挳鎿嶄綔 */
+ handleAdd() {
+ this.reset();
+ this.open = true;
+ this.title = "娣诲姞涓汉璁颁簨鏈缁嗕俊鎭�";
+ },
+ /** 鏌ョ湅璇︾粏淇℃伅 */
+ handleCheck(row){
+ const id = row.id;
+ this.$router.push("/self/self/memoInfo/" + id);
+ },
+ /** 淇敼鎸夐挳鎿嶄綔 */
+ handleUpdate(row) {
+ const id = row.id;
+ let jd = true
+
+ this.$router.push({
+ path:"/self/self/memoInfo/" + id,
+ query:{
+ detail:jd
+ }
+ });
+ },
+
+
+ handlePictureCardPreview(file) {
+ this.dialogImageUrl = file.url;
+ this.dialogVisible = true;
+ },
+ /** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
+ submitDataScope: function() {
+
+ let ul = this.fileList.map(function (elem){
+ return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ }).join(",")
+ let uls = this.fileListOther.map(function (elem){
+ return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ }).join(",")
+ this.formDat.url = ul+","+uls
+ this.$refs["elForm"].validate(valid => {
+ if (valid) {
+
+ addNote(this.formDat).then(response => {
+ this.$modal.msgSuccess("鏂板鎴愬姛");
+ this.open = false;
+ this.getList();
+ });
+ }
+ });
+ // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
+ Object.keys(this.formDat).forEach(key => {
+ this.formDat[key] = '';
+ });
+ },
+ requestUpload(params)
+ {
+ var file = params.file;
+ var formData = new FormData();
+ formData.append('uploadFile', file);
+ let _this = this
+
+ uploadPic(formData).then(response => {
+ let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
+
+ if(_this.fot.includes(pth) === true)
+ {
+ _this.fileList.push({name:response.data.fileName, "url":response.data.url})
+
+ }
+
+ else{
+ _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+
+ }
+ })
+
+ },
+ /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+ handleDelete(row) {
+ const Ids = row.id || this.ids;
+ this.$modal.confirm('鏄惁纭鍒犻櫎鏁版嵁椤癸紵').then(function() {
+ return delNote(Ids);
+ }).then(() => {
+ this.getList();
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ }).catch(() => {});
+ },
+ /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+ handleExport() {
+ 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`)
+ },
+ /** 瀵煎叆鎿嶄綔*/
+ handleEnport(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' })});
+
+ }
+ }
+};
+</script>
+<style>
+.app-container{
+ background-color: #FEF7FC;
+}
+.el-table__row.statistics-warning-row {
+ background: #E0EEFE;
+
+}
+.el-table__row.statistics-warning-row1 {
+ background: #FFEFF2;
+
+}
+
</style>
diff --git a/ruoyi-ui/src/views/self/memoInfo.vue b/ruoyi-ui/src/views/self/memoInfo.vue
new file mode 100644
index 0000000..21819a2
--- /dev/null
+++ b/ruoyi-ui/src/views/self/memoInfo.vue
@@ -0,0 +1,425 @@
+<template>
+ <div class="app-container">
+ <div class="form-header mt">
+ <h4 class="dt h4">涓汉璁颁簨鏈缁嗕俊鎭� </h4>
+ </div>
+ <div>
+ <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-position="left" label-width="100px">
+ <el-container>
+ <div>
+ <el-container>
+ <el-row>
+ <el-cow :span="8">
+ <el-form-item label="鏃堕棿" prop="happenTime" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="formData.happenTime" placeholder="璇疯緭鍏ユ椂闂�" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-cow>
+ <el-cow :span="8">
+ <el-form-item label="浜虹墿" prop="people" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="formData.people" placeholder="璇疯緭鍏ヤ汉鐗�" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-cow>
+ <el-cow :span="8">
+ <el-form-item label="鍦扮偣" prop="address" label-width="40px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="formData.address" placeholder="璇疯緭鍏ュ湴鐐�" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-cow>
+ <el-cow :span="8">
+ <el-form-item label="浜嬩欢鏍囬" prop="title" label-width="80px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="formData.title" placeholder="璇疯緭鍏ヤ簨浠舵爣棰�" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-cow>
+ <el-cow :span="8">
+ <el-form-item label="澶囨敞" prop="remark" label-width="40px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
+ </el-form-item>
+ </el-cow>
+ </el-row>
+ </el-container>
+ </div>
+
+ </el-container>
+ <h4 class="form-header">鐢靛瓙鏂囦欢 </h4>
+ <el-upload
+ action="#"
+ list-type="picture-card"
+ multiple
+ :http-request="requestUpload"
+ :file-list="fileList"
+ >
+ <i slot="default" class="el-icon-plus"></i>
+ <div slot="file" slot-scope="{file}">
+ <img
+ class="el-upload-list__item-thumbnail"
+ :src="file.url"
+ alt=""
+ style="width: 147px; height: 147px"
+ fit="cover"
+ :preview-src-list="[file.url]"
+ >
+ <span class="el-upload-list__item-actions">
+ <span
+ v-if="isShow"
+ class="el-upload-list__item-preview"
+ @click="handlePictureCardPreview(file)"
+ >
+ <i class="el-icon-zoom-in"></i>
+ </span>
+ <span
+ v-if="isShow"
+ class="el-upload-list__item-delete"
+ @click="handleDownload(file.url)"
+ >
+ <i class="el-icon-download"></i>
+ </span>
+ <span
+ v-if="isShow"
+ 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
+ list-type="picture-card"
+ :on-preview="handleFileCardPreview"
+ :on-remove="handleRemove"
+ :http-request="requestUpload"
+ :show-file-list="true"
+ >
+
+ <i slot="default" class="el-icon-plus"></i>
+ <div slot="file" slot-scope="{file}">
+ <img
+ class="el-upload-list__item-thumbnail"
+ src="../../assets/401_images/401.gif"
+ alt=""
+ style="width: 147px; height: 147px"
+ fit="cover"
+ >
+ <span class="el-upload-list__item-actions">
+ <span
+ v-if="isShow"
+ class="el-upload-list__item-preview"
+ @click="handleFileCardPreview(file)"
+ >
+ <i class="el-icon-zoom-in"></i>
+ </span>
+ <span
+ v-if="isShow"
+ @click="handleRemove(file)"
+ class="el-upload-list__item-delete"
+
+ >
+ <i class="el-icon-download"></i>
+ </span>
+ <span
+ v-if="isShow"
+ class="el-upload-list__item-delete"
+ @click="handleRemoveFile(file)"
+ >
+ <i class="el-icon-delete"></i>
+ </span>
+ </span>
+
+
+ </div>
+
+
+ </el-upload>
+
+ <el-form-item size="large">
+ <el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb">淇敼</el-button>
+ </el-form-item>
+ </el-form>
+ </div>
+ <el-dialog :visible.sync="dialogVisible">
+ <img w-full :src="dialogImageUrl" style="width: 700px; height: 700px" alt="Preview Image" />
+ </el-dialog>
+ </div>
+</template>
+
+<script>
+import {addRole, updateRole} from "@/api/system/role";
+import {blobValidate} from "@/utils/ruoyi";
+import errorCode from "@/utils/errorCode";
+import {Message} from "element-ui";
+import { getNote, updateNote,download,uploadPic} from "@/api/memo/index";
+
+export default {
+ components: {},
+ props: [],
+ data() {
+ return {
+ cdi:"涓汉璁颁簨鏈鎯�",
+ udi:"涓汉璁颁簨鏈鎯�",
+ fot:[".jpg",".jif","png"],
+ fileList:[
+ ],
+ fileListOther:[
+
+ ],
+ dsb:true,
+ btn:false,
+ isShow:true,
+ // 涓浜嬫湰琛ㄦ牸鏁版嵁
+ noteList: [],
+ formData: {
+ //涓汉璁颁簨鏈鎯�
+ id:undefined,
+ happenTime:undefined,
+ people:undefined,
+ address:undefined,
+ title:undefined,
+ remark:undefined,
+ url: undefined,
+ },
+ dialogImageUrl: '',
+ dialogVisible: false,
+ disabled: false,
+ rules: {
+ happenTime: [{
+ required: true,
+ message: '璇烽�夋嫨鏃堕棿',
+ trigger: 'blur'
+ }],
+ people: [{
+ required: true,
+ message: '璇疯緭鍏ヤ汉鐗�',
+ trigger: 'blur'
+ }],
+ address: [{
+ // required: true,
+ message: '璇疯緭鍏ュ湴鐐�',
+ trigger: 'blur'
+ }],
+ title: [{
+ required: true,
+ message: '璇疯緭鍏ヤ簨浠舵爣棰�',
+ trigger: 'blur'
+ }],
+ remark: [{
+ // required: true,
+ message: '璇疯緭鍏ュ娉�',
+ trigger: 'blur'
+ }],
+
+ },
+ typeOptions: [],
+ }
+ },
+ computed: {},
+ watch: {},
+ created() {
+ const id = this.$route.params && this.$route.params.id;
+ let jd;
+ if(this.$route.query.detail!=undefined)
+ {
+ jd = this.$route.query.detail
+ this.btn= jd
+ this.dsb = !jd
+ this.isShow=true
+ document.title = "淇敼涓汉璁颁簨鏈缁嗕俊鎭�";
+ this.$route.meta.title = "淇敼涓汉璁颁簨鏈缁嗕俊鎭�";//鍒楄〃鐨勫悕绉�
+ }
+ else{
+ document.title = "涓汉璁颁簨鏈缁嗕俊鎭�";
+ this.$route.meta.title = "涓汉璁颁簨鏈缁嗕俊鎭�";//鍒楄〃鐨勫悕绉�
+ this.isShow=false
+ }
+
+ let _this = this
+ if (id) {
+ this.loading = true;
+ getNote(id).then((response) => {
+ this.formData = response.data;
+ let paths = response.data.url.split(",");
+ for(let i = 0; i < paths.length; i++)
+ {
+ if(paths[i]!="") {
+
+ let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
+
+ if (_this.fot.includes(pth) === true)
+ _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
+ else {
+ // alert(paths[i])
+ let nms = paths[i].split("\/")
+ let nm = nms[nms.length - 1]
+ _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
+ }
+ }
+ }
+ this.loading = false;
+ });
+ this.getCateInfor()
+
+ }
+ },
+ mounted() {},
+ methods: {
+ /** 鏌ヨ绫诲埆淇℃伅 */
+ // getCateInfor()
+ // {
+ // let _this = this
+ // getCategory().then(response=>{
+ //
+ // response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
+ // _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
+ // })
+ // })
+ // },
+ submitForm() {
+ let ul = this.fileList.map(function (elem){
+ return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ }).join(",")
+ let uls = this.fileListOther.map(function (elem){
+ return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ }).join(",")
+ this.formData.url = ul+","+uls
+
+ this.$refs['elForm'].validate(valid => {
+
+
+ if (valid) {
+ if (this.formData.id != undefined) {
+ updateNote(this.formData).then(response => {
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ // this.open = false;
+ this.btn=false
+ });
+ } else {
+ this.$modal.msgSuccess("淇敼澶辫触");
+
+ }
+ }
+ })
+ },
+ resetForm() {
+ this.$refs['elForm'].resetFields()
+ },
+ handlePreview(file)
+ {
+ let formData = {'path':"/"+file.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")};
+ let lens = formData.path.split(".")
+ let suffix = lens[lens.length-1]
+ download(formData).then(async (response) => {
+ const isLogin = await blobValidate(response);
+ let nt = new Date().getTime()
+ let filename = 'property_'+nt+'.'+suffix
+ const blob = new Blob([response])
+ saveAs(blob, filename)
+ })
+ },
+ handleRemoveFile(file) {
+ for(let i = 0; i < this.fileListOther.length; i++)
+ {
+ if(this.fileListOther[i].url==file.url)
+ this.$delete(this.fileListOther,i);
+ }
+ },
+ handleRemove(file) {
+ for(let i = 0; i < this.fileList.length; i++)
+ {
+ if(this.fileList[i].url==file.url)
+ this.$delete(this.fileList,i);
+ }
+ },
+ handleFileCardPreview(file){
+ this.dialogFileUrl = file.url;
+ const Base64 = require('js-base64').Base64
+ this.desurl = process.env.VUE_APP_BASE_OTHER_API+'onlinePreview?url='+encodeURIComponent(Base64.encode(this.dialogFileUrl));
+ myWindow=window.open(this.desurl,'','width=1200,height=800,top=150,left=300');
+ },
+ handlePictureCardPreview(file) {
+ this.dialogImageUrl = file.url;
+ this.dialogVisible = true;
+ },
+ handleDownload(url) {
+ var formData = {'path':"/"+url.replace(process.env.VUE_APP_BASE_TRUE_API,"")};
+
+ let lens = formData.path.split(".")
+ let suffix = lens[lens.length-1]
+ download(formData).then(async (response) => {
+ const isLogin = await blobValidate(response);
+ let nt = new Date().getTime()
+ let filename = 'doctor_'+nt+'.'+suffix
+ const blob = new Blob([response])
+ saveAs(blob, filename)
+ })
+ },
+ handleEdit()
+ {
+ this.dsb = false
+ // this.btn = true
+ this.isShow=false
+ },
+ 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})
+
+ }
+ })
+
+ },
+
+ /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+ handleExport() {
+ this.download('/zSelfNote/export', {
+ ...this.queryParams
+ }, `zSelfNote${new Date().getTime()}.xlsx`)
+ }
+
+ }
+}
+
+</script>
+
+<style scoped>
+.app-container{
+ background-color: #FEF7FC;
+}
+.mt
+{
+ position: relative;
+}
+.dt{
+ display: block;
+
+}
+.pt{
+ right: 10px;
+ top:-3px;
+ display: block;
+ position: absolute;
+}
+</style>
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index 28f4317..2219953 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -1238,9 +1238,8 @@
// },
//涓汉璁颁簨鏈�
- toMemo(row){
- const id = row.id;
- this.$router.push("/self/self/memo/" + id);
+ toMemo(){
+ this.$router.push("/self/self/memo/" + this.individualList.userId);
},
/** 鏌ョ湅璇︾粏淇℃伅 */
--
Gitblit v1.9.1