From 129e151f68e215ff592bb36ef52eb1ed5c15740d Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 16 十一月 2022 17:50:22 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui
---
src/views/operate/sms/smsIndex/createSms/index.vue | 141 ++++++++++++++--------------------------------
1 files changed, 43 insertions(+), 98 deletions(-)
diff --git a/src/views/operate/sms/smsIndex/createSms/index.vue b/src/views/operate/sms/smsIndex/createSms/index.vue
index 7daf0f7..1c5fcce 100644
--- a/src/views/operate/sms/smsIndex/createSms/index.vue
+++ b/src/views/operate/sms/smsIndex/createSms/index.vue
@@ -2,7 +2,7 @@
<div class="createUser">
<main>
<div class="mainContent">
- <el-form ref="user" label-width="140px" autoComplete="on" :model="role" :rules="createRoleRules"
+ <el-form ref="user" label-width="140px" autoComplete="on" :model="role" :rules="rules"
label-position="right">
<!-- 娑堟伅鏍忕洰 -->
<el-form-item class="optionItem" label="鐭俊妯℃澘:" prop="messageType">
@@ -14,7 +14,6 @@
</el-option>
</el-select>
</div>
- <span class="message-add" @click='dialogCreate = true'> 娣诲姞鏍忕洰</span>
</div>
</el-form-item>
<!-- 娑堟伅鏍囬 -->
@@ -42,52 +41,30 @@
<el-form-item>
<div class="optionBtn">
- <el-button type="primary" @click.native.prevent="handleSubmit(1)" class="btn submit">鍙戝竷
- </el-button>
+ <el-button messageType="primary" @click.native.prevent="handleSubmit(1)" class="btn submit">鍙戝竷</el-button>
<el-button class="btn cancel" @click.native.prevent="handleReset">閲嶇疆</el-button>
</div>
</el-form-item>
</el-form>
- <!-- 鏂板鏍忕洰 -->
- <el-dialog title="娣诲姞鏍忕洰" :visible.sync="dialogCreate" v-if="dialogCreate" width="60%"
- :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>
</template>
<script>
import MyEditor from '@/components/edit'
+import { sendMessage } from "@/api/operate/messageManagement";
+
export default {
components: { MyEditor },
data() {
- const validateNickname = (rule, value, callback) => {
- if (!value) {
- callback(new Error("璇峰～鍐欐秷鎭爮鐩�"));
- } else {
- callback();
- }
- };
- const validatePass = (rule, value, callback) => {
- if (!value) {
- callback();
- } else {
- callback();
- }
- };
- const validateTruename = (rule, value, callback) => {
- if (value.length !== 0) {
- callback();
- } else {
- callback(new Error('璇烽�夋嫨鎺ユ敹瀵硅薄'));
- }
- };
+ const validateMessageContent = (rule, value, callback) => {
+ if (!value) {
+ callback(new Error('璇疯緭鍏ョ煭淇″唴瀹�'));
+ } else {
+ callback();
+ }
+ }
+
return {
role: {
messageType: '',
@@ -95,18 +72,21 @@
targetTo: '',
targetFrom: null,
body: '',
- channelCode: '01',
+ channelCode: '03'
},
- createRoleRules: {
+ rules: {
messageType: [
- { required: true, trigger: "blur", validator: validateNickname },
+ { required: true, trigger: ['blur', 'change'], message: '璇烽�夋嫨鐭俊妯℃澘' },
],
head: [
- { required: false, trigger: "blur", validator: validatePass },
+ { required: true, trigger: "blur", message: '璇疯緭鍏ョ煭淇℃爣棰�' },
],
targetTo: [
- { required: false, trigger: "blur", validator: validateTruename },
+ { required: true , trigger: "blur", message: '璇烽�夋嫨鎺ユ敹浜�' },
],
+ body: [
+ { required: true, trigger: ['blur', 'change'], validator: validateMessageContent }
+ ]
},
colList: [],
departList: [],
@@ -115,16 +95,11 @@
dialogView: false,
defaultProps: {
children: 'children',
- label: 'departName',
- // disabled: function (data, node) {
- // if (data.createTime) {
- // return !data.leaf
- // }
- // }
+ label: 'departName'
},
checkedList: [],
tempNameArr:[],
- info:{},
+ info: {},
sendUser:""
}
},
@@ -153,7 +128,6 @@
url: 'sccg/message_column/getAllColumn'
})
.then(res => {
- console.log(res);
arr = res.data;
})
return arr;
@@ -185,10 +159,8 @@
// 澶勭悊閮ㄩ棬鏍�
async filterDepartList() {
let arr = await this.getDepartList();
- const { setChildren } = this;
- // console.log(setChildren);
arr.forEach(item => {
- setChildren(item);
+ this.setChildren(item);
})
return arr;
},
@@ -211,48 +183,28 @@
},
// 閫変腑id
handleCheck(data, node) {
- 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.push(item.id)
+ this.tempNameArr.push(item.departName)
}
})
- this.checkedList = arr
- this.tempNameArr = nameArr
- console.log(this.tempNameArr)
- this.role.targetTo = arr.length + '浜�'
+ this.role.targetTo = this.checkedList.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: '03',
- 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 });
- }
- })
+ const params = Object.assign({}, this.role);
+ params.targetTo = this.checkedList.join(',');
+ params.targetFrom = this.sendUser;
+ params.status = mystatus;
+ sendMessage(params)
+ .then(() => {
+ this.$message({ type: 'success', message: '鎿嶄綔鎴愬姛' });
+ this.$emit('closeDialog');
+ })
+ .catch(err => this.$message({ type: 'error', message: err }));
} else {
return false;
}
@@ -260,13 +212,11 @@
},
// 鑾峰緱娑堟伅浣�
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();
},
@@ -286,17 +236,14 @@
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
+ this.info = {
+ messageType: this.getColText(role.messageType),
+ body: this.role.body,
+ head: this.role.head,
+ targetTo: this.tempNameArr,
+ targetFrom: this.sendUser
+ };
} else {
return false
}
@@ -304,7 +251,6 @@
},
// 鑾峰緱鏍忕洰娑堟伅
getColText(id){
- console.log(id)
const {colList} = this
let str = ''
colList.forEach(item=>{
@@ -323,7 +269,6 @@
main {
text-align: left;
- padding: 0 55px;
background-color: #09152f;
padding-bottom: 50px;
--
Gitblit v1.8.0