Merge remote-tracking branch 'origin/master'

Tcsm

2023-07-30 5a643d05479504adca94d23abbbbbfccf2283f0c

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

@@ -48,7 +48,7 @@
        />

      </el-form-item>
      <el-form-item label="时间">
      <el-form-item label="时间" prop="happenTime">
        <el-date-picker
          v-model="dateRange"
          style="width:  197px;
@@ -63,23 +63,23 @@
          start-placeholder="开始日期"
          end-placeholder="结束日期"
        ></el-date-picker>
      </el-form-item>
      <el-form-item>
        <el-button size="mini" @click="handleQuery" style=" width: 65px; height: 32px;background: #FFDDE3;
      </el-form-item><el-form-item>
      <el-button size="mini" @click="handleQuery" style=" width: 65px; height: 32px;background: #FFDDE3;
          border-radius: 6px 6px 6px 6px;opacity:1; " >搜索</el-button>
        <el-button  size="mini" @click="resetQuery" style=" width: 65px; height: 32px;background: #FFDDE3;
      <el-button  size="mini" @click="resetQuery" style=" width: 65px; height: 32px;background: #FFDDE3;
          border-radius: 6px 6px 6px 6px;opacity:1; " >重置</el-button>
      </el-form-item>
    </el-form-item>

    </el-form>

    <div style="width: 72px;
height: 24px;
font-size: 18px;
font-family: Microsoft YaHei-Regular, Microsoft YaHei;
font-weight: 400;
color: #000000;
line-height: 21px;
">家大事记</div>
<!--    <div style="width: 72px;-->
<!--height: 24px;-->
<!--font-size: 18px;-->
<!--font-family: Microsoft YaHei-Regular, Microsoft YaHei;-->
<!--font-weight: 400;-->
<!--color: #000000;-->
<!--line-height: 21px;-->
<!--">家大事记</div>-->
    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
        <el-button
@@ -120,7 +120,7 @@
          plain
          icon="el-icon-download"
          size="mini"
          @click="handleExport"
          @click="handleExportTemplate"
          v-hasPermi="['family:note:export']"
        >导入模板下载</el-button>
      </el-col>
@@ -144,8 +144,8 @@
    </el-row>
    <!-- 序号、时间、人物、地点、大事标题、电子文件、备注 -->
    <!-- 这里有个familyList数组 是在data()中定义的 -->
    <el-table v-loading="loading"  :data="familyList" @selection-change="handleSelectionChange"  :row-class-name="tableRowClassName">
      <el-table-column type="selection" width="55"  align="center" />
    <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="100" align="center">
@@ -160,24 +160,26 @@
      </el-table-column>

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

        <template slot-scope="scope" >
          <img
            class="el-upload-list__item-thumbnail"
            src="../../assets/images/deviceLis.png"
            alt=""
            style="width: 35px; height: 35px;"
            fit="cover"
            v-if="scope.row.url !== null"
          >
          <img
            class="el-upload-list__item-thumbnail"
            src="../../assets/images/deviceA.png"
            alt=""
            style="width: 35px; height: 35px;"
            fit="cover"
            v-if="scope.row.url === null"
          >
          <div  @click="handleCheck(scope.row)">
            <img
              class="el-upload-list__item-thumbnail"
              src="../../assets/images/deviceLis.png"
              alt=""
              style="width: 35px; height: 35px;"
              fit="cover"
              v-if="scope.row.url !== null "
            >
            <img
              class="el-upload-list__item-thumbnail"
              src="../../assets/images/deviceA.png"
              alt=""
              style="width: 35px; height: 35px;"
              fit="cover"
              v-if="scope.row.url === null"
            ></div>
        </template>
      </el-table-column>
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -287,11 +289,11 @@
          class="upload-demo"
          multiple

          :on-remove="handleRemove"
          :on-remove="handleRemoveFile"
          :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>
@@ -443,7 +445,10 @@
      this.open = false;
      this.reset();
    },

    getRowId(row)
    {
      return row.id
    },
    //隔行变色
    tableRowClassName({ row, rowIndex }) {
      if (rowIndex % 2 == 0) {
@@ -523,7 +528,7 @@
    // 多选框选中数据
    handleSelectionChange(selection) {
      this.ids = selection.map(item => item.id)
      console.log(this.ids)
    //  alert(this.ids)
      this.single = selection.length!=1
      this.multiple = !selection.length
    },
@@ -554,7 +559,20 @@
      });
    },


    handleRemove(file) {
      for(let i = 0; i < this.fileList.length; i++)
      {
        if(this.fileList[i].url==file.url)
          this.$delete(this.fileList,i);
      }
    },
    handleRemoveFile(file) {
      for(let i = 0; i < this.fileListOther.length; i++)
      {
        if(this.fileListOther[i].url==file.url)
          this.$delete(this.fileListOther,i);
      }
    },
    handlePictureCardPreview(file) {
      this.dialogImageUrl = file.url;
      this.dialogVisible = true;
@@ -579,6 +597,12 @@
          });
        }
      });
      // 清空formDat对象的数据
      Object.keys(this.formDat).forEach(key => {
        this.formDat[key] = '';
      });
      this.handleRemove(this.fileList[0]);
      this.handleRemoveFile(this.fileListOther[0]);
    },
    requestUpload(params)
    {
@@ -606,17 +630,35 @@
    /** 删除按钮操作 */
    handleDelete(row) {
      const Ids = row.id || this.ids;

      this.$modal.confirm('是否确认删除所选中数据项？').then(function() {
        return delFamilyevent(Ids);
      }).then(() => {
        this.getList();
        this.ids = []
        this.$modal.msgSuccess("删除成功");
      }).catch(() => {});
    },
    /** 导出按钮操作 */
    handleExport() {
        const Ids = this.ids;

      if(Ids.length==0)
      {
      this.download('/family/zfEvent/export', {
        ...this.queryParams
      }, `zfEvent_${new Date().getTime()}.xlsx`)
      }
      else{
        this.download('/family/zfEvent/export1/'+Ids, {
        }, `zfEvent_${new Date().getTime()}.xlsx`)
      }
      },
        /** 导入模板下载操作*/
    handleExportTemplate()
    {
     this.download('/family/zfEvent/model', {

      }, `zfEvent_${new Date().getTime()}.xlsx`)
    },
    /** 导入操作*/
@@ -635,6 +677,7 @@
      }

    }

  }
};
</script>