From d1c6fa3e2e7ef9a5009e798909ed80aecf2eb1db Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 29 十一月 2022 11:40:30 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui

---
 src/views/operate/message/myIndex/update/index.vue |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/views/operate/message/myIndex/update/index.vue b/src/views/operate/message/myIndex/update/index.vue
index 4af4865..9ebf470 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>
@@ -40,7 +40,7 @@
                   </el-option>
                 </el-select>
               </div>
-              <span class="message-add" @click="dialogCreate = true">
+              <span class="message-add button-addition" @click="dialogCreate = true">
                 娣诲姞鏍忕洰</span
               >
             </div>
@@ -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