From a598d935a61fea27312fc57becd80e23bf09f788 Mon Sep 17 00:00:00 2001
From: “dzb” <2632970487@qq.com>
Date: 星期五, 21 十月 2022 18:04:19 +0800
Subject: [PATCH] 修改bug

---
 src/views/operate/message/myIndex/createUser/index.vue |  131 ++++++++++++++++++++++++++++++-------------
 1 files changed, 91 insertions(+), 40 deletions(-)

diff --git a/src/views/operate/message/myIndex/createUser/index.vue b/src/views/operate/message/myIndex/createUser/index.vue
index 9b2fdc5..2c25012 100644
--- a/src/views/operate/message/myIndex/createUser/index.vue
+++ b/src/views/operate/message/myIndex/createUser/index.vue
@@ -26,10 +26,10 @@
                     <!-- 鎺ユ敹瀵硅薄 -->
                     <el-form-item class="optionItem" label="鎺ユ敹瀵硅薄:" prop="targetTo">
                         <div class="message-item__left">
-                            <el-select v-model="role.targetTo" placeholder="璇烽�夋嫨鎺ユ敹瀵硅薄">
+                            <el-select v-model="role.targetTo" placeholder="璇烽�夋嫨鎺ユ敹瀵硅薄" >
                                 <el-option :value="role.targetTo">
-                                    <el-tree ref="tree" check-strictly :data="departList" :props="defaultProps"
-                                        show-checkbox @check="handleCheck" default-expand-all node-key="id">
+                                    <el-tree ref="tree" :data="departList" :props="defaultProps" show-checkbox
+                                        @check="handleCheck" default-expand-all node-key="id">
                                     </el-tree>
                                 </el-option>
                             </el-select>
@@ -51,11 +51,11 @@
                     </el-form-item>
                     <el-form-item>
                         <div class="optionBtn">
-                            <el-button type="primary" class="btn save">淇濆瓨
+                            <el-button type="primary" @click.native.prevent="handleSubmit(0)" class="btn save">淇濆瓨
                             </el-button>
-                            <el-button type="primary" @click.native.prevent="handleSubmit" class="btn submit">鍙戝竷
+                            <el-button type="primary" @click.native.prevent="handleSubmit(1)" class="btn submit">鍙戝竷
                             </el-button>
-                            <el-button type="primary" class="btn submit">棰勮
+                            <el-button type="primary" @click.native.prevent="handleView" class="btn submit">棰勮
                             </el-button>
                             <el-button class="btn cancel" @click.native.prevent="handleReset">閲嶇疆</el-button>
                         </div>
@@ -66,6 +66,11 @@
                     :before-close="handleConfirmClose" append-to-body>
                     <MyColumnAdd @closeDialog="closeDialog"></MyColumnAdd>
                 </el-dialog>
+                <!-- 棰勮娑堟伅 -->
+                <el-dialog title="娑堟伅棰勮" :visible.sync="dialogView" v-if="dialogView" width="60%"
+                    :before-close="handleConfirmClose" append-to-body>
+                    <MyColView  :info="info" @closeDialog="closeDialog"></MyColView>
+                </el-dialog>
             </div>
         </main>
     </div>
@@ -73,8 +78,9 @@
 <script>
 import MyEditor from '@/components/edit'
 import MyColumnAdd from '@/views/operate/message/mycontrol/createUser'
