成长经历阅历的新增以弹窗形式展示（但还有一点问题正在解决），可删除单独的一条数据 新增荣誉证书详情页面（但数据调不出来）

Tcsm

2023-05-27 97819279661596858ab40a40d321db61f297df93

 ruoyi-ui/src/views/note/index.vue

@@ -2,19 +2,14 @@
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
      <el-form-item label="类型" prop="type">
        <el-select
        <el-input
          v-model="queryParams.type"
          placeholder="所有类型"
          placeholder="请输入类型"
          clearable
          style="width: 240px"
        >
          <el-option
            v-for="dict in typeOptions"
            :key="dict.value"
            :label="dict.label"
            :value="dict.value"
          />
        </el-select>
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
        <el-form-item label="标题" prop="title">
          <el-input
            v-model="queryParams.title"
@@ -51,7 +46,7 @@
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
      </el-form-item>

      <el-form-item label="发生时间">
        <el-date-picker
          v-model="dateRange"
@@ -111,7 +106,7 @@
          plain
          icon="el-icon-download"
          size="mini"
          @click="handleExport"
          @click="handleExportTemplate"
          v-hasPermi="['family:note:export']"
        >导入模板下载</el-button>
      </el-col>
@@ -132,8 +127,8 @@
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>

    <el-table v-loading="loading" :data="propertyList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
      <el-table-column type="selection" width="55"  align="center" />
    <el-table v-loading="loading" :data="propertyList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
      <el-table-column type="selection" :reserve-selection="true" width="55"  align="center" />

      <el-table-column  label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>

@@ -142,13 +137,12 @@
      <el-table-column label="存储地址" prop="location" sortable width="100" />
      <el-table-column label="持有人" prop="holder" sortable width="100" />
      <el-table-column label="具体位置" prop="address" sortable width="100" />
      <el-table-column label="备注信息" prop="remark" sortable width="100" />
      <el-table-column label="家庭号" prop="familyId" sortable width="100" />
      <el-table-column label="发生时间" align="center" sortable prop="happenTime" width="180">
      <el-table-column label="备注" prop="remark" sortable width="100" >
        <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '————'}}</template>
      </el-table-column>

        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.happenTime) }}</span>
        </template>
      <el-table-column label="发生时间" prop="happenTime" sortable width="100" align="center">
        <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '————'}}</template>
      </el-table-column>
      <el-table-column label="电子文件" prop="url" width="160" >
           <template slot-scope="scope" >
@@ -208,10 +202,7 @@
      <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">

        <el-form-item label="类别" prop="type">
          <el-select v-model="formDat.type" placeholder="请选择类别" clearable :style="{width: '100%'}"  >
            <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
            ></el-option>
          </el-select>
          <el-input v-model="formDat.type" placeholder="请输入类别" clearable :style="{width: '100%'}" ></el-input>
        </el-form-item>
        <el-form-item label="标题" prop="title">
          <el-input v-model="formDat.title" placeholder="请输入标题" clearable :style="{width: '100%'}" ></el-input>
@@ -226,10 +217,6 @@
        </el-form-item>
        <el-form-item label="具体位置" prop="address">
          <el-input v-model="formDat.address" placeholder="请输入具体位置" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="家庭号" prop="familyId">
          <el-input v-model="formDat.familyId" placeholder="请输入家庭号" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>

@@ -286,7 +273,7 @@
          :http-request="requestUpload"
          :show-file-list="true"
        >
          <el-button type="primary">Click to upload</el-button>
          <el-button type="primary">点击上传</el-button>
          <template #tip>
            <div class="el-upload__tip">
            </div>
@@ -445,7 +432,10 @@
      this.open = false;
      this.reset();
    },

    getRowId(row)
    {
      return row.id
    },
    //隔行变色
    tableRowClassName({ row, rowIndex }) {
      if (rowIndex % 2 == 0) {
@@ -625,8 +615,22 @@
    },
    /** 导出按钮操作 */
    handleExport() {
      const Ids = this.ids;

      if(Ids.length==0)
      {
      this.download('family/property/export', {
        ...this.queryParams
      }, `property_${new Date().getTime()}.xlsx`)
      }else{
        this.download('family/property/export1/'+Ids, {
          ...this.queryParams
        }, `property_${new Date().getTime()}.xlsx`)
      }
    },
    handleExportTemplate(){
      this.download('family/property/model', {

      }, `property_${new Date().getTime()}.xlsx`)
    },
    /** 导入操作*/
@@ -635,7 +639,7 @@
    var formData = new FormData();
    formData.append('excelImport', file);
    let _this = this
    alert(file)

    enload(formData).then(response => {
       _this.getList();
      Message({ message: "导入成功", type: 'warning' })