From 8319f67b9bec1d19c06eaa4216f0f34c67e3afb1 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期日, 10 九月 2023 10:08:25 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web
---
ruoyi-ui/src/views/selfeconomy/index.vue | 258 ++++++++++++++++++++++++++++-----------------------
1 files changed, 141 insertions(+), 117 deletions(-)
diff --git a/ruoyi-ui/src/views/selfeconomy/index.vue b/ruoyi-ui/src/views/selfeconomy/index.vue
index 28d03cc..25fdc59 100644
--- a/ruoyi-ui/src/views/selfeconomy/index.vue
+++ b/ruoyi-ui/src/views/selfeconomy/index.vue
@@ -1,26 +1,25 @@
<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">
<i slot="prefix" class="el-input__icon el-icon-search"></i>
</el-input>
-
-
+
+
</el-form-item>
-
- <el-form-item label="鏃ユ湡">
+
+ <el-form-item label="鏃ユ湡" prop="happenTime">
<el-date-picker
v-model="dateRange"
style="width: 197px;
@@ -36,7 +35,7 @@
end-placeholder="缁撴潫鏃ユ湡"
></el-date-picker>
</el-form-item>
-
+
<el-form-item label="璐骇绫诲埆" prop="type">
<el-input
v-model="queryParams.type"
@@ -47,18 +46,18 @@
<i slot="prefix" class="el-input__icon el-icon-search"></i>
</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">
<i slot="prefix" class="el-input__icon el-icon-search"></i>
</el-input>
</el-form-item>
-
+
<el-form-item label="鏈熼檺" prop="timeLimit">
<el-input
v-model="queryParams.timeLimit"
@@ -93,7 +92,7 @@
v-hasPermi="['system:role:add']"
>鏂板</el-button>
</el-col>
-
+
<el-col :span="1.5">
<el-button
type="danger"
@@ -126,10 +125,10 @@
>瀵煎叆妯℃澘涓嬭浇</el-button>
</el-col>
<el-col :span="1.2">
-
+
<el-upload
action=""
-
+
class="upload-demo"
:show-file-list="false"
:http-request="handleEnport"
@@ -143,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>
@@ -151,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" >
@@ -172,26 +171,28 @@
<el-table-column label="鏄惁娉ㄩ攢" prop="status" sortable width="100" align="center">
<template slot-scope="scope">{{scope.row.status===1? '鏄�': '鍚�'}}</template>
</el-table-column>
-
+
<el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="80" align="center">
-
+
<template slot-scope="scope" >
- <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 @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 === '' || 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">
@@ -222,14 +223,14 @@
type="text"
icon="el-icon-d-arrow-right"
@click="handleCheck(scope.row)"
-
+
>鏌ョ湅璇︽儏</el-button>
-
+
</el-dropdown>
</template>
</el-table-column>
</el-table>
-
+
<pagination
v-show="total>0"
:total="total"
@@ -238,7 +239,7 @@
style="background: #FEF7FC;"
@pagination="getList"
/>
-
+
<!-- 娣诲姞鏀惰棌涓庤崳瑾変俊鎭厤缃璇濇 -->
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
@@ -246,14 +247,14 @@
<!-- <el-input v-model="formDat.happenTime" placeholder="璇疯緭鍏ヨ幏寰楁椂闂�" clearable :style="{width: '100%'}" ></el-input>-->
<!-- </el-form-item>-->
<el-form-item label="鏃堕棿" prop="happenTime">
- <el-date-picker v-model='formDat.happenTime' type='date' placeholder='閫夋嫨鏃ユ湡'></el-date-picker>
+ <el-input v-model='formDat.happenTime' type='date' placeholder='閫夋嫨鏃ユ湡'></el-input>
</el-form-item>
<el-form-item label="璐骇绫诲埆" prop="type">
<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">
@@ -282,12 +283,12 @@
></el-option>
</el-select>
</el-form-item>
-
+
<el-form-item label="澶囨敞" prop="remark">
<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"
@@ -295,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"
@@ -312,7 +313,7 @@
>
<i class="el-icon-zoom-in"></i>
</span>
-
+
<span
v-if="!disabled"
class="el-upload-list__item-delete"
@@ -321,8 +322,8 @@
<i class="el-icon-delete"></i>
</span>
</span>
-
-
+
+
</div>
</el-upload>
<h4 class="form-header">鍏朵粬闄勪欢 </h4>
@@ -331,47 +332,47 @@
:file-list="fileListOther"
class="upload-demo"
multiple
-
- :on-remove="handleRemove"
+
+ :on-remove="handleRemoveFile"
:http-request="requestUpload"
: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>
</template>
</el-upload>
-
+
</el-form>
<h4 class="form-header"> </h4>
-
+
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitDataScope">淇� 瀛�</el-button>
<el-button @click="cancelData">鍙� 娑�</el-button>
</div>
</el-dialog>
-
+
<!-- 鍒嗛厤瑙掕壊鏁版嵁鏉冮檺瀵硅瘽妗� -->
<el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
-
+
</el-dialog>
-
+
</div>
</template>
-
+
<script>
import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
-
-
-
+
+
+
//瀵煎叆鎺ュ彛鍑芥暟
- 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";
-
-
+
+
export default {
name: "index",
dicts: ['sys_normal_disable'],
@@ -379,7 +380,7 @@
return {
// 閬僵灞�
disabled: false,
-
+
loading: true,
formData:[],
// 閫変腑鏁扮粍
@@ -411,12 +412,12 @@
fileList:[
],
fileListOther:[
-
+
],
dsb:true,
btn:false,
fit:['fill'],
-
+ uploading: false,
formDat: {
//鐧惧勾蹇冩効璁板綍
id:undefined,
@@ -431,7 +432,7 @@
location:undefined,
remark:undefined,
url: undefined,
-
+
},
// 鑿滃崟鍒楄〃
menuOptions: [],
@@ -443,11 +444,12 @@
pageSize: 10,
type:undefined,
incomeName:undefined,
- beneficiary:undefined,
- // happenTime:undefined,
+ timeLimit:undefined,
+ happenTime:undefined,
+
},
// searchVal:"",
-
+
// 琛ㄥ崟鍙傛暟
form: {},
defaultProps: {
@@ -456,7 +458,7 @@
},
// 琛ㄥ崟鏍￠獙
rules: {
-
+
type: [{
required: true,
message: '璇疯緭鍏ヨ储浜х被鍒�',
@@ -484,7 +486,7 @@
}],
incomeName: [{
required: true,
- message: '璇疯緭鍏ユ敹鏀被鍒�',
+ message: '璇疯緭鍏ヨ幏寰楁柟寮�',
trigger: 'blur'
}],
timeLimit: [{
@@ -502,7 +504,7 @@
message: '璇疯緭鍏ュ疄鐜伴毦搴�',
trigger: 'blur'
}],
-
+
remark: [{
// required: true,
message: '璇疯緭鍏ュ娉�',
@@ -527,7 +529,7 @@
// }
},
methods: {
-
+
// getSrc1(status) {
// if (status === 1) {
// return '鏄�'
@@ -535,7 +537,7 @@
// return '鍚�'
// }
// },
-
+
// 鍙栨秷鎸夐挳
cancelData() {
this.open = false;
@@ -559,13 +561,13 @@
console.log(this.queryParams)
this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
-
+
// listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
listSelfEconomy(this.queryParams).then(response => {
// alert(123)
// console.log(response.data)
this.selfeconomyList = response.data.data;
-
+
this.total = response.data.total;
this.loading = false;
}
@@ -573,7 +575,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() {
@@ -633,8 +646,8 @@
// );
// this.contactList = newlist;
// },
-
-
+
+
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
this.reset();
@@ -645,13 +658,13 @@
handleCheck(row){
const id = row.id;
this.$router.push("/self/selfeconomy/selfeconomyInfo/" + id);
-
+
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
const id = row.id;
let jd = true
-
+
this.$router.push({
path:"/self/selfeconomy/selfeconomyInfo/" + id,
query:{
@@ -659,15 +672,15 @@
}
});
},
-
-
+
+
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url;
this.dialogVisible = true;
},
/** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
submitDataScope: function() {
-
+
let ul = this.fileList.map(function (elem){
return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
}).join(",")
@@ -677,7 +690,7 @@
this.formDat.url = ul+","+uls
this.$refs["elForm"].validate(valid => {
if (valid) {
-
+
addSelfEconomy(this.formDat).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
@@ -685,6 +698,17 @@
});
}
});
+ // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
+ Object.keys(this.formDat).forEach(key => {
+ this.formDat[key] = '';
+ });
+ 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)
{
@@ -692,22 +716,23 @@
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})
-
+
}
-
+
else{
_this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-
+
}
})
-
+
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
@@ -722,38 +747,38 @@
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
const Ids = this.ids;
-
+
if(Ids.length==0)
{
- this.download('zIdea/export', {
+ this.download('zProperty/export', {
...this.queryParams
- }, `zIdea_${new Date().getTime()}.xlsx`)
+ }, `zProperty_${new Date().getTime()}.xlsx`)
}else{
- this.download('zIdea/export1/'+Ids, {
- }, `zIdea_${new Date().getTime()}.xlsx`)
+ this.download('zProperty/export1/'+Ids, {
+ }, `zProperty_${new Date().getTime()}.xlsx`)
}
},
-
+
/** 瀵煎叆妯℃澘涓嬭浇鎸夐挳鎿嶄綔 */
handleExportModel() {
-
- this.download('/zIdea/model', {
- }, `zIdea_model_${new Date().getTime()}.xlsx`)
+
+ this.download('/zProperty/model', {
+ }, `zProperty_model_${new Date().getTime()}.xlsx`)
},
-
+
/** 瀵煎叆鎿嶄綔*/
handleEnport(params){
var file = params.file;
var formData = new FormData();
formData.append('excelImport', file);
let _this = this
-
+
enload(formData).then(response => {
_this.getList();
Message({ message: "瀵煎叆鎴愬姛", type: 'warning' })
-
+
}).catch(() => { Message({ message: "瀵煎叆澶辫触", type: 'error' })});
-
+
}
}
};
@@ -762,16 +787,15 @@
.app-container{
background-color: #FEF7FC;
}
-
+
.el-table__row.statistics-warning-row {
background: #E0EEFE;
-
+
}
.el-table__row.statistics-warning-row1 {
background: #FFEFF2;
-
+
}
-
-
+
+
</style>
-
\ No newline at end of file
--
Gitblit v1.9.1