From 99f97b11a334ce482db9aa91fca86dadbaffd716 Mon Sep 17 00:00:00 2001
From: luobisheng <727299681@qq.com>
Date: 星期四, 17 十一月 2022 17:40:43 +0800
Subject: [PATCH] 我的代办修改
---
src/views/operate/sms/smsIndex/index.vue | 59 +++++++++++--------
src/views/operate/sms/smsIndex/createSms/index.vue | 45 ++------------
src/views/operate/images/index.vue | 2
src/components/edit/index.vue | 3 +
src/views/operate/message/myIndex/update/index.vue | 6 +-
src/views/operate/myWait/index.vue | 57 +++++++-----------
src/views/operate/video/index.vue | 2
7 files changed, 74 insertions(+), 100 deletions(-)
diff --git a/src/components/edit/index.vue b/src/components/edit/index.vue
index bfd92bf..9be350b 100644
--- a/src/components/edit/index.vue
+++ b/src/components/edit/index.vue
@@ -19,6 +19,9 @@
this.editor.customConfig.colors = ['#4b9bb7', '#09152f'];
this.editor.customConfig.placeholder = '璇疯緭鍏�';
this.editor.customConfig.onchangeTimeout = 500;
+ this.editor.customConfig.onfocus = () => {
+ this.editor.customConfig.placeholder = '';
+ }
this.editor.create();
},
beforeDestroy() {
diff --git a/src/views/operate/images/index.vue b/src/views/operate/images/index.vue
index 37708a5..408e124 100644
--- a/src/views/operate/images/index.vue
+++ b/src/views/operate/images/index.vue
@@ -72,6 +72,8 @@
</el-table>
<el-dialog
:visible.sync="isShowUploadDialog"
+ :destroy-on-close="true"
+ :key="dialogType"
width="40%"
:title="getDialogTitle"
>
diff --git a/src/views/operate/message/myIndex/update/index.vue b/src/views/operate/message/myIndex/update/index.vue
index 4af4865..2b674af 100644
--- a/src/views/operate/message/myIndex/update/index.vue
+++ b/src/views/operate/message/myIndex/update/index.vue
@@ -13,8 +13,8 @@
<!-- 鎻愰啋鏂瑰紡 -->
<el-form-item class="optionItem" label="鎻愰啋鏂瑰紡:" prop="channelCode">
<el-radio-group v-model="role.channelCode">
- <el-radio label="01" value="01">绔欏唴淇�</el-radio>
- <el-radio label="02" value="02">閭欢</el-radio>
+ <el-radio value="01">绔欏唴淇�</el-radio>
+ <el-radio value="03">閭欢</el-radio>
</el-radio-group>
<span class="message-tip">(鐭俊鍙敤鏁�: 1000鏉�)</span>
</el-form-item>
@@ -350,7 +350,7 @@
channelCode:
channelCode === "01"
? "绔欏唴淇�"
- : channelCode === "02"
+ : channelCode === "03"
? "閭欢"
: "鐭俊",
messageType: this.role.messageType,
diff --git a/src/views/operate/myWait/index.vue b/src/views/operate/myWait/index.vue
index 0a64ce7..4950f58 100644
--- a/src/views/operate/myWait/index.vue
+++ b/src/views/operate/myWait/index.vue
@@ -6,8 +6,8 @@
<header>
<div class="headerContent">
<div class="search">
- <span>绛涢�夋潯浠�:</span>
- <el-input placeholder="璇疯緭鍏ュ唴瀹�" v-model="context"></el-input>
+ <span>浜嬩欢缂栧彿:</span>
+ <el-input placeholder="璇疯緭鍏ヤ簨浠剁紪鍙�" v-model="context"></el-input>
<div class="findBtn">
<el-button type="primary" @click="getTableData">鏌ヨ</el-button>
</div>
@@ -26,24 +26,18 @@
<el-table-column prop="code" label="浜嬩欢缂栧彿" min-width="10">
</el-table-column>
<el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="10">
- <template slot-scope="scope">
- <span>{{scope.row}}</span>
+ <template slot-scope="scope" v-if="scope.row">
+ <span>{{ getEventSource(scope.row.eventSource)?.label }}</span>
</template>
</el-table-column>
<el-table-column prop="category" label="闂绫诲埆" min-width="10">
- <template slot-scope="scope">
- <span>{{scope.row}}</span>
+ <template slot-scope="scope" v-if="scope.row">
+ <span>{{ getCategory(scope.row.category)?.label }}</span>
</template>
</el-table-column>
<el-table-column prop="createTime" label="鍒涘缓鏃堕棿" min-width="10">
- <template slot-scope="scope">
- <span>{{changeTime(scope.row)}}</span>
- </template>
</el-table-column>
- <el-table-column prop="type" label="鍓╀綑鏃堕棿" min-width="10">
- <template slot-scope="scope">
- <span>{{getRestTime(scope.row)}}</span>
- </template>
+ <el-table-column prop="limitTime" label="鍓╀綑鏃堕棿" min-width="10">
</el-table-column>
<el-table-column prop="stepName" label="闂鐘舵��" min-width="10">
</el-table-column>
@@ -52,7 +46,7 @@
</el-table>
<!-- 鏌ョ湅淇敼椤甸潰 -->
<el-dialog :visible.sync="dialogUpdate" width="45%" :title="updateFlag ? '鏉冮檺璁剧疆' :'鏌ョ湅瑙掕壊淇℃伅'"
- v-if="dialogUpdate" :before-close="handleClose">
+ :destroy-on-close="true" :key="updateFlag" :before-close="handleClose">
<updateUser :updateFlag="updateFlag" :userInfo=userInfo
:getTableData=" context ? getTableData : getTableData" @changeDialog="changeDialog" />
</el-dialog>
@@ -75,8 +69,7 @@
</div>
<div class="pagination">
<el-pagination background :current-page="currentPage" layout="prev, pager, next"
- :total="totalNum" :page-size="pageSize" @current-change="changeCurrentPage"
- @prev-click="handlePrev" @next-click="handleNext">
+ :total="totalNum" :page-size="pageSize" @current-change="changeCurrentPage">
</el-pagination>
</div>
</div>
@@ -90,6 +83,7 @@
import {computeTime} from '@/utils/helper'
import filterTime from '@/utils/mydate'
import myWait from "@/api/operate/myWait";
+import { CATEGOTY, RESOURCE_TYPE } from "@/utils/helper";
export default {
components: {
@@ -98,7 +92,7 @@
data() {
return {
tableData: [],
- context: "",
+ context: null,
dialogCreate: false,
dialogUpdate: false,
updateFlag: false,
@@ -139,6 +133,7 @@
myWait.getMybackLog({ num: this.context })
.then(res => {
this.tableData = res;
+ this.tableData = this.tableData.filter(item => !!item);
})
.catch(err => this.$message({ type: 'error', message: err }))
},
@@ -183,7 +178,7 @@
},
// 璁剧疆琛ㄦ牸鏂戦┈绾�
tableRowClassName({ row, rowIndex }) {
- if ((rowIndex + 1) % 2 == 0) {
+ if ((rowIndex + 1) % 2 === 0) {
return 'warning-row';
} else {
return 'success-row';
@@ -200,28 +195,17 @@
this.currentPage = page;
this.getTableData();
},
- // 涓婁竴椤电偣鍑讳簨浠�
- handlePrev(page) {
- this.currentPage = page;
- this.getTableData();
- },
- // 涓嬩竴椤电偣鍑讳簨浠�
- handleNext(page) {
- this.currentPage = page;
- this.getTableData();
- },
changeDialog(val) {
this.dialogUpdate = val.dialogUpdate;
- console.log(val);
},
handleClose(done) {
this.$confirm('纭鍏抽棴锛�')
- .then(_ => {
+ .then(() => {
this.dialogCreate = false;
this.dialogUpdate = false;
done();
})
- .catch(_ => { });
+ .catch(() => { });
},
// 璁＄畻鏃堕棿
getRestTime(time2){
@@ -232,7 +216,14 @@
if(time){
return filterTime(time);
}
- }
+ },
+ getCategory(code) {
+ return CATEGOTY.find(item => item.value === code);
+ },
+
+ getEventSource(code) {
+ return RESOURCE_TYPE.find(item => item.value === code);
+ }
}
}
</script>
@@ -248,7 +239,6 @@
header {
background-color: #09152f;
- border: 1pox solid #fff;
.headerContent {
padding: 0 40px;
@@ -303,7 +293,6 @@
background-color: #09152f;
margin-top: 20px;
padding-bottom: 50px;
- border: 1pox solid #fff;
.mainTitle {
line-height: 60px;
diff --git a/src/views/operate/sms/smsIndex/createSms/index.vue b/src/views/operate/sms/smsIndex/createSms/index.vue
index fbc30d2..9018a13 100644
--- a/src/views/operate/sms/smsIndex/createSms/index.vue
+++ b/src/views/operate/sms/smsIndex/createSms/index.vue
@@ -36,12 +36,12 @@
</el-form-item>
<!-- 娑堟伅鍐呭 -->
<el-form-item class="optionItem" label="娑堟伅鍐呭:" prop="body">
- <MyEditor ref="edit" @getMyBody="getMyBody"></MyEditor>
+ <MyEditor ref="edit"></MyEditor>
</el-form-item>
<el-form-item>
<div class="optionBtn">
- <el-button messageType="primary" @click.native.prevent="handleSubmit(1)" class="btn submit">鍙戝竷</el-button>
+ <el-button type="primary" @click.native.prevent="handleSubmit(1)" class="btn submit">鍙戝竷</el-button>
<el-button class="btn cancel" @click.native.prevent="handleReset">閲嶇疆</el-button>
</div>
</el-form-item>
@@ -64,7 +64,6 @@
callback();
}
}
-
return {
role: {
messageType: '',
@@ -72,7 +71,7 @@
targetTo: '',
targetFrom: null,
body: '',
- channelCode: '03'
+ channelCode: '02'
},
rules: {
messageType: [
@@ -193,7 +192,8 @@
},
// 鏂板缓/淇濆瓨娑堟伅(1:鏂板缓,0淇濆瓨娑堟伅)
handleSubmit(mystatus) {
- this.$refs.user.validate((valid) => {
+ this.role.body = this.$refs.edit.editor.txt.html();
+ this.$refs.user.validate((valid) => {
if (valid) {
const params = Object.assign({}, this.role);
params.targetTo = this.checkedList.join(',');
@@ -205,13 +205,9 @@
})
.catch(err => this.$message({ type: 'error', message: err }));
} else {
- return false;
+ this.$message.warning('璇锋鏌ュ繀濉」');
}
})
- },
- // 鑾峰緱娑堟伅浣�
- getMyBody(obj) {
- this.role.body = obj;
},
// 閲嶇疆琛ㄥ崟
handleReset() {
@@ -230,35 +226,8 @@
this.role.targetFrom = res.data.userId
this.sendUser = res.data.username
})
- },
- // 娑堟伅棰勮
- handleView() {
- this.$refs.user.validate((valid) => {
- if (valid) {
- this.dialogView = true;
- this.info = {
- messageType: this.getColText(role.messageType),
- body: this.role.body,
- head: this.role.head,
- targetTo: this.tempNameArr,
- targetFrom: this.sendUser
- };
- } else {
- return false
- }
- })
- },
- // 鑾峰緱鏍忕洰娑堟伅
- getColText(id){
- const {colList} = this
- let str = ''
- colList.forEach(item=>{
- item.id === id ? str = item.columnName : ''
- })
- return str
}
- },
- props: ['closeMyDialog']
+ }
}
</script>
<style lang="scss" scoped>
diff --git a/src/views/operate/sms/smsIndex/index.vue b/src/views/operate/sms/smsIndex/index.vue
index bce5de8..60d59e7 100644
--- a/src/views/operate/sms/smsIndex/index.vue
+++ b/src/views/operate/sms/smsIndex/index.vue
@@ -13,12 +13,12 @@
<div class="message-status">
<span>鐭俊鍥炴墽:</span>
<el-select v-model="messageStatus" placeholder="璇烽�夋嫨">
- <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value">
+ <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.label">
</el-option>
</el-select>
</div>
<div class="find">
- <el-button type="primary" icon="el-icon-search" @click="handleSearch">鏌ヨ</el-button>
+ <el-button type="primary" icon="el-icon-search" @click="getTableData">鏌ヨ</el-button>
<el-button icon="el-icon-delete-solid" @click="handleReset">閲嶇疆</el-button>
</div>
</div>
@@ -36,35 +36,32 @@
@selection-change="tableChange">
<el-table-column type="selection" min-width="5">
</el-table-column>
- <el-table-column label="ID" min-width="5">
+ <el-table-column label="ID" min-width="5" prop="id">
<template slot-scope="scope">{{ scope.row.id }}</template>
</el-table-column>
<el-table-column prop="head" label="鏍囬" min-width="10">
</el-table-column>
- <el-table-column prop="updateTime" label="鍙戦�佹椂闂�" min-width="10">
- <template slot-scope="scope">
- <span>{{changeTime(scope.row)}}</span>
- </template>
+ <el-table-column prop="createTime" label="鍙戦�佹椂闂�" min-width="10">
</el-table-column>
<el-table-column prop="targetFrom" label="鍙戦�佽处鍙�" min-width="15">
</el-table-column>
<el-table-column prop="status" label="鍙戝竷鐘舵��" min-width="5">
- <template slot-scope="scope">
- {{scope.row.status === 0 ? '鍙戦�佸け璐�' :'鍙戦�佹垚鍔�'}}
- </template>
+ <template slot-scope="scope">
+ <span>{{ statusList.find(item => item.value === scope.row.status).label }}</span>
+ </template>
</el-table-column>
<el-table-column prop="operation" label="鎿嶄綔" min-width="15">
<template slot-scope="scope">
<div class="operation">
<el-link class="leftPx" icon="el-icon-delete-solid" :underline="false"
@click="handleDelete([scope.row.id])">鍒犻櫎</el-link>
- <el-link icon="el-icon-edit" class="leftPx" :underline="false" @click="handleEdit(scope.row)">閲嶆柊鍙戦��</el-link>
+ <el-link icon="el-icon-edit" class="leftPx" :underline="false" @click="resend(scope.row)">閲嶆柊鍙戦��</el-link>
</div>
</template>
</el-table-column>
</el-table>
<!-- 鏂板缓娑堟伅 -->
- <el-dialog title="鏂板缓娑堟伅" :visible.sync="isShowDialog" width="80%"
+ <el-dialog title="鏂板缓娑堟伅" :destroy-on-close="true" :key="dialogType" :visible.sync="isShowDialog" width="80%"
:before-close="handleConfirmClose">
<MyCreate @closeMyDialog="closeDialog" :type="dialogType"></MyCreate>
</el-dialog>
@@ -97,7 +94,7 @@
<script>
import helper from '@/utils/mydate'
import MyCreate from './createSms'
-import { getMessageList, deleteMessage } from "@/api/operate/messageManagement";
+import {getMessageList, deleteMessage, sendMessage} from "@/api/operate/messageManagement";
export default {
components: {
@@ -106,10 +103,8 @@
data() {
return {
tableData: [],
- context: "",
- dialogEdit:false,
+ context: null,
isShowDialog: false,
- dialogView: false,
totalNum: null,
pageSize: 10,
currentPage: 1,
@@ -137,7 +132,7 @@
}
],
tempList: [],
- messageStatus: 2,
+ messageStatus: '鍏ㄩ儴',
messageKind: '00',
statusList: [
{
@@ -178,19 +173,18 @@
this.getTableData();
},
methods: {
- // 鏌ヨ
- handleSearch(){
- this.getTableData();
- },
// 閲嶇疆
handleReset(){
-
+ this.context = null;
+ this.currentPage = 1;
+ this.messageStatus = '鍏ㄩ儴';
+ this.getTableData();
},
// 鍒犻櫎淇℃伅
handleDelete(ids) {
this.$confirm('纭鍒犻櫎?')
.then(() => {
- deleteMessage(ids)
+ deleteMessage({ ids: ids.join(',')})
.then(() => {
this.$message({ type: 'success', message: '鎿嶄綔鎴愬姛' });
this.getTableData();
@@ -200,7 +194,9 @@
},
getTableData() {
- getMessageList()
+ const respondResult = this.messageStatus === '鍏ㄩ儴' ? null : this.messageStatus;
+ getMessageList({ channelCode: '03', current: this.currentPage,
+ respondResult, pageSize: this.pageSize, head: this.context })
.then(({ records, total }) => {
this.tableData = records;
this.totalNum = total;
@@ -209,6 +205,19 @@
this.$message({ type: 'error', message: err });
})
},
+
+ resend(data) {
+ if (data.status === 1) {
+ return;
+ }
+ sendMessage(data)
+ .then(() => {
+ this.$message.success('鎿嶄綔鎴愬姛');
+ this.getTableData();
+ })
+ .catch(err => this.$message.error(`${err}`))
+ },
+
// 鎵归噺涓嬫媺妗嗘搷浣�
async selectChange(list) {
if (this.tempList.length !== 0) {
@@ -280,7 +289,7 @@
// 褰撳墠椤垫敼鍙樿Е鍙戜簨浠�
changeCurrentPage(page) {
this.currentPage = page;
- this.setTableData();
+ this.getTableData();
},
// 纭鍏抽棴寮圭獥
handleConfirmClose(done) {
diff --git a/src/views/operate/video/index.vue b/src/views/operate/video/index.vue
index b458c79..5b339ea 100644
--- a/src/views/operate/video/index.vue
+++ b/src/views/operate/video/index.vue
@@ -96,6 +96,8 @@
<!-- 鏌ョ湅淇敼椤甸潰 -->
<el-dialog
:visible.sync="isShowDialog"
+ :destroy-on-close="true"
+ :key="dialogTitle"
width="40%"
:title="dialogTitle">
<updateInterface :isUpdate="isUpdate" :dialogData="dialogData" @closeDialog="closeDialog" />
--
Gitblit v1.8.0