linwenling
2023-09-26 20b237a429542bce0eb6e758bcc795796cf61261
备忘本
4个文件已修改
340 ■■■■ 已修改文件
ruoyi-ui/src/views/note/memo.vue 112 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/secret/index.vue 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/secret/memo.vue 95 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/selfeconomy/memo.vue 109 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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,9 +41,8 @@
      style="background: #FEF7FC;"
    />
    <!-- 添加或修改资产信息配置对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
    <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-form-item label="时间" prop="happenTime">
@@ -62,10 +61,11 @@
      </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 @@
//在system/note/index.js中导入接口函数  --接好了
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为false,以便下次点击新增时为新增操作
      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);
            resetQuery();
          });
        }
      });
      //清空formDat对象的数据
      Object.keys(this.formDat).forEach(key => {
        this.formDat[key] = '';
      });
            this.getList(2007,cid);
          });
        }
      });
    },
    requestUpload(params)
    {
ruoyi-ui/src/views/secret/index.vue
@@ -1,7 +1,18 @@
<template>
    <div class="app-container" style="opacity: 1;">
      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
        <el-form-item label="" prop="phone wx qq timeLimit type happenTime">
          <el-input
            v-model="queryParams.searchText"
            placeholder="在“财产”中搜索"
            clearable
            style="width: 240px"
            @keyup.enter.native="handleQuer1(queryParams)">
            <i slot="prefix" class="el-input__icon el-icon-search"></i>
          </el-input>
        </el-form-item>
        </el-form-item>
        <el-form-item label="时间" prop="happenTime">
          <el-date-picker
            v-model="dateRange"
@@ -16,6 +27,7 @@
            end-placeholder="结束日期"
          ></el-date-picker>
        </el-form-item>
        <el-form-item label="类别" prop="type">
          <el-input
            v-model="queryParams.type"
@@ -38,6 +50,15 @@
                   height: 35px;
                   border-radius: 16px 16px 16px 16px;
                   opacity: 0.5;"
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
        <el-form-item label="期限" prop="timeLimit">
          <el-input
            v-model="queryParams.timeLimit"
            placeholder="请输入期限"
            clearable
            style="width: 240px"
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
@@ -398,7 +419,7 @@
          type:undefined,
          accNo:undefined,
          happenTime:undefined,
          useFor:undefined,
          timeLimit:undefined,
        },
        // 表单参数
@@ -593,6 +614,7 @@
        this.queryParams.pageNum = 1;
        this.getList();
      },
      /** 重置按钮操作 */
      resetQuery() {
        this.dateRange = [];
ruoyi-ui/src/views/secret/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
@@ -43,7 +43,8 @@
    <!-- 添加或修改资产信息配置对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
    <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-form-item label="时间" prop="happenTime">
@@ -62,10 +63,11 @@
      </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,7 +87,7 @@
//在system/note/index.js中导入接口函数  --接好了
import {addNote,listNote,enload,delNote, uploadPic} from "@/api/allmemo/index";
import {addNote, listNote, enload, delNote, uploadPic, updateNote} from "@/api/allmemo/index";
import { TimeSelect } from "element-ui";
export default {
@@ -93,6 +95,7 @@
  dicts: ['sys_normal_disable'],
  data() {
    return {
      isEdit1:false,
      // 遮罩层
      disabled: false,
      loading: true,
@@ -220,7 +223,7 @@
      listNote(cid, 2031).then(response => {
          this.memoList = response.data;
         // alert(response.data.total)
          this.total = response.data.total;
         //  this.total = response.data.total;
         // alert(this.total)
          this.loading = false;
        }
@@ -232,6 +235,66 @@
        if(this.fileListOther[i].url==file.url)
          this.$delete(this.fileListOther,i);
      }
    },
    submitDataScope6: function() {
      const cid = this.$route.params && this.$route.params.id;
      const fid =2031;
      this.formDat.fid = 2031;
      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(2031,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(2031,cid);
            }).catch(error => {
              console.log(error);
              this.open = false;
            });
          }
        }
      });
      // 重置isEdit为false,以便下次点击新增时为新增操作
      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)
    },
    // 取消按钮
