Merge remote-tracking branch 'origin/master'

Tcsm

2023-09-25 7bee61be8fba5c23999dc9e826e6af9de98db469

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

@@ -1,6 +1,7 @@
<template>
    <div class="app-container">
      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
        <el-row>
        <el-form-item label="" prop="type incomeName timeLimit happenTime " >
          <el-input
            v-model:type="queryParams.type"
@@ -47,10 +48,10 @@
          </el-input>
        </el-form-item>

        <el-form-item label="获得方式" prop="incomeName" >
        <el-form-item label="财产名称" prop="incomeName" >
          <el-input
            v-model="queryParams.incomeName"
            placeholder="请输入获得方式"
            placeholder="请输入财产名称"
            clearable
            style="width: 240px"
            @keyup.enter.native="handleQuery">
@@ -58,18 +59,19 @@
          </el-input>
        </el-form-item>

        <el-form-item label="期限" prop="timeLimit">
          <el-input
            v-model="queryParams.timeLimit"
            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 label="期限" prop="timeLimit">
            <el-input
              v-model="queryParams.timeLimit"
              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-col  >
            <el-form-item>
              <el-button size="mini" @click="handleQuery" style=" width: 67px;height: 27px;background: #FFDDE3;
              border-radius: 7px 7px 7px 7px;opacity: 1; " >搜索</el-button>
@@ -77,8 +79,10 @@
              border-radius: 7px 7px 7px 7px;opacity: 1; ">重置</el-button>
            </el-form-item>
          </el-col>
        </el-cntainer>
        </el-row>

      </el-form>

      <div>

        <el-row :gutter="10" class="mb8">
@@ -141,6 +145,7 @@
          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
        </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="55"  align="center" />
        <el-table-column fixed label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/>
@@ -150,7 +155,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" >
@@ -253,8 +258,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">
@@ -270,8 +275,10 @@
            </el-input>
          </el-form-item>
          <el-form-item label="变更/注销" prop="isChange">
            <el-input v-model="formDat.isChange" placeholder="请输入变更/注销" clearable :style="{width: '100%'}" >
            </el-input>
            <el-select v-model="formDat.isChange" placeholder="请选择变更/注销" clearable :style="{width: '100%'}"  >
              <el-option v-for="(item, index) in typeOptions1" :key="index" :label="item.label" :value="item.value"
              ></el-option>
            </el-select>
          </el-form-item>
          <el-form-item label="存放位置" prop="location">
            <el-input v-model="formDat.location" placeholder="请输入存放位置" clearable :style="{width: '100%'}" >
@@ -486,7 +493,7 @@
          }],
          incomeName: [{
            required: true,
            message: '请输入获得方式',
            message: '请输入财产名称',
            trigger: 'blur'
          }],
          timeLimit: [{
@@ -519,6 +526,14 @@
            value: '0',
            label: '否',
          }],
        typeOptions1: [{
          value: '变更',
          label: '变更',
        },
          {
            value: '注销',
            label: '注销',
          }],
      };
    },
    created() {