linwenling
2023-07-31 01adce6d9fc82f29cc2a29b35ee727b642284715
隐私、财产的修改
4个文件已修改
43 ■■■■■ 已修改文件
ruoyi-ui/src/router/index.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/secret/index.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/selfeconomy/index.vue 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/router/index.js
@@ -450,7 +450,7 @@
    component: Layout,
    // permissions: [],
    hidden: true,
    permissions: ['self:secret:info'],
    permissions: ['person:secret:info'],
    children: [
      {
ruoyi-ui/src/views/secret/index.vue
@@ -110,10 +110,10 @@
          <template slot-scope="scope">{{scope.row.validityDate? scope.row.validityDate: '————'}}</template>
        </el-table-column>
        <el-table-column label="密码" prop="password" sortable width="100" />
        <el-table-column label="是否开启指纹" prop="isFinger" sortable width="120" >
        <el-table-column label="是否开启指纹" prop="isFinger" sortable width="130" >
            <template slot-scope="scope">{{scope.row.isFinger===1 ?'是': '否'}}</template>
        </el-table-column>>
        <el-table-column label="是否开启人脸" prop="isFace" sortable width="120" >
        <el-table-column label="是否开启人脸" prop="isFace" sortable width="130" >
            <template slot-scope="scope">{{scope.row.isFace===1 ?'是': '否'}}</template>
        </el-table-column>
        <el-table-column label="私有/公有" prop="isPrivate" sortable width="100" >
@@ -203,7 +203,7 @@
            <el-date-picker
              v-model='formDat.validityDate'
              type='date'
              placeholder='选择日期'
              placeholder='选择有效期'
            ></el-date-picker>
          </el-form-item>
          <el-form-item label="密码" prop="password">
@@ -318,7 +318,7 @@
  //在system/note/index.js中导入接口函数  --接好了
  import {listSecret,enload,getEconomyInfo,delSecret, addSecret, uploadPic} from "@/api/secret/index";
  import {listSecret,enload,delSecret, addSecret, uploadPic} from "@/api/secret/index";
  export default {
    name: "Role",
@@ -430,7 +430,7 @@
          }],
          validityDate: [{
            // required: true,
            required: true,
            message: '请选择有效期',
            trigger: 'change'
          }],
ruoyi-ui/src/views/selfeconomy/index.vue
@@ -68,6 +68,16 @@
            <i slot="prefix" class="el-input__icon el-icon-search"></i>
          </el-input>
        </el-form-item>
        <el-form-item label="财产名称" prop="incomeName">
          <el-input
            v-model="queryParams.incomeName"
            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-cntainer>
          <el-col :span="9" >
            <el-form-item>
@@ -150,7 +160,7 @@
        <el-table-column label="财产类别" prop="type" sortable width="120" align="center">
          <template slot-scope="scope">{{scope.row.type? scope.row.type: '————'}}</template>
        </el-table-column>
        <el-table-column label="获得方式" prop="incomeName" sortable :show-overflow-tooltip="true" width="120" align="center" >
        <el-table-column label="财产名称" prop="incomeName" sortable :show-overflow-tooltip="true" width="120" align="center" >
          <template slot-scope="scope">{{scope.row.incomeName? scope.row.incomeName: '————'}}</template>
        </el-table-column>
        <el-table-column label="价值(金额)" prop="price" sortable width="140" align="center" >
@@ -252,8 +262,8 @@
            <el-input v-model="formDat.type" placeholder="请输入财产类别" clearable :style="{width: '100%'}" >
            </el-input>
          </el-form-item>
          <el-form-item label="收支名称" prop="incomeName">
            <el-input v-model="formDat.incomeName" placeholder="请输入收支名称" clearable :style="{width: '100%'}" >
          <el-form-item label="财产名称" prop="incomeName">
            <el-input v-model="formDat.incomeName" placeholder="请输入财产名称" clearable :style="{width: '100%'}" >
            </el-input>
          </el-form-item>
          <el-form-item label="金额" prop="price">
@@ -445,6 +455,7 @@
          incomeName:undefined,
          timeLimit:undefined,
          happenTime:undefined,
        },
        // searchVal:"",
@@ -742,20 +753,20 @@
        if(Ids.length==0)
        {
          this.download('zIdea/export', {
          this.download('zProperty/export', {
            ...this.queryParams
          }, `zIdea_${new Date().getTime()}.xlsx`)
          }, `zProperty_${new Date().getTime()}.xlsx`)
        }else{
          this.download('zIdea/export1/'+Ids, {
          }, `zIdea_${new Date().getTime()}.xlsx`)
          this.download('zProperty/export1/'+Ids, {
          }, `zProperty_${new Date().getTime()}.xlsx`)
        }
      },
      /** 导入模板下载按钮操作 */
      handleExportModel() {
        this.download('/zIdea/model', {
        }, `zIdea_model_${new Date().getTime()}.xlsx`)
        this.download('/zProperty/model', {
        }, `zProperty_model_${new Date().getTime()}.xlsx`)
      },
      /** 导入操作*/
ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
@@ -5,7 +5,7 @@
      </div>
      <div style="padding-left:15px">
        <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-position="left" label-width="120px">
        <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-position="left" label-width="140px">
          <el-container>
            <el-row :span="12">