From 6cde85d8030db64ae1e499178529ab8a9ec80fe1 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期四, 27 十月 2022 18:05:19 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui into master
---
src/views/operate/message/myIndex/createUser/index.vue | 179 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 143 insertions(+), 36 deletions(-)
diff --git a/src/views/operate/message/myIndex/createUser/index.vue b/src/views/operate/message/myIndex/createUser/index.vue
index aff2598..2c25012 100644
--- a/src/views/operate/message/myIndex/createUser/index.vue
+++ b/src/views/operate/message/myIndex/createUser/index.vue
@@ -14,7 +14,7 @@
</el-option>
</el-select>
</div>
- <span class="message-add" @click='dialogCreate = true'>娣诲姞鏍忕洰</span>
+ <span class="message-add" @click='dialogCreate = true'> 娣诲姞鏍忕洰</span>
</div>
</el-form-item>
<!-- 娑堟伅鏍囬 -->
@@ -26,10 +26,10 @@
<!-- 鎺ユ敹瀵硅薄 -->
<el-form-item class="optionItem" label="鎺ユ敹瀵硅薄:" prop="targetTo">
<div class="message-item__left">
- <el-select v-model="role.targetTo" multiple :placeholder="checkNum">
+ <el-select v-model="role.targetTo" placeholder="璇烽�夋嫨鎺ユ敹瀵硅薄" >
<el-option :value="role.targetTo">
- <el-tree ref="tree" :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>
@@ -37,27 +37,27 @@
</el-form-item>
<!-- 娑堟伅鍐呭 -->
<el-form-item class="optionItem" label="娑堟伅鍐呭:" prop="body">
- <MyEditor :content="role.body"></MyEditor>
+ <MyEditor ref="edit" @getMyBody="getMyBody"></MyEditor>
<!-- <el-input type="textarea" v-model="role.description" placeholder="璇疯緭鍏ユ弿杩板唴瀹�200瀛椾互鍐�"></el-input> -->
</el-form-item>
<!-- 鎻愰啋鏂瑰紡 -->
<el-form-item class="optionItem" label="鎻愰啋鏂瑰紡:" prop="channelCode">
<el-radio-group v-model="role.channelCode">
- <el-radio :label="1">绔欏唴淇�</el-radio>
- <el-radio :label="2">閭欢</el-radio>
- <el-radio :label="3">鐭俊</el-radio>
+ <el-radio label="01">绔欏唴淇�</el-radio>
+ <el-radio label="02">閭欢</el-radio>
+ <el-radio label="03">鐭俊</el-radio>
</el-radio-group>
<span class="message-tip">(鐭俊鍙敤鏁�: 1000鏉�)</span>
</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" 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">閲嶇疆</el-button>
+ <el-button class="btn cancel" @click.native.prevent="handleReset">閲嶇疆</el-button>
</div>
</el-form-item>
</el-form>
@@ -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) {
@@ -91,10 +97,10 @@
}
};
const validateTruename = (rule, value, callback) => {
- if (value) {
+ if (value.length !== 0) {
callback();
} else {
- callback();
+ callback(new Error('璇烽�夋嫨鎺ユ敹瀵硅薄'));
}
};
return {
@@ -102,39 +108,45 @@
messageType: '',
head: '',
targetTo: '',
+ targetFrom: null,
body: '',
- channelCode: 1,
+ channelCode: '01',
},
createRoleRules: {
- name: [
+ messageType: [
{ required: true, trigger: "blur", validator: validateNickname },
],
- type: [
+ head: [
{ required: false, trigger: "blur", validator: validatePass },
],
- description: [
+ targetTo: [
{ required: false, trigger: "blur", validator: validateTruename },
],
},
colList: [],
departList: [],
- checkNum: '璇烽�夋嫨鎺ユ敹瀵硅薄',
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: [],
+ tempNameArr:[],
+ info:{},
+ sendUser:""
}
},
created() {
this.setColumnList();
this.setDepartList();
+ this.getLoginUserInfo();
},
methods: {
// 鍏抽棴寮圭獥
@@ -200,11 +212,11 @@
if (obj.children !== null) {
if (obj.children.length !== 0) {
obj.children.forEach(item => {
- return this.setChildren(item);
+ return this.setChildren(item);
})
}
} else {
- if (obj.userInfoDTOS.length !== 0) {
+ if (obj.userInfoDTOS.length !== 0) {
obj.children = [];
obj.userInfoDTOS.forEach(item => {
obj.children.push({ id: item.userId, departName: item.username })
@@ -214,16 +226,109 @@
},
// 閫変腑id
handleCheck(data, node) {
- console.log(node.checkedKeys);
- // this.checkList = node.checkedKeys;
- // if(node.checkedKeys.length === 1){
- // this.role.targetTo = data.departName;
- // }
- // let per = node.checkedKeys.length;
- // per ===0 ? this.checkNum="璇烽�夋嫨鎺ユ敹瀵硅薄" : this.checkNum = ''+per;
+ 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 + '浜�'
+ },
+ // 鏂板缓/淇濆瓨娑堟伅(1:鏂板缓,0淇濆瓨娑堟伅)
+ handleSubmit(mystatus) {
+ this.$refs.user.validate((valid) => {
+ if (valid) {
+ const { role, checkedList } = this;
+ console.log(checkedList);
+ this.$axios({
+ method: 'post',
+ url: 'sccg/message/sendMessage',
+ data: {
+ 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 });
+ }
+ })
+ } else {
+ return false;
+ }
+ })
+ },
+ // 鑾峰緱娑堟伅浣�
+ getMyBody(obj) {
+ console.log(obj);
+ this.role.body = obj;
+ },
+ // 閲嶇疆琛ㄥ崟
+ handleReset() {
+ this.$refs.edit.editor.txt.clear();
+ // this.$refs.edit.wangEditor.txt.html('<p><br></p>')
+ this.setDepartList();
+ this.$refs.user.resetFields();
+ },
+ // 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛淇℃伅
+ getLoginUserInfo() {
+ const name = sessionStorage.getItem('name');
+ this.$axios({
+ method: 'get',
+ url: 'sccg/admin/info?name=' + name,
+ })
+ .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: ['']
+ props: ['closeMyDialog']
}
</script>
<style lang="scss" scoped>
@@ -241,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