From c1cff08cdbcee3278c1ac8d8a3a067e3bf015202 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期三, 21 二月 2024 22:45:01 +0800
Subject: [PATCH] 提交新内容
---
ruoyi-ui/src/views/wish/index.vue | 230 ++++++++++++++++++++++++++------------------------------
1 files changed, 107 insertions(+), 123 deletions(-)
diff --git a/ruoyi-ui/src/views/wish/index.vue b/ruoyi-ui/src/views/wish/index.vue
index c355eca..83d3902 100644
--- a/ruoyi-ui/src/views/wish/index.vue
+++ b/ruoyi-ui/src/views/wish/index.vue
@@ -1,65 +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-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="鍦ㄢ�滅櫨骞村績鎰库�濅腑鎼滅储"
- clearable
- style="width: 240px"
- @keyup.enter.native="handleQuery">
- <i slot="prefix" class="el-input__icon el-icon-search"></i>
- </el-input>
- <!-- <el-input
- v-model="searchVal"
- placeholder="鍦ㄢ�滈�氳褰曗�濅腑鎼滅储"
- clearable
- style="width: 240px"
- @input="inputChange">
- <i slot="prefix" class="el-input__icon el-icon-search"></i>
- </el-input>
- <div class="outer-table">
- 姝ょ埗缁勪欢寮曠敤瀛愮粍浠秚ablemax
- <tablemax label="myLabel" :tableData="contactList">
- <template v-slot:table>
- <el-table-column label="鎿嶄綔" width="180">
- <template slot-scope="scope">
- <el-button @click="handleCheck(scope.row)" type="text" size="small"
- >璋冪敤</el-button
- >
- </template>
- </el-table-column>
- </template>
- </tablemax>
- </div>-->
-
-
- <!-- v-model="queryParams.id"
-
- 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"
- @keyup.enter.native="handleQuery"
- -->
- </el-form-item>
-
<el-form-item label="鏃堕棿" prop="happenTime">
<el-date-picker
v-model="dateRange"
- style="width: 197px;
+ style="width: 240px;
height: 30px;
background: #FFFFFF;
border-radius: 14px 14px 14px 14px;
- opacity: 0.5;
- border: 1px solid rgba(0,0,0,0.25);"
+ opacity: 0.5;"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
@@ -73,7 +22,10 @@
v-model="queryParams.title"
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>
@@ -83,7 +35,10 @@
v-model="queryParams.beneficiary"
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>
@@ -93,7 +48,10 @@
v-model="queryParams.heir"
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>
@@ -103,14 +61,20 @@
v-model="queryParams.cause"
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="isEffective">
<el-select v-model="queryParams.isEffective" placeholder="璇烽�夋嫨鏄惁鏈夋晥" clearable
- style="width: 240px" @keyup.enter.native="handleQuery">
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;" @keyup.enter.native="handleQuery">
<el-option v-for="item in typeOptions"
:key="item.value" :label="item.label" :value="item.value"/>
</el-select>
@@ -171,7 +135,7 @@
v-hasPermi="['family:note:export']"
>瀵煎叆妯℃澘涓嬭浇</el-button>
</el-col>
- <el-col :span="1.2">
+ <el-col :span="1.5">
<el-upload
action=""
@@ -182,7 +146,7 @@
>
<el-button size="mini" type="primary"
plain
- icon="el-icon-plus" >瀵煎叆</el-button>
+ icon="el-icon-top" >瀵煎叆</el-button>
</el-upload>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -194,19 +158,19 @@
<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">
+ <el-table-column label="鐞嗘兂鏍囬/鐧惧勾蹇冩効" prop="title" sortable :show-overflow-tooltip="true" 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="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="140" align="center" >
+ <el-table-column label="鍙楁儬浜�" prop="beneficiary" sortable :show-overflow-tooltip="true" 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="140" align="center">
+ <el-table-column label="缁ф壙浜�" prop="heir" sortable :show-overflow-tooltip="true" 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">
+ <el-table-column label="瀹炵幇闅惧害" prop="difficulty" :show-overflow-tooltip="true" sortable width="120" align="center">
<template slot-scope="scope">{{scope.row.difficulty? scope.row.difficulty: '鈥斺�斺�斺��'}}</template>
</el-table-column>
<el-table-column label="鏄惁渚濇棫鏈夋晥" prop="isEffective" sortable width="160" align="center">
@@ -238,38 +202,35 @@
></div>
</template>
</el-table-column>
- <el-table-column label="澶囨敞" prop="remark" sortable width="90" align="center">
+ <el-table-column label="澶囨敞" prop="remark" sortable :show-overflow-tooltip="true" width="90" align="center">
<template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" >
+ <el-table-column label="鎿嶄綔" align="center" width="250" class-name="small-padding fixed-width">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['system:role:edit']"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['system:role:remove']"
- >鍒犻櫎</el-button>
- <el-dropdown
- size="mini"
- @command="(command) => handleCommand(command, scope.row)"
- v-hasPermi="['system:role:edit']">
+ <div class="button-container">
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-edit"
+ @click="handleUpdate(scope.row)"
+ v-hasPermi="['system:role:edit']"
+ >
+ <span style="font-size: 14px;">淇敼</span>
+ </el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="handleDelete(scope.row)"
+ v-hasPermi="['system:role:remove']"
+ ><span style="font-size: 14px;">鍒犻櫎</span></el-button>
<el-button
size="mini"
type="text"
icon="el-icon-d-arrow-right"
- @click="handleCheck(scope.row)"
-
- >鏌ョ湅璇︽儏</el-button>
-
- </el-dropdown>
+ @click="handleCheck(scope.row)">
+ <span style="font-size: 14px;">鏌ョ湅璇︽儏</span></el-button>
+ </div>
</template>
</el-table-column>
</el-table>
@@ -324,24 +285,27 @@
<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="#"
+ accept="image/jpeg, image/png,image/jpg, image/WMF,image/gif"
list-type="picture-card"
multiple
:http-request="requestUpload"
:file-list="fileList"
>
<i slot="default" class="el-icon-plus"></i>
- <div slot="file" slot-scope="{file}">
- <img
- class="el-upload-list__item-thumbnail"
- :src="file.url"
- alt=""
- style="width: 126px; height: 126px"
- fit="cover"
- :preview-src-list="[file.url]"
- >
+ <div slot="file" slot-scope="{ file }">
+ <template v-if="fileList">
+ <img
+ class="el-upload-list__item-thumbnail"
+ :src="file.url"
+ alt=""
+ style="width: 100%; height: 100%; object-fit: cover;"
+ fit="cover"
+ :preview-src-list="[file.url]"
+ >
+ </template>
<span class="el-upload-list__item-actions">
<span
class="el-upload-list__item-preview"
@@ -370,11 +334,11 @@
multiple
:on-remove="handleRemoveFile"
- :http-request="requestUpload"
+ :http-request="requestUpload1"
:show-file-list="true"
>
<el-button type="primary">鐐瑰嚮涓婁紶</el-button>
- <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
+ <div v-if="uploading1" class="upload-status">姝ｅ湪涓婁紶...</div>
<template #tip>
<div class="el-upload__tip">
</div>
@@ -445,13 +409,17 @@
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
- fot:[".jpg",".jif"],
+ // 鏁版嵁鑼冨洿閫夐」
+ 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,
+ uploading1: false,
formDat: {
//鐧惧勾蹇冩効璁板綍
id:undefined,
@@ -547,12 +515,13 @@
// }
},
methods: {
-
getSrc1(isEffective) {
if (isEffective === 1) {
return '鏄�'
- }else {
+ }else if(isEffective === 0){
return '鍚�'
+ }else {
+ return '---'
}
},
@@ -742,21 +711,21 @@
addWish(this.formDat).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
+ // 娓呯┖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]);
+ }
this.getList();
});
}
});
- // 娓呯┖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)
{
@@ -772,15 +741,25 @@
if(_this.fot.includes(pth) === true)
{
_this.fileList.push({name:response.data.fileName, "url":response.data.url})
-
- }
-
- else{
- _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-
}
})
-
+ },
+ requestUpload1(params)
+ {
+ var file = params.file;
+ var formData = new FormData();
+ formData.append('uploadFile', file);
+ let _this = this
+ this.uploading1 = true;
+ uploadPic(formData).then(response => {
+ let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
+ this.uploading1 = false;
+ this.$modal.msgSuccess("涓婁紶鎴愬姛");
+ if(_this.fot.includes(pth) !== true)
+ {
+ _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+ }
+ })
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
@@ -844,6 +823,11 @@
background: #FFEFF2;
}
-
+.el-table__cell {
+ font-size: 14px; /* 璁剧疆瀛椾綋澶у皬 */
+}
+.button-container {
+ display: inline-flex; /* 璁剧疆鎸夐挳瀹瑰櫒涓鸿鍐呭厓绱� */
+}
</style>
--
Gitblit v1.9.1