发送消息修改。

src/components/Tinymce/index.vue

@@ -16,7 +16,7 @@ export default {
         height: 500,
         theme: "modern",
         menubar: false,
-        toolbar: `styleselect | fontselect | formatselect | fontsizeselect | forecolor backcolor | bold italic underline strikethrough | image  media | table | alignleft aligncenter alignright alignjustify | outdent indent | numlist bullist | preview removeformat  hr | paste link | undo redo | fullscreen code`,
+        toolbar: `styleselect | fontselect | formatselect | fontsizeselect | forecolor backcolor | bold italic underline strikethrough | link image  media | table | alignleft aligncenter alignright alignjustify | outdent indent | numlist bullist | preview removeformat  hr | paste undo redo | fullscreen code`,
         plugins: `
             paste
             importcss
@@ -33,6 +33,7 @@ export default {
             hr
             preview
         `,
+        theme_advanced_buttons1: "ankupload",
         // CONFIG
         forced_root_block: "p",
         force_p_newlines: true,
@@ -171,10 +172,9 @@ export default {
   methods: {
     setContent(value) {
       if (this.Editor != null) {
-        // get(id:String) 
+        // get(id:String)
         window.tinymce.get(`${this.Id}`).setContent(value);
-      }
-      else{
+      } else {
         /* eslint-disable-next-line */
         console.log("setContent before editor init!");
       }
@@ -182,8 +182,7 @@ export default {
     getContent() {
       if (this.Editor != null) {
         return window.tinymce.get(`${this.Id}`).getContent();
-      }
-      else{
+      } else {
         /* eslint-disable-next-line */
         console.log("setContent before editor init!");
         return "";
@@ -191,10 +190,10 @@ export default {
     },
     init() {
       const self = this;
+
       this.Editor = window.tinymce.init({
         // 默认配置
         ...this.DefaultConfig,
-
         // 图片上传
         images_upload_handler: function(blobInfo, success, failure) {
           if (blobInfo.blob().size > self.maxSize) {
@@ -209,7 +208,7 @@ export default {
           } else {
             failure("图片格式错误");
           }
-          
+
           function uploadPic() {
             const xhr = new XMLHttpRequest();
             const formData = new FormData();
@@ -236,7 +235,46 @@ export default {
             xhr.send(formData);
           }
         },
+        file_picker_types: "file",
+        file_picker_callback: function(callback, value, meta) {
+          //文件上传
+          console.log("文件上传:" + meta.filetype);
+
+          var input = document.createElement("input");
+          input.setAttribute("type", "file");
 
+          input.click();
+          input.onchange = function() {
+            var file = this.files[0];
+
+            const xhr = new XMLHttpRequest();
+            const formData = new FormData();
+            xhr.withCredentials = self.withCredentials;
+            xhr.open("POST", self.url);
+            xhr.onload = function() {
+              if (xhr.status !== 200) {
+                // 抛出 'on-upload-fail' 钩子
+                alert("上传失败: " + xhr.status);
+                return;
+              }
+
+              const json = JSON.parse(xhr.responseText);
+
+              /* eslint-disable-next-line */
+              console.log(json);
+
+              var fileName = file.name;
+              fileName = fileName.substring(fileName.lastIndexOf("/"));
+
+              callback(json.url, { title: fileName,text:fileName});
+            };
+
+            formData.append(self.uploadName, file, file.name);
+            xhr.send(formData);
+
+            callback('',{title:'文件上传中...'});
+          };
+        },
         // prop内传入的的config
         ...this.config,
 
@@ -248,9 +286,9 @@ export default {
           editor.on("init", () => {
             self.loading = false;
             self.$emit("on-ready");
-            
+
             /* eslint-disable-next-line */
-            if(self.value!=null){
+            if (self.value != null) {
               editor.setContent(self.value);
             }
           });

src/views/base/messageInfo-detail.vue

@@ -120,10 +120,6 @@ export default {
           })().then(function (response) {
             var jsonData = response.data;
 
-            if (self.formModel.content != null) {
-              self.$refs.editor.setContent(self.formModel.content);
-            }
-
             if (jsonData.result) {
               self.$message({
                 message: "保存成功!",
@@ -165,10 +161,15 @@ export default {
     })()
       .then((response) => {
         var jsonData = response.data;
+
         self.loading = false;
 
         if (jsonData.result) {
           self.formModel = jsonData.data;
+
+          if (self.formModel.content != null) {
+            self.$refs.editor.setContent(self.formModel.content);
+          }
         } else {
           self.$message.error(jsonData.message + "");
         }

src/views/base/messageInfo-list.vue

@@ -157,6 +157,7 @@
       title="选择发送对象"
       :modal-append-to-body="true"
       append-to-body
+      :close-on-click-modal="false"
       style="text-align: left"
       width="1000px"
     >

src/views/base/messageInfo-send.vue

@@ -26,11 +26,12 @@
       </el-form-item>
       <el-form-item label="所属角色" prop="roleId">
         <el-select v-model="queryModel.roleId" placeholder="请选择" clearable size="mini">
-          <el-option :value="item.id" v-for="item in roleList" :key="item.key" :label="item.personRoleName"></el-option>
+          <el-option :value="item.id" v-for="item in roleList" :key="item.key" 
+          :label="item.sceneName + '-' + item.personRoleName"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="姓名" prop="name">
-        <el-input v-model="queryModel.name" size="mini"></el-input>
+      <el-form-item label="姓名" prop="personName">
+        <el-input v-model="queryModel.personName" size="mini"></el-input>
       </el-form-item>
       <el-form-item>
         <el-button
@@ -168,14 +169,14 @@ export default {
       })
 
       //查询单位下角色
-      personRoleInfoApi.listByCompanyId(formData)
-      .then(response=>{
-          var jsonData = response.data;
-
-          if (jsonData.result) {
-            self.roleList = jsonData.data;
-          }
-      })
+      // personRoleInfoApi.listByCompanyId(formData)
+      // .then(response=>{
+      //     var jsonData = response.data;
+
+      //     if (jsonData.result) {
+      //       self.roleList = jsonData.data;
+      //     }
+      // })
     }
   },
   data() {
@@ -186,7 +187,7 @@ export default {
         companyId: "",
         companyStructureId: "",
         roleId: "",
-        name: ""
+        personName: ""
       },
       ruleValidate: {
         companyId: [{ required: true, message: "单位不能为空", trigger: "blur" }],
@@ -240,8 +241,8 @@ export default {
           formData.append("roleId", self.queryModel.roleId);
           }
 
-          if(self.queryModel.name!=null){
-            formData.append("name", self.queryModel.name);
+          if(self.queryModel.personName!=null){
+            formData.append("personName", self.queryModel.personName);
           }
 
           messageInfoApi

src/views/base/messageReceiver-list.vue

@@ -169,14 +169,14 @@ export default {
       })
 
       //查询单位下角色
-      personRoleInfoApi.listByCompanyId(formData)
-      .then(response=>{
-          var jsonData = response.data;
+      // personRoleInfoApi.listByCompanyId(formData)
+      // .then(response=>{
+      //     var jsonData = response.data;
 
-          if (jsonData.result) {
-            self.roleList = jsonData.data;
-          }
-      })
+      //     if (jsonData.result) {
+      //       self.roleList = jsonData.data;
+      //     }
+      // })
     }
   },
   data() {