From 20b237a429542bce0eb6e758bcc795796cf61261 Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期二, 26 九月 2023 20:35:36 +0800
Subject: [PATCH] 备忘本

---
 ruoyi-ui/src/views/note/memo.vue |  138 +++++++++++++++++++++++++++++++++------------
 1 files changed, 101 insertions(+), 37 deletions(-)

diff --git a/ruoyi-ui/src/views/note/memo.vue b/ruoyi-ui/src/views/note/memo.vue
index 0fba3b3..5dd578a 100644
--- a/ruoyi-ui/src/views/note/memo.vue
+++ b/ruoyi-ui/src/views/note/memo.vue
@@ -18,7 +18,7 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
+            @click="editAutobiography(scope.row)"
             v-hasPermi="['familymodel:economy:info']"
           >淇敼</el-button>
           <el-button
@@ -41,31 +41,31 @@
       style="background: #FEF7FC;"
     />
 
-    <!-- 娣诲姞鎴栦慨鏀硅祫浜т俊鎭厤缃璇濇 -->
+    <el-dialog :title="isEdit1 ? '缂栬緫' : '鏂板'" :visible.sync="open" width="900px" append-to-body>
+      <el-col >
+        <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
 
-    <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='閫夋嫨鏃ユ湡'
+            ></el-date-picker>
+          </el-form-item>
 
-        <el-form-item label="鏃堕棿" prop="happenTime">
-          <el-date-picker
-            v-model='formDat.happenTime'
-            type='date'
-            placeholder='閫夋嫨鏃ユ湡'
-          ></el-date-picker>
-        </el-form-item>
-
-        <el-form-item label="鍐呭" prop="content">
-          <el-input v-model="formDat.content" placeholder="璇疯緭鍏ュ唴瀹�" clearable :style="{width: '100%'}" >
-          </el-input>
-        </el-form-item>
+          <el-form-item label="鍐呭" prop="content">
+            <el-input v-model="formDat.content" placeholder="璇疯緭鍏ュ唴瀹�" clearable :style="{width: '100%'}" >
+            </el-input>
+          </el-form-item>
 
 
-      </el-form>
+        </el-form>
 
+      </el-col>
       <h4 class="form-header"> </h4>
 
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitDataScope">纭� 瀹�</el-button>
+        <el-button type="primary" @click="submitDataScope6">淇� 瀛�</el-button>
         <el-button @click="cancelData">鍙� 娑�</el-button>
       </div>
     </el-dialog>
@@ -85,20 +85,23 @@
 
 
 //鍦╯ystem/note/index.js涓鍏ユ帴鍙e嚱鏁�  --鎺ュソ浜�
-import {addNote,listNote,enload,delNote, uploadPic} from "@/api/allmemo/index";
+import {addNote,listNote,updateNote,delNote, uploadPic} from "@/api/allmemo/index";
 import { TimeSelect } from "element-ui";
