linwenling
2023-08-08 b3ddacf9a9742276e76c0aa8bfa67fcdd6e1d7fe
新增 财产备忘本
3个文件已修改
2个文件已添加
513 ■■■■■ 已修改文件
ruoyi-ui/src/router/index.js 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/note/memo.vue 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/secret/memo.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/selfeconomy/memo.vue 465 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/router/index.js
@@ -424,7 +424,23 @@
      }
    ]
  },
  //财产备忘本
  {
    path: '/self/selfeconomy',
    component: Layout,
    // permissions: [],
    hidden: true,
    permissions: ['person:selfeconomy:memo'],
    children: [
      {
        path: 'memo/:id(\\d+)',
        component: () => import('@/views/selfeconomy/memo'),
        name: 'memo',
        meta: { title: '财产备忘本',activeMenu: '/self/zProperty'}
      }
    ]
  },
  //百年心愿
  {
    path: '/self/wish',
ruoyi-ui/src/views/note/memo.vue
ruoyi-ui/src/views/secret/memo.vue
@@ -347,6 +347,10 @@
          });
        }
      });
      //清空formDat对象的数据
      Object.keys(this.formDat).forEach(key => {
        this.formDat[key] = '';
      });
    },
    requestUpload(params)
    {
ruoyi-ui/src/views/selfeconomy/memo.vue
New file
@@ -0,0 +1,465 @@
<template>
  <div class="app-container" style="opacity: 1;">
    <div class="box1"><h2>备忘本</h2></div>
    <el-button class="button1" size="mini" type="text"  @click="handleAdd"  v-hasPermi="['system:role:add']">
      <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn> </el-button>
    <el-table v-loading="loading" :data="memoList"  @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;width: 60%;">
      <el-table-column  label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="150"/>
      <el-table-column label="时间" prop="happenTime" sortable width="180px" align="center">
        <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '————'}}</template>
      </el-table-column>
      <el-table-column label="内容" prop="content" sortable width="180px" />
      <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="['familymodel:economy:info']"
          >修改</el-button>
          <el-button
            size="mini"
            type="text"
            class="button_delete"
            @click="handleDelete(scope.row)"
            v-hasPermi="['system:role:remove']"
          > <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn></el-button>
        </template>
      </el-table-column>
    </el-table>
    <pagination
      v-show="total>0"
      :total="total"
      :page.sync="queryParams.pageNum"
      :limit.sync="queryParams.pageSize"
      @pagination="getList"
      style="background: #FEF7FC;"
    />
    <!-- 添加或修改资产信息配置对话框 -->
    <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="content">
          <el-input v-model="formDat.content" placeholder="请输入内容" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
      </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>
