From 66d88a25e67618668a55e9a411d99068beed3a3f Mon Sep 17 00:00:00 2001
From: luobisheng <727299681@qq.com>
Date: 星期一, 28 十一月 2022 18:11:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/operate/message/myIndex/update/index.vue | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/views/operate/message/myIndex/update/index.vue b/src/views/operate/message/myIndex/update/index.vue
index 4af4865..a43d5de 100644
--- a/src/views/operate/message/myIndex/update/index.vue
+++ b/src/views/operate/message/myIndex/update/index.vue
@@ -13,8 +13,8 @@
<!-- 鎻愰啋鏂瑰紡 -->
<el-form-item class="optionItem" label="鎻愰啋鏂瑰紡:" prop="channelCode">
<el-radio-group v-model="role.channelCode">
- <el-radio label="01" value="01">绔欏唴淇�</el-radio>
- <el-radio label="02" value="02">閭欢</el-radio>
+ <el-radio label="01">绔欏唴淇�</el-radio>
+ <el-radio label="03">閭欢</el-radio>
</el-radio-group>
<span class="message-tip">(鐭俊鍙敤鏁�: 1000鏉�)</span>
</el-form-item>
@@ -148,11 +148,11 @@
};
return {
role: {
- messageType: "",
+ messageType: null,
head: "",
targetTo: "",
body: "",
- channelCode: "01",
+ channelCode: null,
},
createRoleRules: {
messageType: [
@@ -218,7 +218,7 @@
async getColumnList() {
await this.$axios({
method: "get",
- url: "sccg/message_column/getAllColumn",
+ url: "sccg/message_column/getShowColumn",
}).then((res) => {
this.colList = res.data;
});
@@ -289,6 +289,9 @@
targetTo: this.checkedList.join(","),
status: mystatus,
};
+ if (this.role.channelCode === '03') {
+ delete params.messageType;
+ }
if (this.type === "create") {
sendMessage(params)
.then(() => {
@@ -302,7 +305,7 @@
})
);
} else {
- updateMessage(params)
+ updateMessage({ id: this.myDataRow.id, ...params })
.then(() => {
this.$emit("closeMyDialog");
this.$message({ type: "success", message: "鎿嶄綔鎴愬姛" });
@@ -340,6 +343,7 @@
// 娑堟伅棰勮
handleView() {
+ this.role.body = this.$refs.edit.editor.txt.html();
this.$refs.user.validate((valid) => {
if (valid) {
const { body, head, channelCode } = this.role;
@@ -350,7 +354,7 @@
channelCode:
channelCode === "01"
? "绔欏唴淇�"
- : channelCode === "02"
+ : channelCode === "03"
? "閭欢"
: "鐭俊",
messageType: this.role.messageType,
--
Gitblit v1.8.0