+import {addAutobiography, updateAutobiography} from "@/api/self";
 
 export default {
   name: "Role",
   dicts: ['sys_normal_disable'],
   data() {
     return {
+      isEdit1:false,
       // 閬僵灞�
       disabled: false,
       loading: true,
       formData:[],
       // 閫変腑鏁扮粍
       ids: [],
+      id:undefined,
       // 闈炲崟涓鐢�
       single: true,
       // 闈炲涓鐢�
@@ -108,7 +111,12 @@
       // 鎬绘潯鏁�
       total: 0,
       // 瀹跺ぇ浜嬭琛ㄦ牸鏁版嵁
-      memoList: [],
+      memoList: {
+        id:undefined,
+        content: undefined,
+        happenTime: undefined,
+        fid:2007,
+        cid:undefined,},
       // 寮瑰嚭灞傛爣棰�
       title: "",
       // 鏄惁鏄剧ず寮瑰嚭灞�
@@ -131,7 +139,7 @@
       dsb:true,
       btn:false,
       formDat: {
-
+        id:undefined,
         content: undefined,
         happenTime: undefined,
         fid:2007,
@@ -192,6 +200,69 @@
   },
   methods: {
 
+    //涓汉鑷紶鐨勪繚瀛�
+    submitDataScope6: function() {
+      const cid = this.$route.params && this.$route.params.id;
+      const fid =2007;
+      this.formDat.fid = 2007;
+      this.formDat.cid = cid ;
+      console.log(this.formDat)
+      console.log(this.isEdit1)
+      this.$refs["elForm"].validate(valid => {
+        if (valid) {
+          if (this.isEdit1) {
+            // 鎵ц淇敼鎿嶄綔
+            updateNote(this.formDat).then(response => {
+              console.log("1")
+              this.$modal.msgSuccess("淇敼鎴愬姛");
+              this.open = false;
+              //娓呯┖formDat瀵硅薄鐨勬暟鎹�
+              Object.keys(this.formDat).forEach(key => {
+                this.formDat[key] = '';
+              });
+              this.isEdit1 = false;
+              this.getList(2007,cid);
+            }).catch(error => {
+              console.log(error);
+              this.isEdit1 = false;
+              this.open = false;
+            });
+          } else {
+            // 鎵ц鏂板鎿嶄綔
+            addNote(this.formDat).then(response => {
+              // this.formDat.term = selectedOption.label;
+              this.$modal.msgSuccess("鏂板鎴愬姛");
+              this.open = false;
+              //娓呯┖formDat瀵硅薄鐨勬暟鎹�
+              Object.keys(this.formDat).forEach(key => {
+                this.formDat[key] = '';
+              });
+              this.getList(2007,cid);
+            }).catch(error => {
+              console.log(error);
+              this.open = false;
+            });
+          }
+        }
+      });
+
+      // 閲嶇疆isEdit涓篺alse锛屼互渚夸笅娆$偣鍑绘柊澧炴椂涓烘柊澧炴搷浣�
+      this.isEdit1 = false;
+    },
+
+    editAutobiography(row) {
+      const id = row.id;
+      console.log(id)
+      console.log(row.content)
+      this.isEdit1 = true;
+      this.formDat.cid = row.cid;
+      this.formDat.id = row.id;
+      this.formDat.happenTime = row.happenTime;
+      this.formDat.content = row.content;
+      this.open = true;
+      console.log(this.formDat)
+      },
+
     // 鍙栨秷鎸夐挳
     cancelData() {
       this.open = false;
@@ -220,7 +291,6 @@
       listNote(cid, 2007).then(response => {
           this.memoList = response.data;
           console.log(this.memoList)
-          this.total = response.data.total;
           this.loading = false;
         }
       );
@@ -298,8 +368,9 @@
     /** 鏂板鎸夐挳鎿嶄綔 */
     handleAdd() {
       this.reset();
+      this.isEdit1=false;
       this.open = true;
-      this.title = "鏂板闅愮澶囧繕鏈�";
+
     },
 
     /** 淇敼鎸夐挳鎿嶄綔 */
@@ -307,12 +378,7 @@
       const id = row.id;
       let jd = true
 
-      this.$router.push({
-        path:"/self/travel/travelInfo/" + id,
-        query:{
-          detail:jd
-        }
-      });
+
     },
 
 
@@ -340,18 +406,16 @@
           addNote(this.formDat).then(response => {
             this.$modal.msgSuccess("鏂板鎴愬姛");
             this.open = false;
-            // this.queryParams.cid = cid
-            // this.queryParams.fid = fid
-            this.getList(this.formDat.fid,this.formDat.cid);
+            //娓呯┖formDat瀵硅薄鐨勬暟鎹�
+            Object.keys(this.formDat).forEach(key => {
+              this.formDat[key] = '';
+            });
+            this.getList(2007,cid);
 
-            resetQuery();
           });
         }
       });
-      //娓呯┖formDat瀵硅薄鐨勬暟鎹�
-      Object.keys(this.formDat).forEach(key => {
-        this.formDat[key] = '';
-      });
+
     },
     requestUpload(params)
     {

--
Gitblit v1.9.1