From 32148fb89c6cbedc24aaf9cb93a215a6cc665f2b Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期二, 09 七月 2024 16:56:14 +0800
Subject: [PATCH] 修改了一些报错，完善了用户管理配偶的选择模块
---
ruoyi-ui/src/views/contacts/index.vue | 265 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 200 insertions(+), 65 deletions(-)
diff --git a/ruoyi-ui/src/views/contacts/index.vue b/ruoyi-ui/src/views/contacts/index.vue
index b8530c5..1192a26 100644
--- a/ruoyi-ui/src/views/contacts/index.vue
+++ b/ruoyi-ui/src/views/contacts/index.vue
@@ -75,13 +75,14 @@
<!-- line-height: 21px;-->
<!-- ">閫氳褰�</div>-->
- <el-row :gutter="10" class="mb8">
+ <el-row :gutter="10" class="mb8" v-if="userId != 2">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
+
@click="handleAdd"
v-hasPermi="['system:role:add']"
>鏂板</el-button>
@@ -94,6 +95,7 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
+
v-hasPermi="['system:role:remove']"
>鍒犻櫎</el-button>
</el-col>
@@ -117,28 +119,34 @@
v-hasPermi="['family:note:export']"
>瀵煎叆妯℃澘涓嬭浇</el-button>
</el-col>
- <el-col :span="1.2">
+ <el-col :span="1.5">
- <el-upload
+ <el-upload
action=""
-
class="upload-demo"
+ :auto-upload="true"
:show-file-list="false"
:http-request="handleEnport"
- >
- <el-button size="mini" type="primary"
- plain
- icon="el-icon-plus" >瀵煎叆</el-button>
- </el-upload>
+ >
+ <el-button
+ type="primary"
+ plain
+
+ icon="el-icon-top"
+ size="mini"
+
+ >瀵煎叆</el-button>
+
+ </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 v-loading="loading" :data="contactList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" >
<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="100"/>
+ <el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="100px"/>
<el-table-column label="瀹朵汉濮撳悕" prop="myName" sortable width="130" >
<template slot-scope="scope">
@@ -204,13 +212,14 @@
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" width="250" class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" align="center" width="250" class-name="small-padding fixed-width" v-if="userId != 2">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
<div class="button-container">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
+ :disabled="!scope.row.ownData"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:role:edit']"
>
@@ -220,6 +229,7 @@
size="mini"
type="text"
icon="el-icon-delete"
+ :disabled="!scope.row.ownData"
@click="handleDelete(scope.row)"
v-hasPermi="['system:role:remove']"
><span style="font-size: 14px;">鍒犻櫎</span></el-button>
@@ -299,6 +309,9 @@
multiple
:http-request="requestUpload"
:file-list="fileList"
+ :on-change="handleChange"
+ :auto-upload="false"
+ ref="upload"
>
<i slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{ file }">
@@ -332,6 +345,13 @@
</div>
</el-upload>
+ <el-button
+ style="margin-left: 10px"
+ size="small"
+ type="success"
+
+ @click="picUpload"
+ >涓婁紶鍒版湇鍔″櫒</el-button>
<h4 class="form-header">鍏朵粬闄勪欢 </h4>
<el-upload
action=""
@@ -342,15 +362,62 @@
:on-remove="handleRemoveFile"
:http-request="requestUpload1"
:show-file-list="true"
+ ref="upload1"
+ :on-change="handleChange1"
+ :auto-upload="false"
+ list-type="picture-card"
>
- <el-button type="primary">鐐瑰嚮涓婁紶</el-button>
- <div v-if="uploading1" class="upload-status">姝ｅ湪涓婁紶...</div>
- <template #tip>
+
+ <!-- <template #tip>
<div class="el-upload__tip">
</div>
</template>
- </el-upload>
+ </el-upload> -->
+ <i slot="default" class="el-icon-plus"></i>
+ <div slot="file" slot-scope="{file}">
+ <!-- 娣诲姞video鍏冪礌鐢ㄤ簬鏄剧ず瑙嗛 -->
+ <video
+ v-if="file.url.includes('.mp4')"
+ class="el-upload-list__item-thumbnail"
+ :src="file.url"
+ style="width: 147px; height: 147px"
+ fit="cover"
+ ></video>
+ <img v-else
+ class="el-upload-list__item-thumbnail"
+ src="../../assets/images/deviceLis.png"
+ alt=""
+ style="width: 100%; height: 100%"
+ fit="cover"></img>
+ <span class="el-upload-list__item-actions">
+ <span class="el-upload-list__item-name">{{ file.name }}</span>
+ <!-- <span
+ class="el-upload-list__item-preview"
+ @click="handleFileCardPreview(file)"
+ >
+ <i class="el-icon-zoom-in"></i>
+ </span> -->
+
+ <span
+
+ class="el-upload-list__item-delete"
+ @click="handleRemoveFile(file)"
+ >
+ <i class="el-icon-delete"></i>
+ </span>
+ </span>
+
+ </div>
+
+
+ </el-upload>
+ <el-button
+ style="margin-left: 10px"
+ size="small"
+ type="success"
+ @click="fileUpload"
+ >涓婁紶鍒版湇鍔″櫒</el-button>
</el-form>
<h4 class="form-header"> </h4>
@@ -370,7 +437,7 @@
<script>
import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
-
+import {getInfo} from "@/api/login";
import { Notification, MessageBox, Message, Loading } from 'element-ui'
//瀵煎叆鎺ュ彛鍑芥暟
@@ -380,6 +447,7 @@
dicts: ['sys_normal_disable'],
data() {
return {
+ userId: undefined,
// 閬僵灞�
disabled: false,
@@ -410,12 +478,15 @@
// 鏃ユ湡鑼冨洿
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:[
-
- ],
+ fileList1:[],
+ uploadFileList: [],
+ uploadFileList1: [],
+ fileListOther:[],
dsb:true,
btn:false,
fit:['fill'],
@@ -435,7 +506,7 @@
twitter:undefined,
isAlways:undefined,
remark:undefined,
- url: undefined,
+ url: '',
},
// 鑿滃崟鍒楄〃
@@ -515,7 +586,7 @@
trigger: 'blur'
}],
isAlways: [{
- // required: true,
+ required: true,
message: '鏄惁甯歌仈绯�',
trigger: 'blur'
}],
@@ -537,12 +608,20 @@
},
created() {
this.getList();
+ this.getInfo()
// this.getCateInfor()
// for (let i = 0; i < this.contactList.length; i++) {
// this.formDat[i] = this.contactList[i];
// }
},
methods: {
+ getInfo(){
+ console.log('-----------------')
+ getInfo().then(response=>{
+ console.log(response.user.roles[0].roleId,'roleID')
+ this.userId = response.user.roles[0].roleId
+ })
+ },
// 鍙栨秷鎸夐挳
cancelData() {
this.open = false;
@@ -564,15 +643,22 @@
/** 鏌ヨ閫氳褰曞垪琛� */
getList() {
this.loading = true;
+ let _this = this
// console.log(this.queryParams)
// listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
getContactList(this.queryParams).then(response => {
// alert(123)
// console.log(response.data)
- this.contactList = response.data.data;
+ if(response.msg=="鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�")
+ {
+ _this.$modal.msgSuccess("鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�");
+ _this.loading = false;
+ }else{
+ _this.contactList = response.data.data;
- this.total = response.data.total;
- this.loading = false;
+ _this.total = response.data.total;
+ _this.loading = false;
+ }
}
);
},
@@ -581,14 +667,22 @@
for(let i = 0; i < this.fileListOther.length; i++)
{
if(this.fileListOther[i].url==file.url)
- this.$delete(this.fileListOther,i);
+ {
+
+ this.$delete(this.fileListOther,i);
+ this.$delete(this.uploadFileList1,i);
+
+ }
}
},
handleRemove(file) {
for(let i = 0; i < this.fileList.length; i++)
{
if(this.fileList[i].url==file.url)
- this.$delete(this.fileList,i);
+ {
+ this.$delete(this.fileList,i);
+ this.$delete(this.uploadFileList,i);
+ }
}
},
// 鍙栨秷鎸夐挳
@@ -622,7 +716,7 @@
deptCheckStrictly: true,
remark: undefined
};
- this.resetForm("form");
+ this.resetForm("elForm");
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
@@ -683,13 +777,6 @@
/** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
submitDataScope: function() {
- let ul = this.fileList.map(function (elem){
- return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
- }).join(",")
- let uls = this.fileListOther.map(function (elem){
- return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
- }).join(",")
- this.formDat.url = ul+","+uls
this.$refs["elForm"].validate(valid => {
if (valid) {
@@ -714,38 +801,86 @@
},
requestUpload(params)
{
- var file = params.file;
- 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})
- }
- })
+
},
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})
- }
- })
+
},
+ handleChange(file, fileList1) {
+ //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
+
+ // this.uploadFileList.push(file.raw);
+ console.log("=========5555=========")
+ console.log(file)
+ // console.log(this.uploadFileList)
+ // this.fileList = fileList
+ //alert(file)
+ this.uploadFileList.push(file.raw);
+ this.fileList.push({name:file.name,url:file.url})
+ //alert(fileList1.length)
+ },
+ handleChange1(file, fileOtherList1) {
+ //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
+ this.uploadFileList1.push(file.raw);
+ this.fileListOther.push({name:file.name,url:file.url})
+ // this.uploadFileList.push(file.raw);
+ console.log("=========5555=========")
+ //console.log(file)
+ // console.log(this.uploadFileList)
+ // this.fileList = fileList
+ },
+ fileUpload(){
+ // var file = params.file;
+
+ var formData = new FormData();
+ this.$refs.upload1.submit();
+ // formData.append('uploadFile', file);
+ if(this.uploadFileList1.length==0){
+ this.$modal.msgSuccess("鏂囨。涓婁紶鍒楄〃涓嶈兘涓虹┖!");
+ return
+ }
+ this.uploadFileList1.forEach((elem)=>{
+ formData.append("files", elem)
+
+ })
+
+ let _this = this
+
+ this.uploading = true;
+ uploadPic(formData).then(response => {
+ _this.uploadFileList1 = []
+ _this.formDat.url = _this.formDat.url+","+response.fileNames
+ _this.$modal.msgSuccess("鏂囦欢涓婁紶鎴愬姛!");
+ })
+
+ },
+ picUpload()
+ {
+ var formData = new FormData();
+ //alert(976)
+ //this.$refs.upload.submit();
+ //alert(8)
+ //alert(this.uploadFileList.length)
+ if(this.uploadFileList.length==0){
+ this.$modal.msgSuccess("鍥剧墖涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
+ return}
+ //console.log(this.uploadFileList)
+ this.uploadFileList.forEach((elem)=>{
+ formData.append("files", elem)
+
+ })
+ //alert(90)
+ let _this = this
+ //alert(9)
+ uploadPic(formData).then(response => {
+ // alert("dds")
+ _this.formDat.url = _this.formDat.url+","+response.fileNames
+ _this.uploadFileList = []
+ _this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
+
+ });
+ },
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const Ids = row.id || this.ids;
@@ -795,7 +930,7 @@
};
</script>
-<style >
+<style scoped>
.app-container{
background-color: #FEF7FC;
}
--
Gitblit v1.9.1