From 6594dffd868ddb7c3fba888bbb5151c13d8ad3b3 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期三, 17 五月 2023 17:24:28 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web
---
ruoyi-ui/src/views/contacts/index.vue | 55 +++++++++++++++++++++----------------------------------
1 files changed, 21 insertions(+), 34 deletions(-)
diff --git a/ruoyi-ui/src/views/contacts/index.vue b/ruoyi-ui/src/views/contacts/index.vue
index d40a383..c67b919 100644
--- a/ruoyi-ui/src/views/contacts/index.vue
+++ b/ruoyi-ui/src/views/contacts/index.vue
@@ -62,14 +62,12 @@
<i slot="prefix" class="el-input__icon el-icon-search"></i>
</el-input>
</el-form-item>
- <el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
- style=" width: 65px; height: 32px;background: #FFDDE3;
- border-radius: 6px 6px 6px 6px;opacity:1;">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery" style=" width: 65px; height: 32px;background: #FFDDE3;
- border-radius: 6px 6px 6px 6px;opacity:1; " >閲嶇疆</el-button>
-
- </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: 72px;
@@ -92,7 +90,6 @@
v-hasPermi="['system:role:add']"
>鏂板</el-button>
</el-col>
-
<el-col :span="1.5">
<el-button
type="danger"
@@ -114,7 +111,7 @@
v-hasPermi="['family:note:export']"
>瀵煎嚭</el-button>
</el-col>
- <el-col :span="1.5">
+ <el-col :span="1.5">
<el-button
type="warning"
plain
@@ -124,7 +121,7 @@
v-hasPermi="['family:note:export']"
>瀵煎叆妯℃澘涓嬭浇</el-button>
</el-col>
- <el-col :span="1.2">
+ <el-col :span="1.2">
<el-upload
action=""
@@ -139,16 +136,15 @@
</el-upload>
</el-col>
-
-
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
+
</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 label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80"/>
- <el-table-column label="鎴愬憳濮撳悕" prop="myName" sortable width="100" >
+ <el-table-column label="鎴愬憳濮撳悕" prop="myName" sortable width="160" >
<template slot-scope="scope">
<div>
<a href="javascript:;" @click="handleCheck(scope.row)">{{scope.row.myName}}</a>
@@ -156,15 +152,15 @@
</template>
</el-table-column>
- <el-table-column label="绉板懠" prop="nickName" sortable :show-overflow-tooltip="true" width="80" align="center" />
- <el-table-column label="濮撳悕" prop="name" sortable :show-overflow-tooltip="true" width="80" align="center"/>
- <el-table-column label="宸ヤ綔鍗曚綅" prop="work" sortable width="100" align="center" >
+ <el-table-column label="绉板懠" prop="nickName" sortable :show-overflow-tooltip="true" width="120" 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>
</el-table-column>
- <el-table-column label="鎵嬫満" prop="phone" sortable width="110" align="center" >
+ <el-table-column label="鎵嬫満" prop="phone" sortable width="120" align="center" >
<template slot-scope="scope">{{scope.row.phone? scope.row.phone: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="鍏跺畠鑱旂郴鏂瑰紡" prop="wx qq twitter" sortable width="130" align="center" >
+ <el-table-column label="鍏跺畠鑱旂郴鏂瑰紡" prop="wx qq twitter" sortable width="180" align="center" >
<template slot-scope="scope">
<span v-if="scope.row.wx || scope.row.qq || scope.row.twitter == true">
{{scope.row.wx}}<br>
@@ -174,7 +170,7 @@
<span v-else>鈥斺�斺�斺��</span>
</template>
</el-table-column>
- <el-table-column label="鏄惁甯歌仈绯�" prop="isAlways" sortable width="120" align="center" >
+ <el-table-column label="鏄惁甯歌仈绯�" prop="isAlways" sortable width="170" align="center" >
<template slot-scope="scope">
<span v-if="scope.row.isAlways===1">鏄�</span>
<span v-if="scope.row.isAlways===0">鍚�</span>
@@ -182,13 +178,11 @@
</template>
</el-table-column>
- <el-table-column label="澶囨敞锛堟槸鍚﹀瓨鍦ㄩ噾閽卞叧绯伙級" prop="remark" sortable width="200" >
-
-
+ <el-table-column label="澶囨敞锛堟槸鍚﹀瓨鍦ㄩ噾閽卞叧绯伙級" prop="remark" sortable width="120" align="center">
<template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="鐢靛瓙鍚嶇墖" prop="url" width="160" >
+ <el-table-column label="鐢靛瓙鍚嶇墖" prop="url" width="160" align="center">
<template slot-scope="scope" >
<img
class="el-upload-list__item-thumbnail"
@@ -226,19 +220,12 @@
@click="handleDelete(scope.row)"
v-hasPermi="['system:role:remove']"
>鍒犻櫎</el-button>
-
<el-button
size="mini"
type="text"
icon="el-icon-d-arrow-right"
@click="handleCheck(scope.row)">
鏌ョ湅璇︽儏</el-button>
-
-
-
-
-
-
</template>
</el-table-column>
</el-table>
@@ -376,7 +363,7 @@
import { Notification, MessageBox, Message, Loading } from 'element-ui'
//瀵煎叆鎺ュ彛鍑芥暟
-import {getContactList,enload, getContactIdList, addContact,updateContact, delContact,uploadPic} from "@/api/contacts/index";
+import {getContactList,enload, addContact, delContact,uploadPic} from "@/api/contacts/index";
export default {
name: "index",
dicts: ['sys_normal_disable'],
@@ -728,7 +715,7 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const Ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎缂栧彿涓�"' + Ids + '"鐨勬暟鎹」锛�').then(function() {
+ this.$modal.confirm('鏄惁纭鍒犻櫎鏁版嵁椤癸紵').then(function() {
return delContact(Ids);
}).then(() => {
this.getList();
@@ -738,7 +725,7 @@
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
const Ids = this.ids;
-
+
if(Ids.length==0)
{
this.download('zfContact/export', {
--
Gitblit v1.9.1