@@ -306,14 +369,8 @@
    /** 修改按钮操作 */
    handleUpdate(row) {
      const id = row.id;
      let jd = true
      this.$router.push({
        path:"/self/travel/travelInfo/" + id,
        query:{
          detail:jd
        }
      });
    },
@@ -340,17 +397,17 @@
          addNote(this.formDat).then(response => {
            this.$modal.msgSuccess("新增成功");
            this.open = false;
            this.getList(this.formDat.fid,this.formDat.cid);
            resetQuery();
          });
        }
      });
      //清空formDat对象的数据
      Object.keys(this.formDat).forEach(key => {
        this.formDat[key] = '';
      });
            this.getList(2031,cid);
          });
        }
      });
    },
    requestUpload(params)
    {
ruoyi-ui/src/views/selfeconomy/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
@@ -43,7 +43,8 @@
    <!-- 添加或修改资产信息配置对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
    <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-form-item label="时间" prop="happenTime">
@@ -62,10 +63,11 @@
      </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,7 +87,7 @@
//在system/note/index.js中导入接口函数  --接好了
import {addNote,listNote,enload,delNote, uploadPic} from "@/api/allmemo/index";
import {addNote, listNote, enload, delNote, uploadPic, updateNote} from "@/api/allmemo/index";
import { TimeSelect } from "element-ui";
export default {
@@ -93,6 +95,7 @@
  dicts: ['sys_normal_disable'],
  data() {
    return {
      isEdit1:false,
      // 遮罩层
      disabled: false,
      loading: true,
@@ -197,7 +200,18 @@
      this.open = false;
      this.reset();
    },
    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)
    },
    //隔行变色
    tableRowClassName({ row, rowIndex }) {
      if (rowIndex % 2 == 0) {
@@ -220,8 +234,9 @@
      listNote(cid, 2026).then(response => {
          this.memoList = response.data;
          console.log(this.memoList)
          this.total = response.data.total;
          // this.total = response.data.total;
          this.loading = false;
        }
      );
    },
@@ -232,7 +247,55 @@
          this.$delete(this.fileListOther,i);
      }
    },
    //个人自传的保存
    submitDataScope6: function() {
      const cid = this.$route.params && this.$route.params.id;
      const fid =2026;
      this.formDat.fid = 2026;
      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(2026,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(2026,cid);
            }).catch(error => {
              console.log(error);
              this.open = false;
            });
          }
        }
      });
      // 重置isEdit为false,以便下次点击新增时为新增操作
      this.isEdit1 = false;
    },
    // 取消按钮
    cancel() {
      this.open = false;
@@ -299,18 +362,12 @@
      this.title = "新增备忘本";
    },
    /** 修改按钮操作 */
    handleUpdate(row) {
      const id = row.id;
      let jd = true
      this.$router.push({
        path:"/self/travel/travelInfo/" + id,
        query:{
          detail:jd
        }
      });
    },
    // /** 修改按钮操作 */
    // handleUpdate(row) {
    //   const id = row.id;
    //
    //
    // },
    handlePictureCardPreview(file) {
@@ -329,24 +386,24 @@
      this.formDat.fid = 2026;
      this.formDat.cid = cid ;
      this.formDat.url = ul+","+uls
      console.log(this.formDat)
      // debugger
      this.$refs["elForm"].validate(valid => {
        if (valid) {
          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);
            resetQuery();
          });
        }
      });
      //清空formDat对象的数据
      Object.keys(this.formDat).forEach(key => {
        this.formDat[key] = '';
      });
            this.getList(2026,cid);
          });
        }
      });
    },
    requestUpload(params)
    {