From 1cc4da26c0dfb93bb3b9800f2c82988cfc4af3d6 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期一, 22 五月 2023 11:45:07 +0800
Subject: [PATCH] 群组聊天修改
---
src/views/cause/Entry.vue | 227 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 120 insertions(+), 107 deletions(-)
diff --git a/src/views/cause/Entry.vue b/src/views/cause/Entry.vue
index 32074a5..7f0713c 100644
--- a/src/views/cause/Entry.vue
+++ b/src/views/cause/Entry.vue
@@ -16,13 +16,13 @@
<el-button type="primary" @click="search">鏌ヨ</el-button>
</el-form-item>
<el-form-item>
- <el-button type="primary" @click="addAduitDialogVisible = true">娣诲姞</el-button>
+ <el-button type="primary" @click="addAduitAnJian">娣诲姞</el-button>
</el-form-item>
<el-form-item>
<el-upload name="multipartFile" class="upload-demo" action="/api/cause/upload " :show-file-list="false"
:before-upload="beforeAvatarUpload" :on-success="respond" :limit="1">
- <el-button type="primary">瀵煎叆</el-button>
+<!-- <el-button type="primary">瀵煎叆</el-button>-->
</el-upload>
</el-form-item>
</el-form>
@@ -41,11 +41,11 @@
</el-table-column>
<el-table-column prop="status" label="妗堜欢鐘舵��" width="110" header-align="center" align="center">
<template slot-scope="scope">
- <span v-if="scope.row.status == 0">鍙楃悊涓�</span>
- <span v-if="scope.row.status == 1">涓嶄簣绔嬫</span>
- <span v-if="scope.row.status == 2">浠ョ珛妗�</span>
- <span v-if="scope.row.status == 3">宸茬粨妗�</span>
- <span v-if="scope.row.status == 4">宸茬珛妗�</span>
+ <span v-if="scope.row.status == 0">绔嬫</span>
+ <span v-if="scope.row.status == 1">鍒濇煡</span>
+ <span v-if="scope.row.status == 2">鍙楃悊</span>
+ <span v-if="scope.row.status == 3">绉婚�佽捣璇�</span>
+ <span v-if="scope.row.status == 4">缁撴</span>
</template>
</el-table-column>
<el-table-column prop="userName" label="璐熻矗浜�" width="130" header-align="center" align="center">
@@ -70,7 +70,7 @@
<!--娣诲姞妗堜欢寮圭獥-->
<el-dialog title="娣诲姞妗堜欢" :visible.sync="addAduitDialogVisible" :before-close="addAduitClose">
<el-row :gutter="15">
- <el-form ref="causeForm" :model="causeForm" :rules="addCauseRules" size="medium" label-width="100px">
+ <el-form ref="causeForm" :model="causeForm" :rules="addCauseRules" size="medium" label-width="140px">
<el-col :span="12">
<el-form-item label="妗堜欢缂栧彿 " prop="number">
<el-input v-model="causeForm.number" clearable :style="{ width: '100%' }" placeholder="杈撳叆妗堜欢缂栧彿">
@@ -89,10 +89,10 @@
placeholder="杈撳叆棰勪及鎬婚噾棰�"></el-input>
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item label="鏈�鏃╁彂妗�" prop="firstTime">
+ <el-col :span="24">
+ <el-form-item label="鏈�鏃╁彂妗堟椂闂�" prop="firstTime">
<el-date-picker v-model="causeForm.firstTime" type="datetime" placeholder="閫夋嫨鏃ユ湡鏃堕棿" clearable
- :style="{ width: '100%' }" value-format="yyyy-MM-dd HH:mm:ss">
+ :style="{ width: '40%' }" value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
</el-form-item>
</el-col>
@@ -150,7 +150,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鏈�鍙戞棭妗堟椂闂�" prop="firstTime">
+ <el-form-item label="鏈�鏃╁彂妗堟椂闂�" prop="firstTime">
<el-date-picker v-model="updataCauseForm.firstTime" type="datetime" placeholder="閫夋嫨鏃ユ湡鏃堕棿"
:style="{ width: '100%' }" value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
@@ -194,7 +194,7 @@
<template slot="header">
<el-form :inline="true" :model="queryInfoReport" class="demo-form-inline">
<el-form-item label="鎶ユ浜�:">
- <el-input placeholder="璇疯緭鍏ュ鍚嶆垨韬唤璇�" v-model="queryInfoReport.people" :style="{ width: '180px' }">
+ <el-input placeholder="璇疯緭鍏ュ鍚�" v-model="queryInfoReport.people" :style="{ width: '180px' }">
</el-input>
</el-form-item>
<el-form-item label="鎵嬫満鍙风爜:">
@@ -206,30 +206,31 @@
<el-option v-for="item in optionsGroup" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
- </el-form-item>
+<!-- </el-form-item>-->
- <el-form-item label="鎶ユ鏉愭枡:">
- <el-select v-model="queryInfoReport.HavaMaterial" :style="{ width: '100px' }">
- <el-option v-for="item in optionsMate" :key="item.value" :label="item.label" :value="item.value">
- </el-option>
- </el-select>
- </el-form-item>
+<!-- <el-form-item label="鎶ユ鏉愭枡:">-->
+<!-- <el-select v-model="queryInfoReport.HavaMaterial" :style="{ width: '100px' }">-->
+<!-- <el-option v-for="item in optionsMate" :key="item.value" :label="item.label" :value="item.value">-->
+<!-- </el-option>-->
+<!-- </el-select>-->
+<!-- </el-form-item>-->
- <el-form-item>
+<!-- <el-form-item>-->
<el-button type="primary" @click="searchByCondition">鏌ヨ</el-button>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="addVisibelReport">娣诲姞</el-button>
+ <el-button type="primary" @click="exportExcel">瀵煎嚭</el-button>
</el-form-item>
<el-form-item>
<el-upload name="multipartFile" class="upload-demo" action="/api/cause/reporterUpload"
:show-file-list="false" :data="{ causeId: this.reportCauseId }" :before-upload="beforeAvatarUpload"
:on-success="reporterRespond" :limit="1">
- <el-button type="primary">瀵煎叆</el-button>
+<!-- <el-button type="primary">瀵煎叆</el-button>-->
</el-upload>
</el-form-item>
<el-form-item>
- <el-button type="primary" @click="exportExcel">鎶ユ鏉愭枡瀵煎嚭</el-button>
+<!-- <el-button type="primary" @click="exportExcel">鎶ユ鏉愭枡瀵煎嚭</el-button>-->
</el-form-item>
</el-form>
@@ -266,19 +267,21 @@
}}</span>
</template>
</el-table-column>
- <el-table-column width="200" prop="ctime" label="鎶ユ鏃堕棿">
+ <el-table-column width="200" prop="reportTime" label="鎶ユ鏃堕棿">
<template slot-scope="scope">
- <span>{{ scope.row.ctime === null ? "2022-07-12 10:32:56" : scope.row.ctime }}</span>
+ <span>{{ scope.row.reportTime === null ? "2022-07-12 10:32:56" : scope.row.reportTime }}</span>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔">
<template slot-scope="scope">
<el-button type="text" size="medium" @click="updataReport(scope.row)">缂栬緫</el-button>
- <el-button type="text" size="medium"
- @click="leaveReport(scope.row.id, scope.row.causeId, scope.row.groupId)" style="color:#ff0000"
- :disabled="scope.row.isInGroup == 0">閫�缇� </el-button>
+<!-- <el-button type="text" size="medium"-->
+<!-- @click="leaveReport(scope.row.id, scope.row.causeId, scope.row.groupId)" style="color:#ff0000"-->
+<!-- :disabled="scope.row.isInGroup == 0">閫�缇� </el-button>-->
+<!-- <el-button type="text" size="medium" @click="removeReport(scope.row.id, scope.row.causeId)"-->
+<!-- style="color:#ff0000" :disabled="scope.row.isInGroup == 1">鍒犻櫎 </el-button>-->
<el-button type="text" size="medium" @click="removeReport(scope.row.id, scope.row.causeId)"
- style="color:#ff0000" :disabled="scope.row.isInGroup == 1">鍒犻櫎 </el-button>
+ style="color:#ff0000" >鍒犻櫎 </el-button>
</template>
</el-table-column>
</el-table>
@@ -392,14 +395,14 @@
</el-input>
</el-form-item>
</el-col>
-
- <el-col :span="12">
+
+ <!-- <el-col :span="12">
<el-form-item prop="reportTime" label="鎶ユ鏃堕棿">
<el-date-picker v-model="updateReportForm.reportTime" type="datetime" placeholder="閫夋嫨鏃ユ湡鏃堕棿" clearable
:style="{ width: '100%' }" value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="12">
<el-form-item label="琚獥鏃堕棿" prop="cheatTime">
<el-date-picker v-model="updateReportForm.cheatTime" type="datetime" placeholder="閫夋嫨鏃ユ湡鏃堕棿" clearable
@@ -429,6 +432,7 @@
<el-form-item label="涓婁紶" prop="fileList" required>
<el-upload ref="reportMaterials" :file-list="updateReportForm.fileList" action="/api/minio/upload"
list-type="picture" :on-success="handleReporterMaterialSuccess">
+ <img v-if="updateReportForm.reportMaterials!=''" :src="'/minio/img/'+updateReportForm.reportMaterials" style="width: 145px;height: 145px">
<el-button size="small" type="primary" icon="el-icon-upload">鐐瑰嚮涓婁紶</el-button>
</el-upload>
</el-form-item>
@@ -812,9 +816,7 @@
reportCauseId: null,
reportTotal: 0,
reportList: [],
- addAduitDialogVisible: false,
infoAduitDialogVisible: false,
- causeOptions: [],
groupAnVisible: false,
addCauseRules: {
number: [{
@@ -970,49 +972,46 @@
},
{
value: '0',
- label: '鍙楃悊涓�'
+ label: '绔嬫'
},
{
value: '1',
- label: '涓嶄簣绔嬫'
+ label: '鍒濇煡'
},
{
value: '2',
- label: '宸茬珛妗�'
+ label: '鍙楃悊'
},
{
value: '3',
- label: '宸茬粨妗�'
+ label: '绉婚�佽捣璇�'
},
{
value: '4',
- label: '宸叉挙妗�'
+ label: '缁撴'
}
],
causeOptions: [
+
{
- value: null,
- label: '鍏ㄩ儴'
+ value: 0,
+ label: '绔嬫'
},
{
- value: '0',
- label: '鏈鏍�'
+ value: 1,
+ label: '鍒濇煡'
},
{
- value: '1',
- label: '涓嶄簣绔嬫'
+ value: 2,
+ label: '鍙楃悊'
},
{
- value: '2',
- label: '鍙楃悊涓�'
+ value: 3,
+ label: '绉婚�佽捣璇�'
},
{
- value: '3',
- label: '宸茬粨妗�'
- },
- {
- value: '4',
- label: '宸叉挙妗�'
+ value: 4,
+ label: '缁撴'
}
],
total: null,
@@ -1091,6 +1090,21 @@
},
methods:
{
+ expExcel(){
+
+ },
+ addAduitAnJian(){
+ let date=(new Date()).valueOf();//鑾峰彇鏃堕棿鎴�
+ let txt = '1234567890';//鐢熸垚鐨勯殢鏈烘満鍣ㄧ爜
+ let len =13;//鏈哄櫒鐮佹湁澶氬皯浣�
+ let pwd = '';//瀹氫箟绌哄彉閲忕敤鏉ユ帴鏀舵満鍣ㄧ爜
+ for (let i = 0; i < len; i++) {
+ pwd += txt.charAt(Math.floor(Math.random() * txt.length));//寰幆鏈哄櫒鐮佷綅鏁伴殢鏈哄～鍏�
+ }
+ let id= date+pwd;
+ this.causeForm.number=id;
+ this.addAduitDialogVisible=true;
+ },
//鍏抽棴妗堜欢鐨勬浠朵汉鍛樻坊鍔�
addReportVisibleClose() {
@@ -1200,7 +1214,7 @@
//妗堜欢浜哄憳
//瀵煎嚭鏂囦欢
exportExcel() {
- this.$http.post('/api/report/exportReporter?id=' + this.exportReportId, {}, { responseType: 'blob' })
+ this.$http.post('/api//cause/exp?causeId=' + this.exportReportId, {}, { responseType: 'blob' })
.then(res => {
const fileName = decodeURI(res.headers['content-disposition'].split(';')[1].split('=')[1])
const blob = new Blob([res.data], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' })
@@ -1230,7 +1244,7 @@
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;
@@ -1249,7 +1263,6 @@
//缂栬緫妗堜欢浜哄憳
updataReport(val) {
- debugger
this.updateReportVisible = true;
this.updateReportForm = Object.assign({}, val);
this.causeId = val.causeId;
@@ -1335,25 +1348,25 @@
//妗堜欢褰曞叆鐩稿叧
updateCauseDialogVisible(row) {
- this.updateAduitDialogVisible = true,
- this.updataCauseForm = Object.assign({}, row);
- if (this.updataCauseForm.status == 0) {
- this.updataCauseForm.status = '鏈鏍�';
- };
- if (this.updataCauseForm.status == 1) {
- this.updataCauseForm.status = '涓嶄簣绔嬫';
- };
- if (this.updataCauseForm.status == 2) {
- this.updataCauseForm.status = '鍙楃悊涓�';
- };
- if (this.updataCauseForm.status == 3) {
- this.updataCauseForm.status = '宸茬粨妗�';
- };
- if (this.updataCauseForm.status == 4) {
- this.updataCauseForm.status = '宸叉挙妗�';
- };
- }
- ,
+ this.updateAduitDialogVisible = true;
+ this.updataCauseForm = Object.assign({}, row);
+
+ // if (this.updataCauseForm.status == 0) {
+ // this.updataCauseForm.status = '鏈鏍�';
+ // };
+ // if (this.updataCauseForm.status == 1) {
+ // this.updataCauseForm.status = '涓嶄簣绔嬫';
+ // };
+ // if (this.updataCauseForm.status == 2) {
+ // this.updataCauseForm.status = '鍙楃悊涓�';
+ // };
+ // if (this.updataCauseForm.status == 3) {
+ // this.updataCauseForm.status = '宸茬粨妗�';
+ // };
+ // if (this.updataCauseForm.status == 4) {
+ // this.updataCauseForm.status = '宸叉挙妗�';
+ // };
+ },
addAduitClose() {
this.addAduitDialogVisible = false
},
@@ -1383,7 +1396,7 @@
} else {
this.$message({
type: "error",
- message: "琛ㄥ崟涓嶈兘涓虹┖"
+ message: res.data.msg
})
}
}
@@ -1407,21 +1420,21 @@
data.userId = this.user[key].userId;
}
}
- if (data.status == '鏈鏍�') {
- data.status = 0;
- }
- if (data.status == '涓嶄簣绔嬫') {
- data.status = 1;
- }
- if (data.status == '鍙楃悊涓�') {
- data.status = 2;
- }
- if (data.status == '宸茬粨妗�') {
- data.status = 3;
- }
- if (data.status == '宸叉挙妗�') {
- data.status = 4;
- }
+ // if (data.status == '鏈鏍�') {
+ // data.status = 0;
+ // }
+ // if (data.status == '涓嶄簣绔嬫') {
+ // data.status = 1;
+ // }
+ // if (data.status == '鍙楃悊涓�') {
+ // data.status = 2;
+ // }
+ // if (data.status == '宸茬粨妗�') {
+ // data.status = 3;
+ // }
+ // if (data.status == '宸叉挙妗�') {
+ // data.status = 4;
+ // }
this.$http.put('/api/cause/updateCause?id=' + data.id,
data
).then(res => {
@@ -1430,21 +1443,21 @@
type: "success",
message: "淇敼鎴愬姛"
});
- if (this.updataCauseForm.status == 0) {
- this.updataCauseForm.status = '鏈鏍�';
- };
- if (this.updataCauseForm.status == 1) {
- this.updataCauseForm.status = '涓嶄簣绔嬫';
- };
- if (this.updataCauseForm.status == 2) {
- this.updataCauseForm.status = '鍙楃悊涓�';
- };
- if (this.updataCauseForm.status == 3) {
- this.updataCauseForm.status = '宸茬粨妗�';
- };
- if (this.updataCauseForm.status == 4) {
- this.updataCauseForm.status = '宸叉挙妗�';
- };
+ // if (this.updataCauseForm.status == 0) {
+ // this.updataCauseForm.status = '鏈鏍�';
+ // };
+ // if (this.updataCauseForm.status == 1) {
+ // this.updataCauseForm.status = '涓嶄簣绔嬫';
+ // };
+ // if (this.updataCauseForm.status == 2) {
+ // this.updataCauseForm.status = '鍙楃悊涓�';
+ // };
+ // if (this.updataCauseForm.status == 3) {
+ // this.updataCauseForm.status = '宸茬粨妗�';
+ // };
+ // if (this.updataCauseForm.status == 4) {
+ // this.updataCauseForm.status = '宸叉挙妗�';
+ // };
this.updateAduitDialogVisible = false;
// location.reload();
this.getList();
@@ -1608,4 +1621,4 @@
::v-deep(.el-table thead) {
color: #000000;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.8.0