1

src/components/Editor/TinymceEditor.vue

@@ -1,12 +1,6 @@
 <template>
   <div class="content_1111">
-    <Editor
-      api-key="nfaxt3iz0ciqr1yg7zxzifvksvval28yl46wr1n0847mt0d3"
-      :init="init"
-      v-model="content"
-      :disabled="disabled"
-      ref="tinymce"
-    />
+    <Editor api-key="nfaxt3iz0ciqr1yg7zxzifvksvval28yl46wr1n0847mt0d3" :init="init" v-model="content" :disabled="disabled" ref="tinymce" />
   </div>
 </template>
 
@@ -27,7 +21,7 @@ const props = defineProps({
   },
   plugins: {
     type: [String, Array],
-    default: "lists link image table code help wordcount",
+    default: "lists link image table code help wordcount autoresize ",
   }, //必填
   toolbar: {
     type: [String, Array],
@@ -44,6 +38,7 @@ const tinymce = ref(null);
 const init = reactive({
   plugins: plugins,
   toolbar: toolbar,
+  min_height: 300,
   content_css: "tinymce-5", //主题tinymce-5-dark || tinymce-5 || default || writer || document || dark
   custom_undo_redo_levels: 50, //回退数量
   end_container_on_empty_block: true, //块级文本是否换行
@@ -58,9 +53,9 @@ const init = reactive({
   paste_data_images: true, //是否打开黏贴图片功能
   font_formats:
     "微软雅黑='微软雅黑';宋体='宋体';黑体='黑体';仿宋='仿宋';楷体='楷体';隶书='隶书';幼圆='幼圆';Andale Mono=andale mono,times;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Trebuchet MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings", //字体
-  fontsize_formats: "8pt 10pt 12pt 14pt 18pt 24pt 36pt", // 第二步
+  font_size_formats: "8px 10px 12px 14px 16px 18px 24px 36px", // 第二步
   convert_fonts_to_spans: true,
-  font_size_style_values: "8pt,10pt,12pt,14pt,18pt,24pt,36pt",
+  font_size_style_values: "8px,10px,12px,14px,16px,18px,24px,36px",
   images_upload_url: import.meta.env.VITE_APP_BASE_API,
   images_upload_handler: (blobInfo, progress) =>
     new Promise((resolve, reject) => {

src/views/EHSD/procurement/profitBudgetEHSD/index.vue

@@ -45,10 +45,10 @@
         <el-table-column label="毛利" prop="gross" width="130" fixed>
           <template #default="{ row,$index }">
             <div style="display:flex">
-              <el-popover placement="top-start" :width="400" trigger="hover" @show="showEcharts(row,$index)">
+              <el-popover placement="top-start" :width="600" trigger="hover" @show="showEcharts(row,$index)">
                 <template #default>
                   <div>
-                    <div :ref="row.contractId+$index" style="height:180px">
+                    <div :ref="row.contractId+$index" style="height:320px">
                     </div>
                   </div>
                 </template>
@@ -907,7 +907,7 @@ const optionTwo = reactive({
     // },
     grid: {
       left: "3%",
-      right: "4%",
+      right: "6%",
       top: "10%",
       bottom: "3%",
       containLabel: true,

src/views/connect/E-mail/mail/com/mailDetail.vue

@@ -119,9 +119,9 @@
             <div style="margin:5px 0">
               主题： {{item.subject}}
             </div>
-            <div>
+            <!-- <div>
               附件： aa.png
-            </div>
+            </div> -->
           </div>
         </div>
         <div class="list" v-show="activeName=='second'">

src/views/connect/E-mail/mail/com/mailWrite.vue

@@ -8,7 +8,7 @@
         <el-form-item label="收件人" prop="to">
           <div style="width: 100%">
             <div style="display: flex; width: 100%">
-              <el-autocomplete v-model="formData.data.to" clearable placeholder="请输入" style="width: 100%" @select="handlePerson"
+              <el-autocomplete v-model="formData.data.to" clearable placeholder="请输入" style="width: 100%" @select="(data)=>handlePerson(data,10)"
                                :fetch-suggestions="querySearchPerson" @keyup.enter.native="handleAdd(10)">
               </el-autocomplete>
               <!-- <el-input v-model="formData.data.to" placeholder="请输入" @keyup.enter.native="handleAdd(10)" /> -->
@@ -21,15 +21,15 @@
         </el-form-item>
         <el-form-item label="" prop="">
           <div style="display: flex">
-            <span style="color: #666666; cursor: pointer" @click="showcc = !showcc">抄送</span>
+            <span style="color: #666666; cursor: pointer" @click="handleShowOther(1)">抄送</span>
             <span style="color: ##dddddd; margin: 0 8px">|</span>
-            <span style="color: #666666; cursor: pointer" @click="showbcc = !showbcc">密送</span>
+            <span style="color: #666666; cursor: pointer" @click="handleShowOther(2)">密送</span>
           </div>
         </el-form-item>
         <el-form-item label="抄送人" prop="cc" v-if="showcc">
           <div style="width: 100%">
             <div style="display: flex; width: 100%">
-              <el-autocomplete v-model="formData.data.cc" clearable placeholder="请输入" style="width: 100%" @select="handlePerson"
+              <el-autocomplete v-model="formData.data.cc" clearable placeholder="请输入" style="width: 100%" @select="(data)=>handlePerson(data,20)"
                                :fetch-suggestions="querySearchPerson" @keyup.enter.native="handleAdd(20)">
               </el-autocomplete>
               <!-- <el-input v-model="formData.data.cc" placeholder="请输入" @keyup.enter.native="handleAdd(20)" /> -->
@@ -43,7 +43,7 @@
         <el-form-item label="密送人" prop="bcc" v-if="showbcc">
           <div style="width: 100%">
             <div style="display: flex; width: 100%">
-              <el-autocomplete v-model="formData.data.bcc" clearable placeholder="请输入" style="width: 100%" @select="handlePerson"
+              <el-autocomplete v-model="formData.data.bcc" clearable placeholder="请输入" style="width: 100%" @select="(data)=>handlePerson(data,30)"
                                :fetch-suggestions="querySearchPerson" @keyup.enter.native="handleAdd(30)">
               </el-autocomplete>
               <!-- <el-input v-model="formData.data.bcc" placeholder="请输入" @keyup.enter.native="handleAdd(30)" /> -->
@@ -307,6 +307,25 @@ const handleBeforeUpload = async (file) => {
   });
 };
 
+const handleShowOther = (type) => {
+  if (type == 1) {
+    if (!showcc.value) {
+      showcc.value = true;
+    } else {
+      formData.data.cc = "";
+      cc.value = [];
+      showcc.value = false;
+    }
+  } else {
+    if (!showbcc.value) {
+      showbcc.value = true;
+    } else {
+      formData.data.bcc = "";
+      bcc.value = [];
+      showbcc.value = false;
+    }
+  }
+};
 const handleClose = (index, val) => {
   switch (val) {
     case 10:
@@ -321,7 +340,7 @@ const handleClose = (index, val) => {
   }
 };
 
-const handleAdd = (val) => {
+const handleAdd = (val, name = null) => {
   switch (val) {
     case 10: {
       if (!validEmail(formData.data.to)) {
@@ -332,7 +351,7 @@ const handleAdd = (val) => {
       }
       to.value.push({
         address: formData.data.to,
-        personal: null,
+        personal: name,
       });
       formData.data.to = "";
       break;
@@ -346,7 +365,7 @@ const handleAdd = (val) => {
       }
       cc.value.push({
         address: formData.data.cc,
-        personal: null,
+        personal: name,
       });
       formData.data.cc = "";
       break;
@@ -360,7 +379,7 @@ const handleAdd = (val) => {
       }
       bcc.value.push({
         address: formData.data.bcc,
-        personal: null,
+        personal: name,
       });
       formData.data.bcc = "";
       break;
@@ -368,8 +387,10 @@ const handleAdd = (val) => {
   }
 };
 
-const handlePerson = (val) => {
-  console.log(val, "ss");
+const handlePerson = (data, type) => {
+  if (data && data.email) {
+    handleAdd(type, data.name);
+  }
 };
 
 const querySearchPerson = (queryString, callback) => {