Merge remote-tracking branch 'origin/master'

Tcsm

2023-08-15 cdb9af95c54f21aafe3c554e5a9938421d9b1311

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

@@ -147,20 +147,20 @@
    <el-table v-loading="loading"  :data="familyList" :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"/>
      <el-table-column label="发生时间" prop="happenTime" sortable width="130" align="center">
      <el-table-column  label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80px"/>
      <el-table-column label="发生时间" prop="happenTime" sortable width="200px" align="center">
        <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '————'}}</template>
      </el-table-column>
      <el-table-column label="人物" prop="people" sortable width="120" />
      <el-table-column label="地点" prop="address" sortable width="120" />
      <el-table-column label="大事标题" prop="title" sortable :show-overflow-tooltip="true" width="150" />
      <el-table-column label="人物" prop="people" sortable width="150px" />
      <el-table-column label="地点" prop="address" sortable width="150px" />
      <el-table-column label="大事标题" prop="title" sortable :show-overflow-tooltip="true" width="150px" />

      <el-table-column label="备注" prop="remark" sortable width="120" >
      <el-table-column label="备注" prop="remark" sortable width="150px" >
        <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '————'}}</template>
      </el-table-column>

      <!-- <el-table-column label="家庭号" prop="familyId" sortable width="100" /> -->
      <el-table-column label="电子文件" prop="url" width="150" align="center">
      <el-table-column label="电子文件" prop="url" width="150px" align="center">

        <template slot-scope="scope" >
          <div  @click="handleCheck(scope.row)">
@@ -253,7 +253,8 @@
          :http-request="requestUpload"
          :file-list="fileList"
        >
          <i slot="default" class="el-icon-plus"></i>
          <div v-if="uploading" class="upload-status">正在上传...</div>
          <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
          <div slot="file" slot-scope="{file}">
            <img
              class="el-upload-list__item-thumbnail"
@@ -365,13 +366,11 @@
      dateRange: [],
      // 数据范围选项
      fot:[".jpg",".jif"],
      fileList:[
      ],
      fileListOther:[

      ],
      fileList:[],
      fileListOther:[],
      dsb:true,
      btn:false,
      uploading: false,
      formDat: {
        // type: undefined,
        title: undefined,
@@ -616,10 +615,11 @@
      var formData = new FormData();
      formData.append('uploadFile', file);
      let _this = this

      this.uploading = true;
      uploadPic(formData).then(response => {
        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)

        this.uploading = false;
        this.$modal.msgSuccess("上传成功");
        if(_this.fot.includes(pth) === true)
        {
          _this.fileList.push({name:response.data.fileName, "url":response.data.url})