Merge remote-tracking branch 'origin/master'

linwenling

2023-09-12 2eec82ffc96ae02a75b18ee2c426f7a162950b95

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

@@ -101,9 +101,9 @@
    <!-- 这里有个familyList数组 是在data()中定义的 -->
    <el-table v-loading="loading" :data="economyList"  @selection-change="handleSelectionChange" @row-click="handleCheck" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
      <el-table-column type="selection" width="55"  align="center" />
      <el-table-column fixed label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
      <el-table-column fixed label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80"/>

      <el-table-column label="发生时间" prop="createTime" sortable width="100" align="center">
      <el-table-column label="发生时间" prop="createTime" sortable width="150" align="center">
        <template slot-scope="scope">{{scope.row.createTime? scope.row.createTime: '————'}}</template>
      </el-table-column>
      <el-table-column label="台账" prop="type" sortable width="100" />
@@ -117,7 +117,9 @@
      <el-table-column label="现金/自动扣划" prop="kind" sortable width="130" >
        <template slot-scope="scope">{{scope.row.kind? scope.row.kind: '————'}}</template>
      </el-table-column>

      <el-table-column label="是否是本家庭记录" prop="ownData" sortable width="150px" >
        <template slot-scope="scope">{{scope.row.ownData === 0 ? '否': '是'}}</template>
      </el-table-column>
      <el-table-column label="电子文件" prop="url" align="center" sortable  width="110" >
        <template slot-scope="scope" >
          <div  @click="handleCheck(scope.row)">
@@ -268,7 +270,8 @@
          :http-request="requestUpload"
          :show-file-list="true"
        >
          <el-button type="primary">上传</el-button>
          <el-button type="primary">点击上传</el-button>
          <div v-if="uploading" class="upload-status">正在上传...</div>
          <template #tip>
            <div class="el-upload__tip">
            </div>
@@ -343,6 +346,7 @@
      ],
      dsb:true,
      btn:false,
      uploading: false,
      formDat: {
        type: undefined,
        createTime: undefined,
@@ -639,10 +643,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})