From a8532e35b1a39de9bbcc5f2a648fe02c72d9c2b0 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 16 二月 2023 14:09:53 +0800
Subject: [PATCH] Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0
---
src/views/operate/sms/smsIndex/createSms/index.vue | 105 ++++++++++++++++++++++++++--------------------------
1 files changed, 52 insertions(+), 53 deletions(-)
diff --git a/src/views/operate/sms/smsIndex/createSms/index.vue b/src/views/operate/sms/smsIndex/createSms/index.vue
index 9018a13..5ca289d 100644
--- a/src/views/operate/sms/smsIndex/createSms/index.vue
+++ b/src/views/operate/sms/smsIndex/createSms/index.vue
@@ -8,8 +8,8 @@
<el-form-item class="optionItem" label="鐭俊妯℃澘:" prop="messageType">
<div class="message-item">
<div class="message-item__left">
- <el-select v-model="role.messageType" placeholder="璇烽�夋嫨鐭俊妯℃澘">
- <el-option v-for="item in colList" :key="item.id" :label="item.columnName"
+ <el-select v-model="role.messageType" placeholder="璇烽�夋嫨鐭俊妯℃澘" @change="setTemplateValue">
+ <el-option v-for="item in colList" :key="item.id" :label="item.title"
:value="item.id">
</el-option>
</el-select>
@@ -53,6 +53,7 @@
<script>
import MyEditor from '@/components/edit'
import { sendMessage } from "@/api/operate/messageManagement";
+import SMS from "@/api/operate/SMS";
export default {
components: { MyEditor },
@@ -81,7 +82,7 @@
{ required: true, trigger: "blur", message: '璇疯緭鍏ョ煭淇℃爣棰�' },
],
targetTo: [
- { required: true , trigger: "blur", message: '璇烽�夋嫨鎺ユ敹浜�' },
+ { required: true , trigger: "blur", message: '璇烽�夋嫨鎺ユ敹瀵硅薄' },
],
body: [
{ required: true, trigger: ['blur', 'change'], validator: validateMessageContent }
@@ -103,7 +104,7 @@
}
},
created() {
- this.setColumnList();
+ this.getSMSTemplateList();
this.setDepartList();
this.getLoginUserInfo();
},
@@ -115,29 +116,18 @@
done();
})
},
- // 璁剧疆鏍忕洰
- async setColumnList() {
- this.colList = await this.getColumnList();
+
+ getSMSTemplateList() {
+ SMS.getSMSTemplateList({ current: 1, pageSize: 100 })
+ .then(({ records }) => {
+ this.colList = records;
+ })
+ .catch(err => this.$message.error(err))
},
- // 鑾峰彇鏍忕洰
- async getColumnList() {
- let arr;
- await this.$axios({
- method: 'get',
- url: 'sccg/message_column/getAllColumn'
- })
- .then(res => {
- arr = res.data;
- })
- return arr;
- },
+
// 鍏抽棴寮圭獥
- closeDialog({ flag, index }) {
+ closeDialog({ flag }) {
this.dialogCreate = flag;
- if (index === 1) {
- // 閲嶆柊璁剧疆鏍忕洰
- this.setColumnList();
- }
},
// 鑾峰彇閮ㄩ棬鏍�
async getDepartList() {
@@ -182,6 +172,7 @@
},
// 閫変腑id
handleCheck(data, node) {
+ this.checkedList = []
node.checkedNodes.forEach(item => {
if(!item.hasOwnProperty('departType')){
this.checkedList.push(item.id)
@@ -201,12 +192,20 @@
sendMessage(params)
.then(() => {
this.$message({ type: 'success', message: '鎿嶄綔鎴愬姛' });
- this.$emit('closeDialog');
+ this.$emit('closeMyDialog');
})
.catch(err => this.$message({ type: 'error', message: err }));
} else {
this.$message.warning('璇锋鏌ュ繀濉」');
}
+ })
+ },
+ setTemplateValue(obj){
+ var _this=this
+ SMS.getSMSTemplateById(obj).then((result) =>{
+ _this.role.head=result.title
+ _this.role.body=result.body
+ _this.$refs.edit.editor.txt.html(result.body)
})
},
// 閲嶇疆琛ㄥ崟
@@ -223,8 +222,8 @@
url: 'sccg/admin/info?name=' + name,
})
.then(res => {
- this.role.targetFrom = res.data.userId
- this.sendUser = res.data.username
+ this.role.targetFrom = res.data.userId;
+ this.sendUser = res.data.username;
})
}
}
@@ -233,29 +232,29 @@
<style lang="scss" scoped>
.createUser {
border-radius: 1px;
- background-color: #09152f;
+ background-color: white;
main {
text-align: left;
- background-color: #09152f;
+ background-color: white;
padding-bottom: 50px;
.mainContent {
display: flex;
justify-content: center;
padding-top: 50px;
- &:deep(.el-dialog__title) {
- color: #4b9bb7;
- }
- &::v-deep .el-form-item__label {
- color: #4b9bb7;
- }
-
- &::v-deep .el-input__inner {
- width: 400px;
- background-color: #09152f;
- border: 1px solid #17324c;
- }
+ //&:deep(.el-dialog__title) {
+ // color: #4b9bb7;
+ //}
+ //&::v-deep .el-form-item__label {
+ // color: #4b9bb7;
+ //}
+ //
+ //&::v-deep .el-input__inner {
+ // width: 400px;
+ // background-color: #09152f;
+ // border: 1px solid #17324c;
+ //}
.message-item__left {
width: 400px;
@@ -271,9 +270,9 @@
width: 400px;
}
- :deep(.el-input) {
- width: 400px;
- }
+ //:deep(.el-input) {
+ // width: 400px;
+ //}
.message-item {
display: flex;
@@ -288,14 +287,14 @@
margin-left: 20px;
}
- :deep(.el-input--suffix) {
- width: 400px;
- }
-
- &::v-deep .el-textarea__inner {
- background-color: #09152f;
- border: 1px solid #17324c;
- }
+ //:deep(.el-input--suffix) {
+ // width: 400px;
+ //}
+ //
+ //&::v-deep .el-textarea__inner {
+ // background-color: #09152f;
+ // border: 1px solid #17324c;
+ //}
.el-form-item__content {
width: 400px;
@@ -330,4 +329,4 @@
}
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.8.0