Merge remote-tracking branch 'origin/master'

Tcsm

2023-07-30 5a643d05479504adca94d23abbbbbfccf2283f0c

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

@@ -1,15 +1,14 @@
<template>
    <div class="app-container">
      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
        <el-form-item label="" prop="phone wx qq twitter isAlways remark" >
        <el-form-item label="" prop="type incomeName timeLimit happenTime " >
          <el-input
            v-model:phone="queryParams.phone"
            v-model:wx="queryParams.wx"
            v-model:qq="queryParams.qq"
            v-model:twitter="queryParams.twitter"
            v-model:isAlways="queryParams.isAlways"
            v-model:remark="queryParams.remark"
            placeholder="在“百年心愿”中搜索"
            v-model:type="queryParams.type"
            v-model:incomeName="queryParams.incomeName"
            v-model:timeLimit="queryParams.timeLimit"
            v-model:happenTime="queryParams.happenTime"

            placeholder="在“财产”中搜索"
            clearable
            style="width: 240px"
            @keyup.enter.native="handleQuery">
@@ -20,7 +19,7 @@

        </el-form-item>

        <el-form-item label="日期">
        <el-form-item label="日期" prop="happenTime">
          <el-date-picker
            v-model="dateRange"
            style="width:  197px;
@@ -333,7 +332,7 @@
            class="upload-demo"
            multiple

            :on-remove="handleRemove"
            :on-remove="handleRemoveFile"
            :http-request="requestUpload"
            :show-file-list="true"
          >
@@ -444,8 +443,8 @@
          pageSize: 10,
          type:undefined,
          incomeName:undefined,
          beneficiary:undefined,
          // happenTime:undefined,
          timeLimit:undefined,
          happenTime:undefined,
        },
        // searchVal:"",

@@ -574,7 +573,18 @@
      },

      handleRemove(file) {
        alert(323)
        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);
        }
      },
      // 取消按钮
      cancel() {
@@ -686,6 +696,12 @@
            });
          }
        });
        // 清空formDat对象的数据
        Object.keys(this.formDat).forEach(key => {
          this.formDat[key] = '';
        });
        this.handleRemove(this.fileList[0]);
        this.handleRemoveFile(this.fileListOther[0]);
      },
      requestUpload(params)
      {