From cdb9af95c54f21aafe3c554e5a9938421d9b1311 Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期二, 15 八月 2023 21:38:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-ui/src/views/wish/index.vue | 128 +++++++++++++++++++++++-------------------
1 files changed, 71 insertions(+), 57 deletions(-)
diff --git a/ruoyi-ui/src/views/wish/index.vue b/ruoyi-ui/src/views/wish/index.vue
index 1c069c0..1ce0be6 100644
--- a/ruoyi-ui/src/views/wish/index.vue
+++ b/ruoyi-ui/src/views/wish/index.vue
@@ -68,7 +68,6 @@
@keyup.enter.native="handleQuery"
></el-date-picker>
</el-form-item>
-
<el-form-item label="鐞嗘兂鏍囬" prop="title">
<el-input
v-model="queryParams.title"
@@ -79,7 +78,6 @@
<i slot="prefix" class="el-input__icon el-icon-search"></i>
</el-input>
</el-form-item>
-
<el-form-item label="鍙楁儬浜�" prop="beneficiary" >
<el-input
v-model="queryParams.beneficiary"
@@ -90,7 +88,6 @@
<i slot="prefix" class="el-input__icon el-icon-search"></i>
</el-input>
</el-form-item>
-
<el-form-item label="缁ф壙浜�" prop="heir">
<el-input
v-model="queryParams.heir"
@@ -101,26 +98,35 @@
<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>
- <el-button size="mini" @click="handleQuery" style=" width: 67px;height: 27px;background: #FFDDE3;
- border-radius: 7px 7px 7px 7px;opacity: 1; " >鎼滅储</el-button>
- <el-button size="mini" @click="resetQuery" style=" width: 67px;height: 27px;background: #FFDDE3;
- border-radius: 7px 7px 7px 7px;opacity: 1; ">閲嶇疆</el-button>
- </el-form-item>
- </el-col>
- </el-cntainer>
+ <el-form-item label="濮嬩簬浣曞洜" prop="cause">
+ <el-input
+ v-model="queryParams.cause"
+ 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="isEffective">
+ <el-select v-model="queryParams.isEffective" placeholder="璇烽�夋嫨鏄惁鏈夋晥" clearable
+ style="width: 240px" @keyup.enter.native="handleQuery">
+ <el-option v-for="item in typeOptions"
+ :key="item.value" :label="item.label" :value="item.value"/>
+ </el-select>
+ </el-form-item>
+
+ <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>
+ <el-button size="mini" @click="resetQuery" style=" width: 67px;height: 27px;background: #FFDDE3;
+ border-radius: 7px 7px 7px 7px;opacity: 1; ">閲嶇疆</el-button>
+ </el-form-item>
+
+
</el-form>
+
<div>
- <!-- <div style="width: 100px;-->
- <!-- height: 24px;-->
- <!-- font-size: 18px;-->
- <!-- font-family: Microsoft YaHei-Regular, Microsoft YaHei;-->
- <!-- font-weight: 400;-->
- <!-- color: #000000;-->
- <!-- line-height: 21px;-->
- <!-- ">鏀惰棌鍜岃崳瑾�</div>-->
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
@@ -183,21 +189,21 @@
</el-row>
</div>
<el-table v-loading="loading" :data="wishList" :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">
+ <el-table-column label="鏃堕棿" prop="happenTime" sortable width="150" align="center">
<template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template>
</el-table-column>
<el-table-column label="鐞嗘兂鏍囬/鐧惧勾蹇冩効" prop="title" sortable width="160" align="center">
<template slot-scope="scope">{{scope.row.title? scope.row.title: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="濮嬩簬浣曞洜" prop="cause" sortable :show-overflow-tooltip="true" width="120" align="center" >
+ <el-table-column label="濮嬩簬浣曞洜" prop="cause" sortable :show-overflow-tooltip="true" width="140" align="center" >
<template slot-scope="scope">{{scope.row.cause? scope.row.cause: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="鍙楁儬浜�" prop="beneficiary" sortable width="120" align="center" >
+ <el-table-column label="鍙楁儬浜�" prop="beneficiary" sortable width="140" align="center" >
<template slot-scope="scope">{{scope.row.beneficiary? scope.row.beneficiary: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="缁ф壙浜�" prop="heir" sortable width="110" align="center">
+ <el-table-column label="缁ф壙浜�" prop="heir" sortable width="140" align="center">
<template slot-scope="scope">{{scope.row.heir? scope.row.heir: '鈥斺�斺�斺��'}}</template>
</el-table-column>
<el-table-column label="瀹炵幇闅惧害" prop="difficulty" sortable width="120" align="center">
@@ -213,22 +219,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">
@@ -283,7 +290,7 @@
<!-- <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='閫夋嫨鏃ユ湡' clearable :style="{width: '100%'}" ></el-input>
</el-form-item>
<el-form-item label="鐞嗘兂鏍囬/鐧惧勾蹇冩効" prop="title">
<el-input v-model="formDat.title" placeholder="璇疯緭鍏ョ悊鎯虫爣棰�/鐧惧勾蹇冩効" clearable :style="{width: '100%'}" >
@@ -324,7 +331,8 @@
:http-request="requestUpload"
:file-list="fileList"
>
- <i slot="default" class="el-icon-plus"></i>
+ <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
+ <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
<img
class="el-upload-list__item-thumbnail"
@@ -436,16 +444,14 @@
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
- fot:[".jpg",".jif"],
- fileList:[
- ],
- fileListOther:[
-
- ],
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+ fileList:[],
+ fileListOther:[],
dsb:true,
btn:false,
fit:['fill'],
-
+ uploading: false,
formDat: {
//鐧惧勾蹇冩効璁板綍
id:undefined,
@@ -471,6 +477,8 @@
title:undefined,
heir:undefined,
beneficiary:undefined,
+ cause:undefined,
+ isEffective:undefined
// happenTime:undefined,
},
// searchVal:"",
@@ -533,7 +541,7 @@
},
created() {
this.getList();
- this.getCateInfor()
+ // this.getCateInfor()
// for (let i = 0; i < this.contactList.length; i++) {
// this.formDat[i] = this.contactList[i];
// }
@@ -568,7 +576,7 @@
/** 鏌ヨ璁板綍鍒楄〃 */
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]
@@ -742,8 +750,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)
{
@@ -751,10 +764,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