From 7bee61be8fba5c23999dc9e826e6af9de98db469 Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期一, 25 九月 2023 14:35:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue | 20 +++++++--
ruoyi-ui/src/views/selfeconomy/index.vue | 57 ++++++++++++++++++----------
2 files changed, 51 insertions(+), 26 deletions(-)
diff --git a/ruoyi-ui/src/views/selfeconomy/index.vue b/ruoyi-ui/src/views/selfeconomy/index.vue
index 25fdc59..4232ff2 100644
--- a/ruoyi-ui/src/views/selfeconomy/index.vue
+++ b/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() {
diff --git a/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue b/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
index 4316759..3d9a214 100644
--- a/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
+++ b/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
@@ -36,8 +36,8 @@
</el-cow>
<el-cow >
- <el-form-item label="鑾峰緱鏂瑰紡" prop="incomeName" label-width="100px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="formData.incomeName" placeholder="璇疯緭鍏ユ敹鏀悕绉�" clearable :style="{width: '100%'}" :disabled="dsb">
+ <el-form-item label="璐骇鍚嶇О" prop="incomeName" label-width="100px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="formData.incomeName" placeholder="璇疯緭鍏ヨ储浜у悕绉�" clearable :style="{width: '100%'}" :disabled="dsb">
</el-input>
</el-form-item>
</el-cow>
@@ -55,8 +55,10 @@
</el-cow>
<el-cow >
<el-form-item label="鍙樻洿/娉ㄩ攢" prop="isChange" label-width="100px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="formData.isChange" placeholder="璇疯緭鍏ュ彉鏇�/娉ㄩ攢" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
+ <el-select v-model="formData.isChange" placeholder="璇烽�夋嫨 " clearable :style="{width: '100%'}" :disabled="dsb" >
+ <el-option v-for="(item, index) in typeOptions1" :key="index" :label="item.label" :value="item.value"
+ ></el-option>
+ </el-select>
</el-form-item>
</el-cow>
<el-cow >
@@ -73,7 +75,7 @@
</el-cow>
<el-cow >
<el-form-item label="鏄惁娉ㄩ攢" prop="status" label-width="100px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-select v-model="formData.status" placeholder="璇烽�夋嫨鏄惁娉ㄩ攢" clearable :style="{width: '100%'}" :disabled="dsb" >
+ <el-select v-model="formData.status" placeholder="璇烽�夋嫨 " clearable :style="{width: '100%'}" :disabled="dsb" >
<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
></el-option>
</el-select>
@@ -305,6 +307,14 @@
value: '0',
label: '鍚�',
}],
+ typeOptions1: [{
+ value: '鍙樻洿',
+ label: '鍙樻洿',
+ },
+ {
+ value: '娉ㄩ攢',
+ label: '娉ㄩ攢',
+ }],
}
},
computed: {},
--
Gitblit v1.9.1