From 9f9c41e93df80b48fbcc4d1c2e7748bed8111302 Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期二, 08 八月 2023 19:36:55 +0800
Subject: [PATCH] 家庭资产备忘本
---
ruoyi-ui/src/views/honor/index.vue | 185 ++++++++++++++++++++++++++++++++--------------
1 files changed, 129 insertions(+), 56 deletions(-)
diff --git a/ruoyi-ui/src/views/honor/index.vue b/ruoyi-ui/src/views/honor/index.vue
index 3bc5af9..b1d5240 100644
--- a/ruoyi-ui/src/views/honor/index.vue
+++ b/ruoyi-ui/src/views/honor/index.vue
@@ -50,14 +50,28 @@
-->
</el-form-item>
<el-form-item label="鍚嶇О" prop="name">
- <el-input
+<!-- <el-input-->
+<!-- v-model="queryParams.name"-->
+<!-- placeholder="璇疯緭鍏ュ悕绉�"-->
+<!-- clearable-->
+<!-- style="width: 240px"-->
+<!-- @keyup.enter.native="handleQuery">-->
+<!-- <i slot="prefix" class="el-input__icon el-icon-search"></i>-->
+<!-- </el-input>-->
+ <el-select
v-model="queryParams.name"
- placeholder="璇疯緭鍏ュ悕绉�"
+ placeholder="鎵�鏈夌被鍒�"
clearable
style="width: 240px"
- @keyup.enter.native="handleQuery">
- <i slot="prefix" class="el-input__icon el-icon-search"></i>
- </el-input>
+ @keyup.enter.native="handleQuery"
+ >
+ <el-option
+ v-for="dic in typeOptions"
+ :key="dic.value"
+ :label="dic.label"
+ :value="dic.value"
+ />
+ </el-select>
</el-form-item>
<el-form-item label="绫诲埆" prop="type" >
<!-- <el-input-->
@@ -76,10 +90,10 @@
@keyup.enter.native="handleQuery"
>
<el-option
- v-for="dict in typeOptions"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
+ v-for="item in typeOption"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
/>
</el-select>
@@ -179,16 +193,29 @@
<el-table v-loading="loading" :data="honorList" :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 fixed label="搴忓彿" sortable type="index" align="center" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/>
- <el-table-column label="鏃堕棿" prop="createTime" sortable width="120" align="center">
+<!-- <el-table-column label="鏃堕棿" prop="createTime" sortable width="120" align="center">-->
- <template slot-scope="scope">{{scope.row.createTime? scope.row.createTime: '鈥斺�斺�斺��'}}</template>
- </el-table-column>
+<!-- <template slot-scope="scope">{{scope.row.createTime? scope.row.createTime: '鈥斺�斺�斺��'}}</template>-->
+<!-- </el-table-column>-->
<el-table-column label="绫诲埆" prop="type" sortable :show-overflow-tooltip="true" width="120" align="center" >
<!-- <template slot-scope="scope">{{scope.row.type? scope.row.type: '鈥斺�斺�斺��'}}</template>-->
- <template slot-scope="scope">{{ getSrc(scope.row.type) }}</template>
+ <template slot-scope="scope">{{ getSrc1(scope.row.type) }}</template>
</el-table-column>
<el-table-column label="鍚嶇О" prop="name" sortable :show-overflow-tooltip="true" width="120" align="center" >
- <template slot-scope="scope">{{scope.row.name? scope.row.name: '鈥斺�斺�斺��'}}</template>
+<!-- <template slot-scope="scope">{{scope.row.name? scope.row.name: '鈥斺�斺�斺��'}}</template>-->
+ <template slot-scope="scope">
+<!-- <template v-if="formDat.name===1">{{ getSrc(scope.row.name) }}</template>-->
+ <template v-if="scope.row.name == 1">鍑虹敓璇�</template>
+ <template v-else-if="scope.row.name == 2">瀛︾敓璇�</template>
+ <template v-else-if="scope.row.name == 3">姣曚笟璇�</template>
+ <template v-else-if="scope.row.name == 4">缁撳璇�</template>
+ <template v-else-if="scope.row.name == 5">鎴峰彛绨�</template>
+ <template v-else-if="scope.row.name == 6">鐙敓瀛愬コ璇�</template>
+ <template v-else-if="scope.row.name == 7">楂樼骇鑱岀О</template>
+ <template v-else-if="scope.row.name == 8">鎶ょ収</template>
+ <template v-else-if="scope.row.name == 9">閫氳璇�</template>
+ <template v-else>{{ scope.row.name }}</template>
+ </template>
</el-table-column>
<el-table-column label="璇佸彿/涓撲笟" prop="idNo" sortable width="170" align="center" >
<template slot-scope="scope">{{scope.row.idNo? scope.row.idNo: '鈥斺�斺�斺��'}}</template>
@@ -207,22 +234,24 @@
</el-table-column>
<el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="160" 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="120" align="center">
@@ -269,20 +298,24 @@
<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">
- <el-form-item label="鏃堕棿" prop="createTime">
- <el-input v-model="formDat.createTime" placeholder="璇疯緭鍏ュ垱寤烘椂闂�" clearable :style="{width: '100%'}" >
- </el-input>
- </el-form-item>
- <el-form-item label="绫诲埆" prop="type">
-<!-- <el-input v-model="formDat.type" placeholder="璇疯緭鍏ョ被鍒�" clearable :style="{width: '100%'}" >-->
+<!-- <el-form-item label="鏃堕棿" prop="createTime">-->
+<!-- <el-input v-model="formDat.createTime" type='date' placeholder='閫夋嫨鏃ユ湡' clearable :style="{width: '100%'}" >-->
<!-- </el-input>-->
- <el-select v-model="formDat.type" placeholder="璇烽�夋嫨绫诲埆" clearable :style="{width: '100%'}" >
- <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
+<!-- </el-form-item>-->
+<!-- <el-form-item label="鑾峰緱鏃堕棿" prop="happenTime">-->
+<!-- <el-date-picker v-model='formDat.happenTime' type='date' placeholder='閫夋嫨鏃ユ湡'></el-date-picker>-->
+<!-- </el-form-item>-->
+ <el-form-item label="绫诲埆" prop="type">
+ <el-select v-model="formDat.type" placeholder="璇烽�夋嫨鍚嶇О" clearable :style="{width: '100%'}" >
+ <el-option v-for="(item, index) in typeOption" :key="index" :label="item.label" :value="item.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="鍚嶇О" prop="name">
- <el-input v-model="formDat.name" placeholder="璇疯緭鍏ュ悕绉�" clearable :style="{width: '100%'}" ></el-input>
+ <el-select v-model="formDat.name" placeholder="璇烽�夋嫨鍚嶇О" clearable :style="{width: '100%'}" >
+ <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
+ ></el-option>
+ </el-select>
</el-form-item>
<el-form-item label="璇佷欢鍙�/涓撲笟" prop="idNo">
<el-input v-model="formDat.idNo" placeholder="璇疯緭鍏ヨ瘉浠跺彿/涓撲笟" clearable :style="{width: '100%'}" >
@@ -293,11 +326,12 @@
</el-input>
</el-form-item>
<el-form-item label="鏈夋晥鏃堕棿" prop="validityDate">
- <el-input v-model="formDat.validityDate" placeholder="璇疯緭鍏ユ湁鏁堟椂闂�" clearable :style="{width: '100%'}" >
+ <el-input v-model="formDat.validityDate" type='date' placeholder='閫夋嫨鏃ユ湡' clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
+
<el-form-item label="鑾峰緱鏃堕棿" prop="getDate">
- <el-input v-model="formDat.getDate" placeholder="璇疯緭鍏ヨ幏寰楁椂闂�" clearable :style="{width: '100%'}" >
+ <el-input v-model="formDat.getDate" type='date' placeholder='閫夋嫨鏃ユ湡' clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
<el-form-item label="瀛樻斁浣嶇疆" prop="location">
@@ -354,7 +388,7 @@
class="upload-demo"
multiple
- :on-remove="handleRemove"
+ :on-remove="handleRemoveFile"
:http-request="requestUpload"
:show-file-list="true"
>
@@ -522,6 +556,11 @@
},
selected:'',
typeOptions: [],
+ typeOption:[
+ {value:'1',label:'鑽ｈ獕'},
+ {value:'0',label:'璇佷欢'},
+ {value:'2',label:'璧勮川'},]
+
};
},
created() {
@@ -549,7 +588,9 @@
/** 鏌ヨ璁板綍鍒楄〃 */
getList() {
this.loading = true;
- // console.log(this.queryParams)
+ 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 => {
listHonor(this.queryParams).then(response => {
// alert(123)
@@ -567,30 +608,44 @@
let _this = this
getCategory().then(response=>{
- response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
- _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
+ // response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
+ // _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
+ response.data.itemValues.replace("{", "").replace("}", "").split(",").map(elem => {
+ const label = elem.split(":")[0].trim();
+ const value = parseInt(elem.split(":")[1].trim());
+ _this.typeOptions.push({ "label": label, "value": value });
})
})
},
//绫诲埆閫夋嫨
- getSrc(type) {
- if (type === 1){
+ getSrc1(type){
+ if(type===0){
+ return '璇佷欢'
+ }else if(type===1){
+ return '鑽ｈ獕'
+ }else if(type===2){
+ return '璧勮川'
+ }
+ },
+ //鍚嶇О閫夋嫨
+ getSrc(name) {
+ if (name === 1){
return '鍑虹敓璇�'
- }else if(type === 2){
+ }else if(name === 2){
return '瀛︾敓璇�'
- }else if(type === 3){
+ }else if(name === 3){
return '姣曚笟璇�'
- }else if(type === 4){
+ }else if(name === 4){
return '缁撳璇�'
- }else if(type === 5){
+ }else if(name === 5){
return '鎴峰彛绨�'
- }else if(type === 6){
+ }else if(name === 6){
return '鐙敓瀛愬コ璇�'
- }else if(type === 7){
+ }else if(name === 7){
return '楂樼骇鑱岀О'
- }else if(type === 8){
+ }else if(name === 8){
return '鎶ょ収'
- }else if(type === 9){
+ }else if(name === 9){
return '閫氳璇�'
}else {
return '鍏跺畠'
@@ -598,7 +653,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() {
@@ -640,6 +706,7 @@
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
this.queryParams.pageNum = 1;
+
this.getList();
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
@@ -713,6 +780,12 @@
});
}
});
+ // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
+ Object.keys(this.formDat).forEach(key => {
+ this.formDat[key] = '';
+ });
+ this.handleRemove(this.fileList[0]);
+ this.handleRemoveFile(this.fileListOther[0]);
},
requestUpload(params)
{
--
Gitblit v1.9.1