From 4059bcfe132b41a73adfc5ac11284a475485c4a1 Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期二, 18 七月 2023 21:24:59 +0800
Subject: [PATCH] 修改成长经历阅历中证件情况新增弹窗中开始时间和结束时间的输入方式

---
 ruoyi-ui/src/views/self/show.vue |    9 ++--
 ruoyi-ui/src/api/memo/index.js   |   63 +++++++++++++++++++++++++++++++
 ruoyi-ui/src/router/index.js     |    2 
 3 files changed, 68 insertions(+), 6 deletions(-)

diff --git a/ruoyi-ui/src/api/memo/index.js b/ruoyi-ui/src/api/memo/index.js
index 543ea86..612801c 100644
--- a/ruoyi-ui/src/api/memo/index.js
+++ b/ruoyi-ui/src/api/memo/index.js
@@ -1 +1,64 @@
 import request from '@/utils/request'
+
+// 鏌ヨ鎵�鏈夎褰�
+export function listNote(query) {
+  return request({
+    url: '/zSelfNote/all',
+    method: 'get',
+    params: query
+  })
+}
+
+//鏂板璁板綍
+export function addNote(data)
+{
+  return request({
+    url: '/zSelfNote',
+    method: 'post',
+    data: data
+  })
+}
+
+// 鍒犻櫎璁板綍
+export function delNote(ids) {
+  return request({
+    url: '/zSelfNote/' + ids,
+    method: 'delete'
+  })
+}
+
+//淇敼璁板綍
+export function updateNote(data) {
+  return request({
+    url: '/zSelfNote',
+    method: 'put',
+    data: data
+  })
+}
+
+// //涓婁紶鏂囦欢
+// export function uploadPic(data) {
+//   return request({
+//     url: '/common/upload',
+//     method: 'post',
+//     data: data
+//   })
+// }
+// //涓嬭浇鏂囦欢
+// export function download(data) {
+//   return request({
+//     url: '/common/downLoadFile',
+//     method: 'get',
+//     params: data,
+//     responseType: 'blob'
+//   })
+// }
+// //涓婁紶鏂囦欢
+// export function enload(data) {
+//   return request({
+//     url: '/zfDoctor/importData',
+//     method: 'post',
+//     data: data
+//   })
+// }
+
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index d48c6de..a840dff 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -325,7 +325,7 @@
         path: 'memo/:id(\\d+)',
         component: () => import('@/views/self/memo'),
         name: 'memo',
-        meta: { title: '涓汉璁颁簨鏈�',activeMenu: '/self/zSelfNote'}
+        meta: { title: '涓汉璁颁簨鏈�'}
       }
     ]
   },
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index e4a3978..28f4317 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -9,7 +9,7 @@
     <h1 style="font-size:21px;padding-top:30px;display: flex;justify-content: space-between;align-items: center;">
       <span>涓汉绠�鍘�</span>
       <div   style="display: flex; align-items: center;">
-        <el-button size="mini" type="text" @click="toMemo">
+        <el-button size="mini" type="text" @click="toMemo" v-hasPermi="['person:information:memo']">
           <div class="form" ><el-icon  style="padding-right:110px;"></el-icon>
           <span class="text" style="width: 69px;height: 26px;font-size: 16px;
             font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">涓汉璁颁簨鏈�</span></div>
@@ -634,11 +634,10 @@
           </el-input>
         </el-form-item>
         <el-form-item label="寮�濮嬫棩鏈�" prop="startTime">
-          <el-input v-model="formDat.startTime" placeholder="璇疯緭鍏ュ紑濮嬫棩鏈�" clearable :style="{width: '100%'}" ></el-input>
+          <el-input v-model="formDat.startTime" type='date' placeholder='閫夋嫨鏃ユ湡' clearable :style="{width: '100%'}" ></el-input>
         </el-form-item>
         <el-form-item label="缁撴潫鏃ユ湡" prop="endTime">
-          <el-input v-model="formDat.endTime" placeholder="璇疯緭鍏ョ粨鏉熸棩鏈�" clearable :style="{width: '100%'}" >
-          </el-input>
+          <el-input v-model="formDat.endTime" type='date' placeholder='閫夋嫨鏃ユ湡' clearable :style="{width: '100%'}" ></el-input>
         </el-form-item>
          </el-form>
       <h4 class="form-header"> </h4>
@@ -1240,7 +1239,7 @@
 
     //涓汉璁颁簨鏈�
     toMemo(row){
-      const id = row.userId;
+      const id = row.id;
       this.$router.push("/self/self/memo/" + id);
     },
 

--
Gitblit v1.9.1