From 1445c7e1f76c4628f4619cf67150a63d6f8f5e90 Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期二, 01 十一月 2022 09:04:16 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui

---
 src/views/operate/message/myIndex/index.vue |   35 ++++++++++++++++++++++++++---------
 1 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/views/operate/message/myIndex/index.vue b/src/views/operate/message/myIndex/index.vue
index d90975b..6039ace 100644
--- a/src/views/operate/message/myIndex/index.vue
+++ b/src/views/operate/message/myIndex/index.vue
@@ -69,8 +69,8 @@
                     <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-edit" class="leftPx" :underline="false">缂栬緫</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>
                             </div>
@@ -85,7 +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" :myDataRow="info"></MyEdit>
                 </el-dialog>
                 <!-- tools -->
                 <div class="tools">
@@ -119,14 +124,17 @@
 import helper from '@/utils/mydate'
 import MyView from './myview'
 import MyCreate from './createUser'
+// 寮曞叆缂栬緫缁勪欢
+import MyEdit from './update'
 export default {
     components: {
-        MyView, MyCreate
+        MyView, MyCreate,MyEdit
     },
     data() {
         return {
             tableData: [],
             context: "",
+            dialogEdit:false,
             dialogCreate: false,
             dialogView: false,
             totalNum: null,
@@ -198,13 +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;       
         },
         // 鍒犻櫎淇℃伅
         handleDelete(idarr) {
@@ -245,11 +262,11 @@
                 url: 'sccg/message/list',
                 data: {
                     body: "",
-                    channelCode: "",
+                    channelCode: messageKind === '00' ?'':messageKind,
                     createUser: '',
                     current: currentPage,
                     head: context,
-                    messageType: messageKind === '00' ?'':messageKind,
+                    messageType: "",
                     pageSize: pageSize,
                     randomCode: "",
                     remark: "",

--
Gitblit v1.8.0