From d6ed1287fa23fa25eacf57c0d83d533cb2f2bc45 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期日, 10 九月 2023 10:04:34 +0800
Subject: [PATCH] 修改了家庭设备详情，增加了打印
---
ruoyi-ui/src/views/selfeconomy/index.vue | 124 ++++++++++++++++++++++++----------------
1 files changed, 74 insertions(+), 50 deletions(-)
diff --git a/ruoyi-ui/src/views/selfeconomy/index.vue b/ruoyi-ui/src/views/selfeconomy/index.vue
index a0bb643..25fdc59 100644
--- a/ruoyi-ui/src/views/selfeconomy/index.vue
+++ b/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;
@@ -48,10 +47,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">
@@ -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" >
@@ -177,22 +176,23 @@
<template slot-scope="scope" >
<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 !== ',' "
- >
- <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>
+ <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">
@@ -247,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">
@@ -288,7 +288,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 +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"
@@ -333,11 +333,12 @@
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>
@@ -368,8 +369,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 +417,7 @@
dsb:true,
btn:false,
fit:['fill'],
-
+ uploading: false,
formDat: {
//鐧惧勾蹇冩効璁板綍
id:undefined,
@@ -444,8 +444,9 @@
pageSize: 10,
type:undefined,
incomeName:undefined,
- beneficiary:undefined,
- // happenTime:undefined,
+ timeLimit:undefined,
+ happenTime:undefined,
+
},
// searchVal:"",
@@ -485,7 +486,7 @@
}],
incomeName: [{
required: true,
- message: '璇疯緭鍏ユ敹鏀被鍒�',
+ message: '璇疯緭鍏ヨ幏寰楁柟寮�',
trigger: 'blur'
}],
timeLimit: [{
@@ -574,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() {
@@ -686,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)
{
@@ -693,10 +716,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})
@@ -726,20 +750,20 @@
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`)
},
/** 瀵煎叆鎿嶄綔*/
--
Gitblit v1.9.1