From 0039b22ae537bc95dc22f1bcc684c5e9d644622a Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期日, 13 八月 2023 20:45:41 +0800
Subject: [PATCH] 完善婚姻模块（完）
---
ruoyi-ui/src/views/selfeconomy/index.vue | 106 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 64 insertions(+), 42 deletions(-)
diff --git a/ruoyi-ui/src/views/selfeconomy/index.vue b/ruoyi-ui/src/views/selfeconomy/index.vue
index 77702f5..74c539b 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;
@@ -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>
@@ -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">
@@ -333,7 +333,7 @@
class="upload-demo"
multiple
- :on-remove="handleRemove"
+ :on-remove="handleRemoveFile"
:http-request="requestUpload"
:show-file-list="true"
>
@@ -368,8 +368,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";
@@ -444,8 +443,9 @@
pageSize: 10,
type:undefined,
incomeName:undefined,
- beneficiary:undefined,
- // happenTime:undefined,
+ timeLimit:undefined,
+ happenTime:undefined,
+
},
// searchVal:"",
@@ -485,7 +485,7 @@
}],
incomeName: [{
required: true,
- message: '璇疯緭鍏ユ敹鏀被鍒�',
+ message: '璇疯緭鍏ヨ幏寰楁柟寮�',
trigger: 'blur'
}],
timeLimit: [{
@@ -574,7 +574,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 +697,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)
{
@@ -726,20 +748,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