From 8319f67b9bec1d19c06eaa4216f0f34c67e3afb1 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期日, 10 九月 2023 10:08:25 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web
---
ruoyi-ui/src/views/contacts/contactsInfo.vue | 161 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 92 insertions(+), 69 deletions(-)
diff --git a/ruoyi-ui/src/views/contacts/contactsInfo.vue b/ruoyi-ui/src/views/contacts/contactsInfo.vue
index 986d244..9263e66 100644
--- a/ruoyi-ui/src/views/contacts/contactsInfo.vue
+++ b/ruoyi-ui/src/views/contacts/contactsInfo.vue
@@ -2,57 +2,78 @@
<div class="app-container">
<div class="form-header mt">
<h4 class="dt h4">閫氳褰曡缁嗕俊鎭� </h4>
- <!-- <el-button v-if="isShow" type="primary" class="pt" icon="el-icon-edit" @click="handleEdit()" >缂栬緫</el-button>-->
- <!-- <br>-->
- <!-- <el-button type="primary" class="pt" @click="handleExport"-->
- <!-- v-hasPermi="['self:user:export']" >瀵煎嚭</el-button>-->
</div>
+ <div style="padding-left:15px">
+ <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-position="left" label-width="100px">
+ <el-container>
+ <el-row :span="12">
+ <el-cow>
+ <el-form-item label="瀹朵汉濮撳悕" prop="myName" label-width="80px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="formData.myName" placeholder="璇疯緭鍏ュ浜哄鍚�" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-cow>
+ <el-cow>
+ <el-form-item label="閫氳褰曚腑绉板懠" prop="nickName" label-width="110px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="formData.nickName" placeholder="璇疯緭鍏ラ�氳褰曚腑绉板懠" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-cow>
+ <el-cow>
+ <el-form-item label="濮撳悕" prop="name" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="formData.name" placeholder="璇疯緭鍏ュ鍚�" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-cow>
- <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-position="left" label-width="100px">
- <!-- <el-form-item label="id" prop="id">-->
- <!-- <el-input v-model="formData.id" placeholder="璇疯緭鍏d" :maxlength="11" show-word-limit :disabled="true"-->
- <!-- clearable prefix-icon='el-icon-mobile' :style="{width: '100%'}"></el-input>-->
- <!-- </el-form-item>-->
- <el-form-item label="鎴愬憳濮撳悕" prop="myName" label-width="80px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="formData.myName" placeholder="璇疯緭鍏ユ垚鍛樺鍚�" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- <el-form-item label="绉板懠" prop="nickName" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="formData.nickName" placeholder="璇疯緭鍏ョО鍛�" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- <el-form-item label="濮撳悕" prop="name" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="formData.name" placeholder="璇疯緭鍏ュ鍚�" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- <el-form-item label="宸ヤ綔鍗曚綅" prop="work" label-width="80px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="formData.work" placeholder="璇疯緭鍏ュ叿浣撲綅缃�" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- <el-form-item label="鎵嬫満" prop="phone" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="formData.phone" placeholder="璇疯緭鍏ユ墜鏈�" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- <el-form-item label="寰俊" prop="wx" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="formData.wx" placeholder="璇疯緭鍏ュ井淇�" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- <el-form-item label="QQ" prop="qq" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="formData.qq" placeholder="璇疯緭鍏Q" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- <el-form-item label="twitter" prop="twitter" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="formData.twitter" placeholder="璇疯緭鍏witter" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- <el-form-item label="鏄惁甯歌仈绯�" prop="isAlways" label-width="90px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="formData.isAlways === 1 ? '鏄�':'鍚�' " placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
- </el-form-item>
- <el-form-item label="澶囨敞锛堟槸鍚﹀瓨鍦ㄩ噾閽卞叧绯伙級" prop="remark" label-width="180px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
- </el-form-item>
-
+ <el-cow>
+ <el-form-item label="宸ヤ綔鍗曚綅" prop="work" label-width="80px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="formData.work" placeholder="璇疯緭鍏ュ叿浣撲綅缃�" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-cow>
+ <el-cow>
+ <el-form-item label="鎵嬫満" prop="phone" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="formData.phone" placeholder="璇疯緭鍏ユ墜鏈�" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-cow>
+ <el-cow>
+ <el-form-item label="寰俊" prop="wx" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="formData.wx" placeholder="璇疯緭鍏ュ井淇�" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-cow>
+ <el-cow>
+ <el-form-item label="QQ" prop="qq" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="formData.qq" placeholder="璇疯緭鍏Q" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-cow>
+ <el-cow>
+ <el-form-item label="twitter" prop="twitter" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="formData.twitter" placeholder="璇疯緭鍏witter" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-cow>
+ <el-cow>
+ <el-form-item label="鏄惁甯歌仈绯�" prop="isAlways" label-width="90px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="formData.isAlways === 1 ? '鏄�':'鍚�' " placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ </el-cow>
+ <el-cow>
+ <el-form-item label="澶囨敞锛堟槸鍚﹀瓨鍦ㄩ噾閽卞叧绯伙級" prop="remark" label-width="180px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
+ </el-form-item>
+ </el-cow>
+ <el-cow >
+ <el-form-item label="鏄惁鏄湰瀹跺涵璁板綍" prop="ownData">
+ <el-input v-model="formData.ownData=== 1 ? '鏄�':'鍚�'" placeholder=" " clearable :style="{width: '100%'}" :disabled=true></el-input>
+ </el-form-item>
+ </el-cow>
+ </el-row>
+ </el-container>
<h4 class="form-header">鐢靛瓙鍚嶇墖 </h4>
<el-upload
action="#"
@@ -61,7 +82,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"
@@ -73,14 +95,14 @@
>
<span class="el-upload-list__item-actions">
<span
- v-if="isShow"
+
class="el-upload-list__item-preview"
@click="handlePictureCardPreview(file)"
>
<i class="el-icon-zoom-in"></i>
</span>
<span
- v-if="isShow"
+
class="el-upload-list__item-delete"
@click="handleDownload(file.url)"
>
@@ -99,7 +121,7 @@
</div>
</el-upload>
- <!--<h4 class="form-header">鍏朵粬闄勪欢 </h4>
+ <h4 class="form-header">鍏朵粬闄勪欢 </h4>
<el-upload
action=""
:file-list="fileListOther"
@@ -107,12 +129,12 @@
multiple
list-type="picture-card"
:on-preview="handleFileCardPreview"
- :on-remove="handleRemove"
+ :on-remove="handleRemoveFile"
:http-request="requestUpload"
:show-file-list="true"
>
-
- <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"
@@ -123,20 +145,19 @@
>
<span class="el-upload-list__item-actions">
<span
- v-if="isShow"
+
class="el-upload-list__item-preview"
@click="handleFileCardPreview(file)"
>
<i class="el-icon-zoom-in"></i>
</span>
<span
- v-if="isShow"
- @click="handleRemove(file)"
- class="el-upload-list__item-delete"
+ class="el-upload-list__item-delete"
+ @click="handleDownload(file.url)"
>
- <i class="el-icon-download"></i>
- </span>
+ <i class="el-icon-download"></i>
+ </span>
<span
v-if="isShow"
class="el-upload-list__item-delete"
@@ -150,13 +171,13 @@
</div>
- </el-upload>-->
+ </el-upload>
<el-form-item size="large">
<el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb">淇敼</el-button>
</el-form-item>
</el-form>
-
+ </div>
<el-dialog :visible.sync="dialogVisible">
<img w-full :src="dialogImageUrl" alt="Preview Image" />
</el-dialog>
@@ -185,6 +206,7 @@
dsb:true,
btn:false,
isShow:true,
+ uploading: false,
// 閫氳褰曡〃鏍兼暟鎹�
contactList: [],
@@ -216,7 +238,7 @@
myName: [{
required: true,
- message: '璇疯緭鍏ユ垚鍛樺鍚�',
+ message: '璇疯緭鍏ュ浜哄鍚�',
trigger: 'blur'
}],
nickName: [{
@@ -259,8 +281,8 @@
this.$route.meta.title = "淇敼閫氳褰曡缁嗕俊鎭�";//鍒楄〃鐨勫悕绉�
}
else{
- document.title = "鏌ョ湅閫氳褰曡缁嗕俊鎭�";
- this.$route.meta.title = "鏌ョ湅閫氳褰曡缁嗕俊鎭�";//鍒楄〃鐨勫悕绉�
+ document.title = "閫氳褰曡缁嗕俊鎭�";
+ this.$route.meta.title = "閫氳褰曡缁嗕俊鎭�";//鍒楄〃鐨勫悕绉�
this.isShow=false
}
@@ -396,10 +418,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