From b23fec0d1c46a72e9be33f6e949a55d0dd7d5bca Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期四, 19 十月 2023 11:33:37 +0800
Subject: [PATCH] 修改了vue_app_base_other_api 为47.93.189.255:8085 clean/cleanInfo.vue 里面判断ip修改为域名www.bendudu.com 另外，在process.env.VUE_APP_BASE_OTHER_API加了preview
---
ruoyi-ui/src/views/selfeconomy/index.vue | 124 ++++++++++++++++++++++-------------------
1 files changed, 67 insertions(+), 57 deletions(-)
diff --git a/ruoyi-ui/src/views/selfeconomy/index.vue b/ruoyi-ui/src/views/selfeconomy/index.vue
index aee700d..e6613ca 100644
--- a/ruoyi-ui/src/views/selfeconomy/index.vue
+++ b/ruoyi-ui/src/views/selfeconomy/index.vue
@@ -1,33 +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="type incomeName timeLimit happenTime " >
- <el-input
- 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-row>
<el-form-item label="鏃ユ湡" prop="happenTime">
<el-date-picker
v-model="dateRange"
- style="width: 197px;
- height: 30px;
- background: #FFFFFF;
- border-radius: 14px 14px 14px 14px;
- opacity: 0.5;
- border: 1px solid rgba(0,0,0,0.25);"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
@@ -41,35 +22,45 @@
v-model="queryParams.type"
placeholder="璇疯緭鍏ヨ储浜х被鍒�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@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="incomeName" >
+ <el-form-item label="璐骇鍚嶇О" prop="incomeName" >
<el-input
v-model="queryParams.incomeName"
- placeholder="璇疯緭鍏ヨ幏寰楁柟寮�"
+ placeholder="璇疯緭鍏ヨ储浜у悕绉�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@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"
- 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: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
+ @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 +68,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,8 +134,9 @@
<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="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>
@@ -150,7 +144,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 +247,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 +264,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%'}" >
@@ -288,7 +284,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"
@@ -296,7 +292,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"
@@ -338,6 +334,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>
@@ -368,8 +365,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";
@@ -417,7 +413,7 @@
dsb:true,
btn:false,
fit:['fill'],
-
+ uploading: false,
formDat: {
//鐧惧勾蹇冩効璁板綍
id:undefined,
@@ -486,7 +482,7 @@
}],
incomeName: [{
required: true,
- message: '璇疯緭鍏ヨ幏寰楁柟寮�',
+ message: '璇疯緭鍏ヨ储浜у悕绉�',
trigger: 'blur'
}],
timeLimit: [{
@@ -518,6 +514,14 @@
{
value: '0',
label: '鍚�',
+ }],
+ typeOptions1: [{
+ value: '鍙樻洿',
+ label: '鍙樻洿',
+ },
+ {
+ value: '娉ㄩ攢',
+ label: '娉ㄩ攢',
}],
};
},
@@ -702,8 +706,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)
{
@@ -711,10 +720,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})
--
Gitblit v1.9.1