+import MyColView from '../messageView'
 export default {
-    components: { MyEditor, MyColumnAdd },
+    components: { MyEditor, MyColumnAdd,MyColView },
     data() {
         const validateNickname = (rule, value, callback) => {
             if (!value) {
@@ -102,7 +108,7 @@
                 messageType: '',
                 head: '',
                 targetTo: '',
-                targetFrom:null,
+                targetFrom: null,
                 body: '',
                 channelCode: '01',
             },
@@ -121,16 +127,20 @@
             departList: [],
             typeList: [],
             dialogCreate: false,
+            dialogView: false,
             defaultProps: {
                 children: 'children',
                 label: 'departName',
-                disabled: function (data, node) {
-                    if (data.createTime) {
-                        return !data.leaf
-                    }
-                }
+                // disabled: function (data, node) {
+                //     if (data.createTime) {
+                //         return !data.leaf
+                //     }
+                // }
             },
-            checkedList: []
+            checkedList: [],
+            tempNameArr:[],
+            info:{},
+            sendUser:""
         }
     },
     created() {
@@ -216,17 +226,25 @@
         },
         // 閫変腑id
         handleCheck(data, node) {
-            console.log(data, node);
-            this.checkedList = node.checkedKeys;
-            this.role.targetTo = node.checkedKeys.length + '浜�';
+            let arr = [],nameArr = []
+            console.log(node.checkedNodes)
+            node.checkedNodes.forEach(item => {
+                if(!item.hasOwnProperty('departType')){
+                    arr.push(item.id)
+                    nameArr.push(item.departName)
+                }
+            })
+            this.checkedList = arr
+            this.tempNameArr = nameArr
+            console.log(this.tempNameArr)
+            this.role.targetTo = arr.length + '浜�'
         },
-        // 鏂板缓娑堟伅
-        handleSubmit() {
-            console.log(this.role);
+        // 鏂板缓/淇濆瓨娑堟伅(1:鏂板缓,0淇濆瓨娑堟伅)
+        handleSubmit(mystatus) {
             this.$refs.user.validate((valid) => {
-                console.log(valid)
                 if (valid) {
-                    const {role,checkedList} = this;
+                    const { role, checkedList } = this;
+                    console.log(checkedList);
                     this.$axios({
                         method: 'post',
                         url: 'sccg/message/sendMessage',
@@ -237,19 +255,19 @@
                             messageType: role.messageType,
                             sendTime: new Date(),
                             targetTo: checkedList.join(','),
-                            targetFrom:`${role.targetFrom}`,
-                            status:1,
+                            targetFrom: `${role.targetFrom}`,
+                            status: mystatus,
                         }
                     })
-                    .then(res=>{
-                        if(res.code === 200){
-                            this.$message({
-                                type:'success',
-                                message:'鍙戦�佹垚鍔�',
-                            })
-                            this.$emit('closeMyDialog',{flag:false,index:1});
-                        }
-                    })
+                        .then(res => {
+                            if (res.code === 200) {
+                                this.$message({
+                                    type: 'success',
+                                    message: mystatus === 1 ? '鍙戦�佹垚鍔�' : '淇濆瓨鎴愬姛',
+                                })
+                                this.$emit('closeMyDialog', { flag: false, index: 1 });
+                            }
+                        })
                 } else {
                     return false;
                 }
@@ -261,22 +279,53 @@
             this.role.body = obj;
         },
         // 閲嶇疆琛ㄥ崟
-        handleReset(){
+        handleReset() {
             this.$refs.edit.editor.txt.clear();
             // this.$refs.edit.wangEditor.txt.html('<p><br></p>') 
             this.setDepartList();
             this.$refs.user.resetFields();
         },
         // 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛淇℃伅
-        getLoginUserInfo(){
+        getLoginUserInfo() {
             const name = sessionStorage.getItem('name');
             this.$axios({
-                method:'get',
-                url:'sccg/admin/info?name='+name,
+                method: 'get',
+                url: 'sccg/admin/info?name=' + name,
             })
-            .then(res=>{
-                this.role.targetFrom = res.data.userId
+                .then(res => {
+                    this.role.targetFrom = res.data.userId
+                    this.sendUser = res.data.username
+                })
+        },
+        // 娑堟伅棰勮
+        handleView() {
+            this.$refs.user.validate((valid) => {
+                if (valid) {
+                    const { role,getColText,tempNameArr,sendUser } = this
+                    this.dialogView = true;
+                    let info = {}
+                    // 鑾峰緱鏍忕洰娑堟伅
+                    info.channelCode = role.channelCode === '01'? '绔欏唴淇�': role.channelCode === '02' ? '閭欢':'鐭俊'
+                    info.messageType = getColText(role.messageType)
+                    info.body = role.body
+                    info.head = role.head
+                    info.targetTo = tempNameArr
+                    info.targetFrom = sendUser
+                    this.info = info
+                } else {
+                    return false
+                }
             })
+        },
+        // 鑾峰緱鏍忕洰娑堟伅
+        getColText(id){
+            console.log(id)
+            const {colList} = this
+            let str = ''
+            colList.forEach(item=>{
+                item.id === id ? str = item.columnName : '' 
+            })
+            return str
         }
     },
     props: ['closeMyDialog']
@@ -297,7 +346,9 @@
             display: flex;
             justify-content: center;
             padding-top: 50px;
-
+            &:deep(.el-dialog__title) {
+                color: #4b9bb7;
+            }
             &::v-deep .el-form-item__label {
                 color: #4b9bb7;
             }

--
Gitblit v1.8.0