import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
//在system/note/index.js中导入接口函数  --接好了
import {addNote,listNote,enload,delNote, uploadPic} from "@/api/allmemo/index";
import { TimeSelect } from "element-ui";
export default {
  name: "Role",
  dicts: ['sys_normal_disable'],
  data() {
    return {
      // 遮罩层
      disabled: false,
      loading: true,
      formData:[],
      // 选中数组
      ids: [],
      // 非单个禁用
      single: true,
      // 非多个禁用
      multiple: true,
      // 显示搜索条件
      showSearch: true,
      // 总条数
      total: 0,
      // 家大事记表格数据
      memoList: [],
      // 弹出层标题
      title: "",
      // 是否显示弹出层
      open: false,
      // 是否显示弹出层(数据权限)
      openDataScope: false,
      menuExpand: false,
      menuNodeAll: false,
      deptExpand: true,
      deptNodeAll: false,
      // 日期范围
      dateRange: [],
      // 数据范围选项
      fot:[".jpg",".jif"],
      fileList:[
      ],
      fileListOther:[
      ],
      dsb:true,
      btn:false,
      formDat: {
        content: undefined,
        happenTime: undefined,
        fid:2026,
        cid:undefined,
      },
      // 菜单列表
      menuOptions: [],
      // 部门列表
      deptOptions: [],
      // 查询参数
      queryParams: {
        pageNum: 1,
        pageSize: 10,
      },
      // 表单参数
      form: {},
      defaultProps: {
        children: "children",
        label: "label"
      },
      // 表单校验
      rules: {
        happenTime: [{
          required: true,
          message: '请选择日期选择',
          trigger: 'change'
        }],
        content: [{
          required: true,
          message: '请输入内容',
          trigger: 'blur'
        }],
        fid: [{
          required: true,
          // message: '请输入内容',
          // trigger: 'blur'
        }],
        cid: [{
          required: true,
          // message: '请输入内容',
          // trigger: 'blur'
        }],
      },
      typeOptions: [],
    };
  },
  created() {
    const cid = this.$route.params && this.$route.params.id;
    this.getList(2026,cid);
  },
  methods: {
    // 取消按钮
    cancelData() {
      this.open = false;
      this.reset();
    },
    //隔行变色
    tableRowClassName({ row, rowIndex }) {
      if (rowIndex % 2 == 0) {
        return "statistics-warning-row1";
      } else {
        return "statistics-warning-row";
      }
    },
    /** 查询角色列表 */
    getList(fid,cid) {
      this.loading = true;
      this.queryParams.cid = cid
      this.queryParams.fid = fid
      this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
      this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
      listNote(cid, 2026).then(response => {
          this.memoList = response.data;
          console.log(this.memoList)
          this.total = response.data.total;
          this.loading = false;
        }
      );
    },
    handleRemove(file) {
      for(let i = 0; i < this.fileListOther.length; i++)
      {
        if(this.fileListOther[i].url==file.url)
          this.$delete(this.fileListOther,i);
      }
    },
    // 取消按钮
    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() {
      const fid = 2031;
      const cid = this.$route.params && this.$route.params.id;
      this.queryParams.pageNum = 1;
      this.getList(fid,cid);
    },
    /** 重置按钮操作 */
    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
    },
    /** 新增按钮操作 */
    handleAdd() {
      this.reset();
      this.open = true;
      this.title = "新增备忘本";
    },
    /** 修改按钮操作 */
    handleUpdate(row) {
      const id = row.id;
      let jd = true
      this.$router.push({
        path:"/self/travel/travelInfo/" + id,
        query:{
          detail:jd
        }
      });
    },
    handlePictureCardPreview(file) {
      this.dialogImageUrl = file.url;
      this.dialogVisible = true;
    },
    /** 提交按钮(数据权限) */
    submitDataScope: function() {
      const cid = this.$route.params && this.$route.params.id;
      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.fid = 2026;
      this.formDat.cid = cid ;
      this.formDat.url = ul+","+uls
      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] = '';
      });
    },
    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 id = row.id || this.id;
      const fid = 2026;
      const cid = this.$route.params && this.$route.params.id;
      this.$modal.confirm('是否确认删除所选数据项?').then(function() {
        return delNote(id);
      }).then(() => {
        // this.getList(fid,cid);
        this.$modal.msgSuccess("删除成功");
        this.getList(fid,cid);
      }).catch(() => {});
    },
    /** 导出按钮操作 */
    handleExport() {
      const Ids = this.ids;
      if(Ids.length==0)
      {
        this.download('/zfEconomy/export', {
          ...this.queryParams
        }, `zfEconomy_${new Date().getTime()}.xlsx`)
      }else
      {
        this.download('/zfEconomy/export1/'+Ids, {
        }, `zfEconomy_${new Date().getTime()}.xlsx`)
      }
    }
    ,
    handleExportTemplate(){
      this.download('/zfEconomy/model', {
      }, `zfEconomy_${new Date().getTime()}.xlsx`)
    },
    /** 导入操作*/
    handleEnport(params){
      var file = params.file;
      var formData = new FormData();
      formData.append('excelImport', file);
      let _this = this
      alert(file)
      enload(formData).then(response => {
        _this.getList();
        Message({ message: "导入成功", type: 'warning' })
      }).catch(err)
      {
        Message({ message: "导入失败", type: 'error' })
      }
    }
  },
  //  弹窗
  handleShow(scope){
    this.openDataScope = true
    this.getList()
  }
};
</script>
<style>
.el-table__row.statistics-warning-row {
  background: #E0EEFE;
}
.el-table__row.statistics-warning-row1 {
  background: #FFEFF2;
}
.button1 {
  background:center no-repeat url('../../assets/icons/add1.png') ;
  /* margin-left: 69.5vw; */
  margin-left: 780px;
}
.button_delete {
  background: center no-repeat url('../../assets/images/删除2.png') ;
  /* margin-left: 66vw; */
  width: 5px;
  /* background: #000000; */
}
.box1,.button1{
  display: inline-block;
}
</style>
ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
@@ -1,11 +1,19 @@
<template>
    <div class="app-container">
      <div class="form-header mt">
        <h4 class="dt h4">个人财产详细信息 </h4>
      <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="checkNote()" 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>
          </el-button>
        </div>
      </h1>
      </div>
      <div style="padding-left:15px">
        <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-position="left" label-width="140px">
      <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-position="left" label-width="160px">
          <el-container>
            <el-row :span="12">
@@ -41,7 +49,7 @@
                </el-form-item>
              </el-cow>
              <el-cow >
                <el-form-item label="变更/注销" prop="isChange" label-width="80px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
              <el-form-item label="变更/注销" prop="isChange" label-width="100px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                  <el-input v-model="formData.isChange" placeholder="请输入变更/注销" clearable :style="{width: '100%'}" :disabled="dsb">
                  </el-input>
                </el-form-item>
@@ -488,7 +496,14 @@
        this.download('/zIdea/export', {
          ...this.queryParams
        }, `zIdea_${new Date().getTime()}.xlsx`)
      }
    },
    //查看备忘本
    checkNote(row){
      // const id =row.id;
      const id = this.$route.params && this.$route.params.id;
      // const fid =2031
      this.$router.push("/self/selfeconomy/memo/" + id );
    },
    }
  }
@@ -513,6 +528,9 @@
    display: block;
    position: absolute;
  }
.form{
  background:center/11% no-repeat url('../../assets/icons/form.png') ;
}
  .form_item{
    font-size: 12px;
    font-family: Microsoft YaHei-Regular, Microsoft YaHei;