From c48fc6b1b440ef54da502ebf8b8e13fe4343f929 Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期二, 15 八月 2023 21:45:10 +0800
Subject: [PATCH] 完善荣誉证书模块的类别和名称的选择输入功能；家根网可以按照身份、姓名搜索；成长经历阅历的各个小模块的时间在修改时变成可选形式
---
ruoyi-ui/src/views/contacts/index.vue | 97 +++++++++++++++++++++++++++++++-----------------
1 files changed, 62 insertions(+), 35 deletions(-)
diff --git a/ruoyi-ui/src/views/contacts/index.vue b/ruoyi-ui/src/views/contacts/index.vue
index 5cb1b64..8dddbb0 100644
--- a/ruoyi-ui/src/views/contacts/index.vue
+++ b/ruoyi-ui/src/views/contacts/index.vue
@@ -18,10 +18,10 @@
<!-- v-model="queryParams.id"-->
</el-form-item>
- <el-form-item label="鎴愬憳濮撳悕" prop="myName" style="padding-left:180px">
+ <el-form-item label="瀹朵汉濮撳悕" prop="myName" style="padding-left:180px">
<el-input
v-model="queryParams.myName"
- placeholder="璇疯緭鍏ユ垚鍛樺鍚�"
+ placeholder="璇疯緭鍏ュ浜哄鍚�"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery">
@@ -30,10 +30,10 @@
</el-form-item>
- <el-form-item label="绉板懠" prop="nickName">
+ <el-form-item label="閫氳褰曚腑绉板懠" prop="nickName">
<el-input
v-model="queryParams.nickName"
- placeholder="璇疯緭鍏ョО鍛�"
+ placeholder="璇疯緭鍏ラ�氳褰曚腑绉板懠"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery">
@@ -141,10 +141,10 @@
</div>
<el-table v-loading="loading" :data="contactList" :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="80"/>
- <el-table-column label="鎴愬憳濮撳悕" prop="myName" sortable width="160" >
+ <el-table-column label="瀹朵汉濮撳悕" prop="myName" sortable width="130" >
<template slot-scope="scope">
<div>
<a href="javascript:;" @click="handleCheck(scope.row)">{{scope.row.myName}}</a>
@@ -152,7 +152,7 @@
</template>
</el-table-column>
- <el-table-column label="绉板懠" prop="nickName" sortable :show-overflow-tooltip="true" width="120" align="center" />
+ <el-table-column label="閫氳褰曚腑绉板懠" prop="nickName" sortable :show-overflow-tooltip="true" width="160" align="center" />
<el-table-column label="濮撳悕" prop="name" sortable :show-overflow-tooltip="true" width="120" align="center"/>
<el-table-column label="宸ヤ綔鍗曚綅" prop="work" sortable width="160" align="center" >
<template slot-scope="scope">{{scope.row.work? scope.row.work: '鈥斺�斺�斺��'}}</template>
@@ -184,22 +184,24 @@
<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>
@@ -243,18 +245,19 @@
<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="myName">
- <el-input v-model="formDat.myName" placeholder="璇疯緭鍏ユ垚鍛樺鍚�" clearable :style="{width: '100%'}" >
+ <el-form-item label="瀹朵汉濮撳悕" prop="myName">
+ <el-input v-model="formDat.myName" placeholder="璇疯緭鍏ュ浜哄鍚�" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
- <el-form-item label="绉板懠" prop="nickName">
- <el-input v-model="formDat.nickName" placeholder="璇疯緭鍏ョО鍛�" clearable :style="{width: '100%'}" ></el-input>
+ <el-form-item label="閫氳褰曚腑绉板懠" prop="nickName">
+ <el-input v-model="formDat.nickName" placeholder="璇疯緭鍏ラ�氳褰曚腑绉板懠" clearable :style="{width: '100%'}" ></el-input>
</el-form-item>
<el-form-item label="濮撳悕" prop="name">
<el-input v-model="formDat.name" placeholder="璇疯緭鍏ュ鍚�" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
+
<el-form-item label="宸ヤ綔鍗曚綅" prop="work">
<el-input v-model="formDat.work" placeholder="璇疯緭鍏ュ伐浣滃崟浣�" clearable :style="{width: '100%'}" >
</el-input>
@@ -292,7 +295,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"
@@ -329,7 +333,7 @@
class="upload-demo"
multiple
- :on-remove="handleRemove"
+ :on-remove="handleRemoveFile"
:http-request="requestUpload"
:show-file-list="true"
>
@@ -408,7 +412,7 @@
dsb:true,
btn:false,
fit:['fill'],
-
+ uploading: false,
formDat: {
//閫氳褰�
id:undefined,
@@ -471,12 +475,12 @@
// }],
myName: [{
required: true,
- message: '璇疯緭鍏ユ垚鍛樺鍚�',
+ message: '璇疯緭鍏ュ浜哄鍚�',
trigger: 'blur'
}],
nickName: [{
required: true,
- message: '璇疯緭鍏ョО鍛�',
+ message: '璇疯緭鍏ラ�氳褰曚腑绉板懠',
trigger: 'blur'
}],
name: [{
@@ -576,8 +580,19 @@
// })
// },
+ handleRemoveFile(file) {
+ for(let i = 0; i < this.fileListOther.length; i++)
+ {
+ if(this.fileListOther[i].url==file.url)
+ this.$delete(this.fileListOther,i);
+ }
+ },
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);
+ }
},
// 鍙栨秷鎸夐挳
cancel() {
@@ -688,6 +703,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)
{
@@ -695,10 +721,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