From 5b36a7e896276c4e468d6b0ef29b237eb6fc5663 Mon Sep 17 00:00:00 2001 From: mg <maokecheng@163.com> Date: 星期四, 27 十月 2022 18:26:27 +0800 Subject: [PATCH] 联调消息 --- src/views/operate/message/myIndex/update/index.vue | 54 ++++++++++++++++- src/views/operate/management/message/index.vue | 43 +++++++++---- src/views/operate/message/myIndex/index.vue | 18 +++-- src/views/operate/message/myIndex/myview/index.vue | 37 ++++++++--- 4 files changed, 116 insertions(+), 36 deletions(-) diff --git a/src/views/operate/management/message/index.vue b/src/views/operate/management/message/index.vue index bf74671..97fa692 100644 --- a/src/views/operate/management/message/index.vue +++ b/src/views/operate/management/message/index.vue @@ -16,7 +16,7 @@ </div> <div class="btns"> <el-button type="primary" icon="el-icon-search" @click="handleSearch">鏌ヨ</el-button> - <el-button icon="el-icon-delete-solid">閲嶇疆</el-button> + <el-button icon="el-icon-delete-solid" @click="handleReset">閲嶇疆</el-button> </div> </div> </header> @@ -28,7 +28,7 @@ <!-- 鏁版嵁灞曠ず --> <MyTable :tableOption="tableOption" :tableData="tableData" :pageShow="false"> <template #operation="info"> - <el-link :underline="false" style="color:#4b9bb7">缂栬緫</el-link> + <el-link :underline="false" style="color:#4b9bb7" @click="handleCheckSms(info)">瀹℃牳</el-link> </template> </MyTable> <div class="tools"> @@ -49,7 +49,11 @@ </el-pagination> </div> </div> - + <!-- 瀹℃牳椤甸潰 --> + <el-dialog :visible.sync="dialogCheckSms" width="80%" title="娑堟伅璇︽儏" v-if="dialogCheckSms" + :before-close="handleClose"> + <MyCheckSms :messageData="messageData" @closeDialog="closeDialog"></MyCheckSms> + </el-dialog> </div> </main> <footer> @@ -59,16 +63,16 @@ </template> <script> import MyTable from '@/components/Table'; -import { myDownLoad } from '@/utils/helper'; -import { createNamespacedHelpers } from "vuex"; -const { mapActions } = createNamespacedHelpers("shortMessage"); +import MyCheckSms from './checkSms'; export default { components: { - MyTable + MyTable,MyCheckSms }, data() { return { tableData: [], + dialogCheckSms:false, + messageData:{}, totalNum: null, context: "", status:0, @@ -130,14 +134,17 @@ } }, created() { - const { setTableData } = this; - setTableData(); + const {setTableData} = this + this.setTableData(); }, methods: { - handleSearch(){ - const {setTableData} = this - setTableData(); - }, + handleSearch(){ + this.setTableData(); + }, + // 閲嶇疆 + handleReset(){ + + }, // 璁剧疆琛ㄦ牸鏁版嵁 async setTableData() { const arr = await this.getMessageAuditList(); @@ -170,12 +177,20 @@ done(); }) }, - ...mapActions(['getMessageList']), // 褰撳墠椤垫敼鍙樿Е鍙戜簨浠� changeCurrentPage(page) { this.currentPage = page; this.setTableData(); }, + // 鍘诲鏍� + handleCheckSms(info) { + this.messageData = info; + this.dialogCheckSms = true; + }, + // 鍏抽棴dialog + closeDialog({flag}){ + this.dialogCheckSms = flag; + }, } } </script> diff --git a/src/views/operate/message/myIndex/index.vue b/src/views/operate/message/myIndex/index.vue index 21aa6c6..6039ace 100644 --- a/src/views/operate/message/myIndex/index.vue +++ b/src/views/operate/message/myIndex/index.vue @@ -69,7 +69,7 @@ <el-table-column prop="operation" label="鎿嶄綔" min-width="15"> <template slot-scope="scope"> <div class="operation"> - <el-link icon="el-icon-view" :underline="false" @click="dialogView = true">鏌ョ湅</el-link> + <el-link icon="el-icon-view" :underline="false" @click="handleView(scope.row)">鏌ョ湅</el-link> <el-link icon="el-icon-edit" class="leftPx" :underline="false" @click="handleEdit(scope.row)">缂栬緫</el-link> <el-link class="leftPx" icon="el-icon-delete-solid" :underline="false" @click="handleDelete([scope.row.id])">鍒犻櫎</el-link> @@ -85,12 +85,12 @@ <!-- 娑堟伅璇︽儏 --> <el-dialog title="娑堟伅璇︽儏" :visible.sync="dialogView" v-if="dialogView" width="45%" :before-close="handleClose"> - <MyView></MyView> + <MyView @closeDialog="closeDialog" :myinfo="info">></MyView> </el-dialog> <!-- 缂栬緫椤甸潰 --> <el-dialog title="缂栬緫娑堟伅" :visible.sync="dialogEdit" v-if="dialogEdit" width="80%" :before-close="handleClose"> - <MyEdit @closeDialog="closeDialog" :info="info"></MyEdit> + <MyEdit @closeDialog="closeDialog" :myDataRow="info"></MyEdit> </el-dialog> <!-- tools --> <div class="tools"> @@ -206,18 +206,22 @@ }, methods: { // 鏌ヨ - handleSearch(){ - const {setTableData} = this - setTableData(); + handleSearch(){ + this.setTableData(); }, // 閲嶇疆 handleReset(){ }, + // 鏌ョ湅 + handleView(data){ + this.info = data; + this.dialogView = true; + }, // 缂栬緫 handleEdit(data){ this.info = data; - this.dialogEdit = true; + this.dialogEdit = true; }, // 鍒犻櫎淇℃伅 handleDelete(idarr) { diff --git a/src/views/operate/message/myIndex/myview/index.vue b/src/views/operate/message/myIndex/myview/index.vue index e2a9bda..93b3484 100644 --- a/src/views/operate/message/myIndex/myview/index.vue +++ b/src/views/operate/message/myIndex/myview/index.vue @@ -1,24 +1,39 @@ <template> <div class="myview"> <header> - <div class="header-title"> - 鍩熷悕闅愮淇濇姢鏈嶅姟鏆傚仠閫氱煡 + <div class="header-title"> + <p>{{title}}</p> </div> <div class="header-time"> - 2018-05-25 14:19:20 + <p>{{sendTime}}</p> </div> </header> <main> - <div class="main-head"> 灏婃暚鐨勫鎴凤細鎮ㄥソ锛�</div> - <div class="main-content"> - 鏍规嵁ICANN锛堜簰鑱旂綉鍚嶇О涓庢暟瀛楀湴鍧�鍒嗛厤鏈烘瀯锛夈�婇�氱敤椤剁骇鍩熷悕娉ㄥ唽鏁版嵁涓存椂鏀跨瓥缁嗗垯锛圱emporary Specification for gTLD Registration Data锛夈�嬪拰娆х洘閫氱敤鏁版嵁淇濇姢鏉′緥锛圙DPR锛夊悎瑙勮姹傦紝鑷�2018骞�5鏈�25鏃ヨ捣锛岄樋閲屼簯鐨勫煙鍚峎HOIS淇℃伅鍏紑鏌ヨ缁撴灉涓皢涓嶅啀鏄剧ず鍩熷悕娉ㄥ唽浜�/娉ㄥ唽鏈烘瀯鐨勫悕绉帮紝浠ュ強鍩熷悕娉ㄥ唽浜�/娉ㄥ唽鏈烘瀯銆佺鐞嗚仈绯讳汉鍜屾妧鏈仈绯讳汉鐨勮仈绯讳俊鎭�� - </div> - <div class="main-footer"> - 閴翠簬浠ヤ笂璋冩暣鎺柦鐢熸晥鍚庯紝鍩熷悕娉ㄥ唽淇℃伅灏嗛粯璁ゅ緱鍒颁繚鎶わ紝闃块噷浜戝煙鍚嶉殣绉佷繚鎶ゆ湇鍔″皢鑷�2018骞�5鏈�25鏃ヨ捣鏆傚仠鏈嶅姟銆� - </div> + <div class="main-head"><p>{{body}}</p></div> </main> </div> </template> +<script> +export default { + data() { + return { + title: {}, + sendTime:{}, + body:{} + } + }, + created() { + this.info = this.myinfo; + this.title = this.info.head; + this.sendTime = this.info.sendTime; + this.body = this.info.body; + }, + methods: { + + }, + props: ['closeMyDialog','myinfo'] +} +</script> <style lang="scss" scoped> .myview{ color: #4b9bb7; @@ -39,7 +54,7 @@ border-bottom: 1px solid #4b9bb7; } main{ - padding: 30px 50px; + padding: 30px 50px; line-height: 100px; .main-head{ line-height: 40px; diff --git a/src/views/operate/message/myIndex/update/index.vue b/src/views/operate/message/myIndex/update/index.vue index 2c25012..2899450 100644 --- a/src/views/operate/message/myIndex/update/index.vue +++ b/src/views/operate/message/myIndex/update/index.vue @@ -37,7 +37,7 @@ </el-form-item> <!-- 娑堟伅鍐呭 --> <el-form-item class="optionItem" label="娑堟伅鍐呭:" prop="body"> - <MyEditor ref="edit" @getMyBody="getMyBody"></MyEditor> + <MyEditor ref="edit" @getMyBody="getMyBody" :mybody='role.body'></MyEditor> <!-- <el-input type="textarea" v-model="role.description" placeholder="璇疯緭鍏ユ弿杩板唴瀹�200瀛椾互鍐�"></el-input> --> </el-form-item> <!-- 鎻愰啋鏂瑰紡 --> @@ -147,6 +147,8 @@ this.setColumnList(); this.setDepartList(); this.getLoginUserInfo(); + this.role = this.myDataRow; + console.log(this.role); }, methods: { // 鍏抽棴寮圭獥 @@ -241,13 +243,22 @@ }, // 鏂板缓/淇濆瓨娑堟伅(1:鏂板缓,0淇濆瓨娑堟伅) handleSubmit(mystatus) { + console.log(mystatus); + if(mystatus===0){ + this.updateMessage(mystatus); + }else{ + this.newsMessage(mystatus); + } + }, + //淇敼娑堟伅 + updateMessage(mystatus){ this.$refs.user.validate((valid) => { if (valid) { const { role, checkedList } = this; console.log(checkedList); this.$axios({ method: 'post', - url: 'sccg/message/sendMessage', + url: `sccg/message/update/${this.role.id}`, data: { body: role.body, channelCode: `${role.channelCode}`, @@ -263,7 +274,42 @@ if (res.code === 200) { this.$message({ type: 'success', - message: mystatus === 1 ? '鍙戦�佹垚鍔�' : '淇濆瓨鎴愬姛', + message: mystatus === 1 ? '鍙戝竷鎴愬姛' : '淇濆瓨鎴愬姛', + }) + this.$emit('closeMyDialog', { flag: false, index: 1 }); + } + }) + } else { + return false; + } + }) + }, + //鍙戝竷娑堟伅 + newsMessage(mystatus){ + this.$refs.user.validate((valid) => { + if (valid) { + const { role, checkedList } = this; + console.log(checkedList); + this.$axios({ + method: 'post', + url: 'sccg/message/sendMessage', + data: { + id:role.id, + body: role.body, + channelCode: `${role.channelCode}`, + head: role.head, + messageType: role.messageType, + sendTime: new Date(), + targetTo: checkedList.join(','), + targetFrom: `${role.targetFrom}`, + status: mystatus, + } + }) + .then(res => { + if (res.code === 200) { + this.$message({ + type: 'success', + message: mystatus === 1 ? '鍙戝竷鎴愬姛' : '淇濆瓨鎴愬姛', }) this.$emit('closeMyDialog', { flag: false, index: 1 }); } @@ -328,7 +374,7 @@ return str } }, - props: ['closeMyDialog'] + props: ['closeMyDialog','myDataRow'] } </script> <style lang="scss" scoped> -- Gitblit v1.8.0