From 0d7d6fc9a5c40ccc90190b0f24039ec1362f120f Mon Sep 17 00:00:00 2001
From: “dzb” <2632970487@qq.com>
Date: 星期一, 17 十月 2022 11:33:10 +0800
Subject: [PATCH] 新增设备管理、完善消息新增,修改bug
---
src/views/operate/message/myIndex/createUser/index.vue | 87 ++++++++++++++++++++++++++++++++-----------
1 files changed, 64 insertions(+), 23 deletions(-)
diff --git a/src/views/operate/message/myIndex/createUser/index.vue b/src/views/operate/message/myIndex/createUser/index.vue
index aff2598..64cc64d 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,9 +26,9 @@
<!-- 鎺ユ敹瀵硅薄 -->
<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"
+ <el-tree ref="tree" check-strictly :data="departList" :props="defaultProps"
show-checkbox @check="handleCheck" default-expand-all node-key="id">
</el-tree>
</el-option>
@@ -37,7 +37,7 @@
</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>
<!-- 鎻愰啋鏂瑰紡 -->
@@ -53,11 +53,11 @@
<div class="optionBtn">
<el-button type="primary" class="btn save">淇濆瓨
</el-button>
- <el-button type="primary" class="btn submit">鍙戝竷
+ <el-button type="primary" @click.native.prevent="handleSubmit" class="btn submit">鍙戝竷
</el-button>
<el-button type="primary" 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>
@@ -91,10 +91,10 @@
}
};
const validateTruename = (rule, value, callback) => {
- if (value) {
+ if (value.length !== 0) {
callback();
} else {
- callback();
+ callback(new Error('璇烽�夋嫨鎺ユ敹瀵硅薄'));
}
};
return {
@@ -106,19 +106,18 @@
channelCode: 1,
},
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,
defaultProps: {
@@ -128,8 +127,9 @@
if (data.createTime) {
return !data.leaf
}
- }
+ }
},
+ checkedList: []
}
},
created() {
@@ -200,11 +200,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 +214,57 @@
},
// 閫変腑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;
+ console.log(data, node);
+ this.checkedList = node.checkedKeys;
+ this.role.targetTo = node.checkedKeys.length + '浜�';
+ },
+ // 鏂板缓娑堟伅
+ handleSubmit() {
+ console.log(this.role);
+ this.$refs.user.validate((valid) => {
+ console.log(valid)
+ if (valid) {
+ const {role,checkedList} = this;
+ 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(',')
+ }
+ })
+ .then(res=>{
+ if(res.code === 200){
+ this.$message({
+ type:'success',
+ message:'鍙戦�佹垚鍔�',
+ })
+ 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();
}
},
- props: ['']
+ props: ['closeMyDialog']
}
</script>
<style lang="scss" scoped>
--
Gitblit v1.8.0