Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web

feige

2023-09-10 8319f67b9bec1d19c06eaa4216f0f34c67e3afb1

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

@@ -68,16 +68,6 @@
            <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>
@@ -152,7 +142,7 @@
        </el-row>
      </div>
      <el-table v-loading="loading" :data="selfeconomyList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2;  border-radius: 14px 14px 14px 14px;">
        <el-table-column type="selection" :reserve-selection="true" width="25"  align="center" />
        <el-table-column type="selection" :reserve-selection="true" width="55"  align="center" />
        <el-table-column fixed label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/>
        <el-table-column label="日期" prop="happenTime" sortable width="100" align="center">
          <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '————'}}</template>
@@ -160,7 +150,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" >
@@ -186,22 +176,23 @@

          <template slot-scope="scope" >
            <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 !== ',' "
            >
            <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 === ','"
            ></div>
              <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 === '' || scope.row.url === ',' || scope.row.url === null)"
              >
              <img
                v-else
                class="el-upload-list__item-thumbnail"
                src="../../assets/images/deviceA.png"
                alt=""
                style="width: 35px; height: 35px;"
                fit="cover"

              ></div>
          </template>
        </el-table-column>
        <el-table-column label="备注" prop="remark" sortable width="90" align="center">
@@ -262,8 +253,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">
@@ -297,7 +288,7 @@
            <el-input v-model="formDat.remark" placeholder="请输入备注" clearable :style="{width: '100%'}" ></el-input>
          </el-form-item>

          <h4 class="form-header">电子文件 </h4>
          <h4 class="form-header">相关图片 </h4>
          <el-upload
            action="#"
            list-type="picture-card"
@@ -305,7 +296,7 @@
            :http-request="requestUpload"
            :file-list="fileList"
          >
            <i slot="default" class="el-icon-plus"></i>
            <i  slot="default" class="el-icon-plus"></i>
            <div slot="file" slot-scope="{file}">
              <img
                class="el-upload-list__item-thumbnail"
@@ -347,6 +338,7 @@
            :show-file-list="true"
          >
            <el-button type="primary">点击上传</el-button>
            <div v-if="uploading" class="upload-status">正在上传...</div>
            <template #tip>
              <div class="el-upload__tip">
              </div>
@@ -377,8 +369,7 @@


  //导入接口函数
  import {listSelfEconomy, getSelfEconomyInfo, addSelfEconomy,delSelfEconomy, updateSelfEconomy,uploadPic,downloadModel} from "@/api/selfeconomy/index";
//   import {enload} from "@/api/doctor";
  import {listSelfEconomy, getSelfEconomyInfo,enload, addSelfEconomy,delSelfEconomy, updateSelfEconomy,uploadPic,downloadModel} from "@/api/selfeconomy/index";
  import {Message} from "element-ui";


@@ -426,7 +417,7 @@
        dsb:true,
        btn:false,
        fit:['fill'],

        uploading: false,
        formDat: {
          //百年心愿记录
          id:undefined,
@@ -495,7 +486,7 @@
          }],
          incomeName: [{
            required: true,
            message: '请输入收支类别',
            message: '请输入获得方式',
            trigger: 'blur'
          }],
          timeLimit: [{
@@ -711,8 +702,13 @@
        Object.keys(this.formDat).forEach(key => {
          this.formDat[key] = '';
        });
        this.handleRemove(this.fileList[0]);
        this.handleRemoveFile(this.fileListOther[0]);
        for(let i = 0; i <= this.fileList.length; i++)
        {
          this.handleRemove(this.fileList[0]);
        }
        for(let i = 0; i < this.fileListOther.length; i++){
          this.handleRemoveFile(this.fileListOther[0]);
        }
      },
      requestUpload(params)
      {
@@ -720,10 +716,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})