From 9ca0e9dc50759f4c00498e68c0155bcc3db2be2f Mon Sep 17 00:00:00 2001
From: fangyuan <527392886@qq.com>
Date: 星期二, 27 十二月 2022 15:20:02 +0800
Subject: [PATCH] 页面修改
---
src/views/cause/Entry.vue | 75 +++++++++-----
src/views/cause/Group.vue | 43 ++++++--
src/views/common/Audit.vue | 9 +
src/plugins/element.js | 3
src/views/manager/User.vue | 150 +++++++++++++++--------------
5 files changed, 161 insertions(+), 119 deletions(-)
diff --git a/src/plugins/element.js b/src/plugins/element.js
index 1d6a143..a17ac33 100644
--- a/src/plugins/element.js
+++ b/src/plugins/element.js
@@ -12,10 +12,11 @@
MenuItem,
Message, Option, Pagination,
Row, Select,
- Submenu, Table, TableColumn, Upload,Tree
+ Submenu, Table, TableColumn, Upload,Tree,MessageBox
} from 'element-ui'
Vue.use(Button).use(Container).use(Header).use(Aside).use(Menu).use(Submenu).use(MenuItem).use(Main).use(Icon).use(Card)
.use(Col).use(Row).use(Card).use(Table).use(TableColumn).use(Form).use(FormItem).use(Input).use(Select).use(Option)
.use(Pagination).use(Dialog).use(Upload).use(DatePicker).use(Image).use(Tree)
Vue.prototype.$message = Message
+Vue.prototype.$confirm = MessageBox.confirm
diff --git a/src/views/cause/Entry.vue b/src/views/cause/Entry.vue
index c7dd612..32074a5 100644
--- a/src/views/cause/Entry.vue
+++ b/src/views/cause/Entry.vue
@@ -35,7 +35,7 @@
</el-table-column>
<el-table-column prop="reportNumber" label="鎶ユ浜烘暟" width="100" header-align="center" align="center">
</el-table-column>
- <el-table-column prop="totalMoney" label="棰勪及鎬婚噾棰�" width="100" header-align="center" align="center">
+ <el-table-column prop="totalMoney" label="棰勪及鎬婚噾棰�" width="100" header-align="center" align="center">
</el-table-column>
<el-table-column prop="firstTime" label="鏈�鏃╁彂妗堟棩鏈�" width="160" header-align="center" align="center">
</el-table-column>
@@ -83,9 +83,10 @@
</el-input>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <el-col :span="12">
<el-form-item label="棰勪及鎬婚噾棰�" prop="totalMoney">
- <el-input v-model="causeForm.totalMoney" clearable :style="{ width: '100%' }" placeholder="杈撳叆棰勪及鎬婚噾棰�"></el-input>
+ <el-input v-model="causeForm.totalMoney" clearable :style="{ width: '100%' }"
+ placeholder="杈撳叆棰勪及鎬婚噾棰�"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -111,7 +112,7 @@
</el-select>
</el-form-item>
</el-col>
-
+
<el-col :span="24">
<el-form-item label="妗堜欢鎻忚堪" prop="description">
<el-input v-model="causeForm.description" type="textarea" placeholder="璇疯緭鍏ュ琛屾枃鏈�"
@@ -143,7 +144,7 @@
</el-input>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <el-col :span="12">
<el-form-item label="棰勪及鎬婚噾棰�" prop="totalMoney">
<el-input v-model="updataCauseForm.totalMoney" clearable :style="{ width: '100%' }"></el-input>
</el-form-item>
@@ -261,7 +262,8 @@
</el-table-column>
<el-table-column width="100" prop="reportMaterials" label="鎶ユ鏉愭枡">
<template slot-scope="scope">
- <span>{{ scope.row.reportMaterials === null||scope.row.reportMaterials === '' ? "鏈彁浜�" : "宸叉彁浜�" }}</span>
+ <span>{{ scope.row.reportMaterials === null || scope.row.reportMaterials === '' ? "鏈彁浜�" : "宸叉彁浜�"
+}}</span>
</template>
</el-table-column>
<el-table-column width="200" prop="ctime" label="鎶ユ鏃堕棿">
@@ -289,15 +291,15 @@
:before-close="addReportVisibleClose">
<el-row :gutter="15">
<el-form ref="auditFrom" :model="auditFrom" :rules="addReportRules" size="medium" label-width="100px">
- <!-- <el-col :span="12">
- <el-form-item label="澶村儚" prop="pic" required>
- <el-upload ref="pic" action="/api/minio/upload" :show-file-list="false" :on-success="handleAvatarSuccess"
- list-type="picture-card" accept="image/*">
- <img v-if="picShow" :src="picShow" style="width: 145px;height: 145px">
- <i v-else class="el-icon-plus"></i>
- </el-upload>
- </el-form-item>
- </el-col> -->
+ <el-col :span="12">
+ <el-form-item label="澶村儚" prop="pic" required>
+ <el-upload ref="pic" action="/api/minio/upload" :show-file-list="false"
+ :on-success="handleAvatarSuccess" list-type="picture-card" accept="image/*">
+ <img v-if="picShow" :src="picShow" style="width: 145px;height: 145px">
+ <i v-else class="el-icon-plus"></i>
+ </el-upload>
+ </el-form-item>
+ </el-col>
<el-col :span="12">
<el-form-item label="鎶ユ浜� " prop="reporterName">
<el-input v-model="auditFrom.reporterName" placeholder="璇疯緭鍏ユ姤妗堜汉 " clearable :style="{ width: '100%' }">
@@ -362,24 +364,35 @@
:before-close="updateReportVisibleclose">
<el-row :gutter="20">
<el-form ref="updateReportForm" :model="updateReportForm" size="medium" label-width="100px">
- <!-- <el-col :span="12">
+ <el-col :span="12">
+ <el-form-item label="澶村儚" prop="pic" required>
+ <el-upload ref="pic" action="/api/minio/upload" :show-file-list="false"
+ :on-success="handleAvatarSuccess" list-type="picture-card" accept="image/*">
+ <img v-if="updateReportForm.pic!=null||updateReportForm!=''" :src="updateReportForm.pic" style="width: 145px;height: 145px">
+ <i v-else class="el-icon-plus"></i>
+ </el-upload>
+ </el-form-item>
+ </el-col>
+
+ <el-col :span="12">
<el-form-item label="鎶ユ浜� " prop="reporterName">
- <el-input v-model="auditFrom.reporterName" placeholder="璇疯緭鍏ユ姤妗堜汉 " clearable :style="{ width: '100%' }">
+ <el-input v-model="updateReportForm.reporterName" placeholder="璇疯緭鍏ユ姤妗堜汉 " clearable :style="{ width: '100%' }">
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鎵嬫満鍙风爜" prop="mobile">
- <el-input v-model="auditFrom.mobile" placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�" clearable :style="{ width: '100%' }">
+ <el-input v-model="updateReportForm.mobile" placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�" clearable :style="{ width: '100%' }">
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="韬唤璇佸彿" prop="idcard">
- <el-input v-model="auditFrom.idcard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" clearable :style="{ width: '100%' }">
+ <el-input v-model="updateReportForm.idcard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" clearable :style="{ width: '100%' }">
</el-input>
</el-form-item>
- </el-col> -->
+ </el-col>
+
<el-col :span="12">
<el-form-item prop="reportTime" label="鎶ユ鏃堕棿">
<el-date-picker v-model="updateReportForm.reportTime" type="datetime" placeholder="閫夋嫨鏃ユ湡鏃堕棿" clearable
@@ -420,8 +433,7 @@
</el-upload>
</el-form-item>
</el-col>
- <!--
- <el-col :span="24">
+ <!-- <el-col :span="24">
<el-form-item label="涓婁紶" prop="fileList" required>
<el-upload ref="reportMaterials" :file-list="auditFrom.fileList" action="/api/minio/upload"
list-type="picture" :on-success="handleMaterialSuccess">
@@ -591,9 +603,9 @@
</el-col>
<el-col :span="12">
<el-form-item label="鐘舵��" prop="status">
- <span v-if="detailsGroupAn.status === 1">宸插彂甯�</span>
- <span v-else-if="detailsGroupAn.status === 0">鏈彂甯�</span>
- <span v-else="detailsGroupAn.status === 2">宸蹭笅鏋�</span>
+ <span v-if="detailsGroupAn.status === 1">宸插彂甯�</span>
+ <span v-else-if="detailsGroupAn.status === 0">鏈彂甯�</span>
+ <span v-else="detailsGroupAn.status === 2">宸蹭笅鏋�</span>
</el-form-item>
</el-col>
</el-form>
@@ -729,6 +741,7 @@
size: 10,
},
auditFrom: {
+ pic: '',
reporterName: '',
mobile: '',
idcard: '',
@@ -824,7 +837,7 @@
message: '璇烽�夋嫨妗堜欢鐘舵�� ',
trigger: 'blur'
}],
- totalMoney: [{
+ totalMoney: [{
required: true,
message: '璇疯緭鍏ラ浼版�婚噾棰� ',
trigger: 'blur'
@@ -890,6 +903,7 @@
}
],
updateReportForm: {
+ pic: '',
reporterName: '',
mobile: '',
idcard: '',
@@ -905,6 +919,7 @@
//妗堜欢浜哄憳琛ㄦ牸鏁版嵁
updateReportPrams: {
id: '',
+ pic:'',
reporterName: '',
mobile: '',
idcard: '',
@@ -930,6 +945,7 @@
},
updataCauseForm: {
id: '',
+ pic:'',
name: '',
number: '',
firstTime: '',
@@ -1214,6 +1230,8 @@
this.updateReportPrams.groupId = this.updateReportForm.groupId
this.updateReportPrams.id = this.updateReportForm.id
this.updateReportPrams.reportMaterials = this.updateReportPrams.fileList.map(i => i.data).join(',')
+ debugger
+ this.updateReportPrams.pic=this.updateReportForm.pic
let form = null;
form = this.updateReportPrams;
const data = form;
@@ -1231,6 +1249,7 @@
//缂栬緫妗堜欢浜哄憳
updataReport(val) {
+ debugger
this.updateReportVisible = true;
this.updateReportForm = Object.assign({}, val);
this.causeId = val.causeId;
@@ -1274,7 +1293,7 @@
if (!vaild) return this.$message.error('杈撳叆鏈夎')
this.auditFrom.reportMaterials = this.auditFrom.fileList.map(i => i.data).join(',');
this.auditFrom.causeId = this.reportCauseId;
- console.log(this.reportCauseId);
+ // console.log(this.reportCauseId);
report(this.auditFrom).then(res => {
this.$message.success('鎻愪氦鎴愬姛')
this.auditFrom = {}
@@ -1292,9 +1311,9 @@
},
handleAvatarSuccess(res, file) {
this.auditFrom.pic = res.data
-
getImgUrl(res.data).then(res => {
this.picShow = res
+ this.updateReportForm.pic = res
})
},
async handleMaterialSuccess(res, file) {
diff --git a/src/views/cause/Group.vue b/src/views/cause/Group.vue
index 8625e55..14fc15a 100644
--- a/src/views/cause/Group.vue
+++ b/src/views/cause/Group.vue
@@ -33,10 +33,12 @@
<ul v-infinite-scroll="load" style="overflow:auto">
<li v-for="messageOne in messageList" class="infinite-list-item">
<div class="msglist">
- <img v-if="messageOne.pic!=null&&messageOne.pic!=''" class="face" :src="'http://172.35.1.173:19001/img/'+messageOne.pic">
- <img v-if="messageOne.pic==null||messageOne.pic==''" class="face" src="../../icons/7bedbaa41b1744fbfe0c55b507fd9e28.png">
- <div class="name">{{messageOne.userName}} {{messageOne.ctime}}</div>
- <div class="message">{{messageOne.text}}</div>
+ <img v-if="messageOne.pic != null && messageOne.pic != ''" class="face"
+ :src="messageOne.pic">
+ <img v-if="messageOne.pic == null || messageOne.pic == ''" class="face"
+ src="../../icons/7bedbaa41b1744fbfe0c55b507fd9e28.png">
+ <div class="name">{{ messageOne.userName }} {{ messageOne.ctime }}</div>
+ <div class="message">{{ messageOne.text }}</div>
</div>
</li>
</ul>
@@ -127,6 +129,7 @@
//saveSubject
} from '@/api/group'
import { Message } from 'element-ui';
+import { getImgUrl } from '@/api/common'
export default {
name: "Group",
@@ -184,11 +187,11 @@
this.treeData[0].children = res;
}
)
- var params=window.location.href.split("id=")
- if(params.length!=1){
- var param={id:params[1]}
+ var params = window.location.href.split("id=")
+ if (params.length != 1) {
+ var param = { id: params[1] }
this.handleNodeClick(param)
-
+
}
},
filterNode(value, data) {
@@ -201,7 +204,20 @@
handleNodeClick(data) {
if (data.id != null) {
this.groupName = data.groupName;
- getAllMessage(data.id).then(res => this.messageList = res)
+ var _this = this;
+ getAllMessage(data.id).then((res) => {
+
+ for (let item of res) {
+ if (item.pic === '' || item.pic === null) {
+ } else {
+ getImgUrl(item.pic).then(res => {
+ item.pic = res
+ })
+ }
+ }
+ this.messageList = res
+ debugger
+ })
getAllNotice(data.id).then(res => this.groupAnList = res)
getAllUser(data.id).then(res => this.tableData = res)
this.groupId = data.id;
@@ -290,9 +306,10 @@
margin-left: 2%;
}
-.msglist{
-margin-bottom: 3%;
+.msglist {
+ margin-bottom: 3%;
}
+
.face {
float: left;
width: 25px;
@@ -306,9 +323,11 @@
color: #7F7F7F;
font-size: 14px;
}
-.message{
+
+.message {
margin-top: 2%;
}
+
.mian1 {
margin-top: 20px;
}
diff --git a/src/views/common/Audit.vue b/src/views/common/Audit.vue
index ffa24c9..6af7e8a 100644
--- a/src/views/common/Audit.vue
+++ b/src/views/common/Audit.vue
@@ -86,13 +86,13 @@
<el-row :gutter="15">
<el-form ref="addAduitForm" :model="auditFrom" :rules="rules" size="medium" label-width="100px">
<el-col :span="12">
- <!-- <el-form-item label="澶村儚" prop="pic" required>
+ <el-form-item label="澶村儚" prop="pic" required>
<el-upload ref="pic" action="/api/minio/upload" :show-file-list="false" :on-success="handleAvatarSuccess"
list-type="picture-card" accept="image/*">
<img v-if="picShow" :src="picShow" style="width: 145px;height: 145px">
<i v-else class="el-icon-plus"></i>
</el-upload>
- </el-form-item> -->
+ </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鎶ユ浜� " prop="reporterName">
@@ -504,11 +504,13 @@
this.checkVisible = false
this.$refs.infoAduitForm.resetFields()
this.reportData=[]
+ this.picShow=""
},
detailsClose() {
this.infoAduitDialogVisible = false
this.$refs.infoAduitForm.resetFields()
this.reportData=[]
+ this.picShow=""
},
addAduit() {
this.$refs.addAduitForm.validate(async (vaild) => {
@@ -530,7 +532,6 @@
},
handleAvatarSuccess(res, file) {
this.auditFrom.pic = res.data
- console.log(res.data)
getImgUrl(res.data).then(res => {
this.picShow = res
})
@@ -544,8 +545,8 @@
},
addAduitClose() {
this.addAduitDialogVisible = false
- this.$refs.addAduitForm.resetFields()
this.picShow = ""
+ this.$refs.addAduitForm.resetFields()
},
getList() {
let param = {}
diff --git a/src/views/manager/User.vue b/src/views/manager/User.vue
index 7642170..815e4cd 100644
--- a/src/views/manager/User.vue
+++ b/src/views/manager/User.vue
@@ -75,46 +75,41 @@
</span>
</el-dialog>
- <el-dialog title="缂栬緫" :visible.sync="detailsVisible" width="50%" :append-to-body="true"
- :before-close="detailsVisibleclose">
- <el-row :gutter="15">
- <el-form ref="detailsRow" :model="detailsRow" size="medium"
- label-width="100px">
- <el-col :span="12">
- <el-form-item label="鐢ㄦ埛鍚�" prop="nickName">
- <el-input v-model="detailsRow.nickName" placeholder="璇疯緭鍏ョ敤鎴峰悕" clearable
- :style="{ width: '100%' }">
- </el-input>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鐢ㄦ埛濮撳悕" prop="realName">
- <el-input v-model="detailsRow.realName" placeholder="璇疯緭鍏ョ敤鎴峰鍚�" clearable
- :style="{ width: '100%' }">
- </el-input>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鎵嬫満鍙风爜" prop="userMobile">
- <el-input v-model="detailsRow.userMobile" placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�" clearable
- :style="{ width: '100%' }">
- </el-input>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="韬唤璇佸彿" prop="userIdcard">
- <el-input v-model="detailsRow.userIdcard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" clearable
- :style="{ width: '100%' }">
- </el-input>
- </el-form-item>
- </el-col>
- </el-form>
- </el-row>
- <span slot="footer" class="dialog-footer">
- <el-button @click="detailsVisible = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="update">纭� 瀹�</el-button>
- </span>
- </el-dialog>
+ <el-dialog title="缂栬緫" :visible.sync="detailsVisible" width="50%" :append-to-body="true"
+ :before-close="detailsVisibleclose">
+ <el-row :gutter="15">
+ <el-form ref="detailsRow" :model="detailsRow" size="medium" label-width="100px">
+ <el-col :span="12">
+ <el-form-item label="鐢ㄦ埛鍚�" prop="nickName">
+ <el-input v-model="detailsRow.nickName" placeholder="璇疯緭鍏ョ敤鎴峰悕" clearable :style="{ width: '100%' }">
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鐢ㄦ埛濮撳悕" prop="realName">
+ <el-input v-model="detailsRow.realName" placeholder="璇疯緭鍏ョ敤鎴峰鍚�" clearable :style="{ width: '100%' }">
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鎵嬫満鍙风爜" prop="userMobile">
+ <el-input v-model="detailsRow.userMobile" placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�" clearable :style="{ width: '100%' }">
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="韬唤璇佸彿" prop="userIdcard">
+ <el-input v-model="detailsRow.userIdcard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" clearable :style="{ width: '100%' }">
+ </el-input>
+ </el-form-item>
+ </el-col>
+ </el-form>
+ </el-row>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="detailsVisible = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="update">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
</div>
</template>
@@ -131,13 +126,13 @@
data() {
return {
- rules: {
+ rules: {
nickName: [{
required: true,
message: '璇疯緭鍏ョ敤鎴峰悕 ',
trigger: 'blur'
}],
- realName: [{
+ realName: [{
required: true,
message: '璇疯緭鍏ョ敤鎴峰鍚�',
trigger: 'blur'
@@ -147,18 +142,18 @@
message: '璇疯緭鍏ユ墜鏈哄彿 ',
trigger: 'blur'
}],
- userIdcard: [{
+ userIdcard: [{
required: true,
message: '璇疯緭鍏ヨ韩浠借瘉 ',
trigger: 'blur'
}],
- },
+ },
//璇︾粏鍐呭寮规
detailsVisible: false,
//璇︾粏鍐呭
- detailsRow:
- {
- }
+ detailsRow:
+ {
+ }
,
//琛ㄥ崟鎻愪氦鍐呭
addPublicityForm: {
@@ -209,14 +204,18 @@
{
//鍒犻櫎
remove(val) {
- this.$http.delete('/api/user', { params: { id: val } }).then(res => {
- this.$message({
- message: '鍒犻櫎鎴愬姛',
- type: 'success'
+ var _this = this;
+ this.$confirm('纭鍒犻櫎锛�').then(() => {
+ _this.$http.delete('/api/user', { params: { id: val } }).then(res => {
+ _this.$message({
+ message: '鍒犻櫎鎴愬姛',
+ type: 'success'
+ })
+ this.search();
})
+ }
+ )
- this.search();
- })
},
// //鍙戝竷/涓嬫灦
// punlish(val, val2) {
@@ -246,16 +245,19 @@
//缂栬緫
details(val) {
this.detailsVisible = true;
- this.detailsRow = Object.assign({}, val);
+ this.detailsRow = Object.assign({}, val);
},
- update(){
- this.$http.put('/api/user',this.detailsRow).then(res => {this.$message({
- message: '缂栬緫鎴愬姛',
- type: 'success'}
+ update() {
+ this.$http.put('/api/user', this.detailsRow).then(res => {
+ this.$message({
+ message: '缂栬緫鎴愬姛',
+ type: 'success'
+ }
)
- this.search();}
- );
- this.detailsVisible =false;
+ this.search();
+ }
+ );
+ this.detailsVisible = false;
},
//閲嶇疆瀵嗙爜
@@ -267,20 +269,20 @@
},
//娣诲姞
add() {
- this.$refs.addPublicityForm.validate(async (vaild) => {
+ this.$refs.addPublicityForm.validate(async (vaild) => {
if (!vaild) return this.$message.error('杈撳叆鏈夎')
- let param = null;
- param = this.addPublicityForm;
- addPublicityList(param).then(res => {
- this.$message({
- message: '鎿嶄綔鎴愬姛',
- type: 'success'
- });
- this.addPublicityForm={};
- this.init();
- }
- )
- this.addPublicityVisibel = false;
+ let param = null;
+ param = this.addPublicityForm;
+ addPublicityList(param).then(res => {
+ this.$message({
+ message: '鎿嶄綔鎴愬姛',
+ type: 'success'
+ });
+ this.addPublicityForm = {};
+ this.init();
+ }
+ )
+ this.addPublicityVisibel = false;
})
},
//鍏抽棴涔嬪墠
--
Gitblit v1.8.0