瀏覽代碼

我的邮件

fengrui 4 年之前
父節點
當前提交
ce4e232ef8

+ 7 - 3
src/views/system/email/detail.vue

@@ -157,7 +157,11 @@
       </el-table-column>
       <el-table-column label="邮件主题" align="center" prop="mailTheme" />
       <!--<el-table-column label="收件人-账号" align="center" prop="receiverAccount" />-->
-      <el-table-column label="接收时间" width="180" align="center" prop="readTime" />
+      <el-table-column label="接收时间" width="180" align="center" prop="readTime">
+        <template slot-scope="scope">
+          <span>{{scope.row.readTime | format('yyyy-MM-dd hh:mm:ss')}}</span>
+        </template>
+      </el-table-column>
       <!--<el-table-column label="阅读时间" align="center" prop="readTime" width="180">-->
         <!--<template slot-scope="scope">-->
           <!--<span>{{ parseTime(scope.row.readTime, '{y}-{m}-{d}') }}</span>-->
@@ -319,7 +323,7 @@
 
         // this.$router.push({path:"/Emile/receiveList/replyinfo",query:{alert:"页面跳转成功"}})
 
-        this.$router.push({path:'/Emile/receiveList/replyinfo',query: {id:senderName[0] }})
+        this.$router.push({path:'/email/receiveList/replyinfo',query: {id:senderName[0] }})
       },
 
       /** 查询【请填写功能名称】列表 */
@@ -392,7 +396,7 @@
         const mailDetailGuid = row.mailDetailGuid || this.ids
           console.log(mailDetailGuid);
 
-          this.$router.push({path:'/Emile/receiveList/receiptdetails',query: {id:mailDetailGuid }})
+          this.$router.push({path:'/email/receiveList/receiptdetails',query: {id:mailDetailGuid }})
 
 
         getDetail(mailDetailGuid).then(response => {

+ 3 - 3
src/views/system/email/huishouzhan.vue

@@ -92,8 +92,8 @@
       <el-table-column label="邮件状态" width="130" align="center" prop="flg">
         <template slot-scope="scope">
           <!--{{scope.row}}-->
-          <el-tag v-if="scope.row.flg === '0'">发件</el-tag>
-          <el-tag v-else-if="scope.row.flg === '1'" type="success">收件</el-tag>
+          <el-tag v-if="scope.row.flg === '1'">发件</el-tag>
+          <el-tag v-else-if="scope.row.flg === '0'" type="success">收件</el-tag>
         </template>
       </el-table-column>
       <el-table-column label="发件人" width="180" align="center" prop="senderName" />
@@ -311,7 +311,7 @@
             if (this.form.mailGuid != undefined) {
               updateInfo(this.form).then(response => {
                 if (response.code === 200) {
-                  this.msgSuccess("修改成功");
+                  this.msgSuccess("撤销成功");
                   this.open = false;
                   this.getList();
                 }

+ 26 - 16
src/views/system/email/receiptdetails.vue

@@ -28,23 +28,23 @@
           </el-col >
           <el-col :span="22"><span class="hg">{{form.mailTheme}}</span></el-col>
         </el-row>
-        <!--<el-row :gutter="80">-->
-          <!--<el-col :span="1">-->
-            <!--<el-tag>附件</el-tag>-->
-          <!--</el-col >-->
-          <!--<el-col :span="22">-->
-            <!--<span class="hg" v-for="site in fujianpath">-->
-            <!--<img  :src="devapi + site" alt="">-->
-          <!--</span></el-col>-->
-        <!--</el-row>-->
+        <el-row :gutter="80">
+          <el-col :span="1">
+            <el-tag>附件</el-tag>
+          </el-col >
+          <el-col :span="22">
+            <span class="hg" v-for="site in fujianpath">
+            <a class="fujian" :href="devapi + site.path">{{site.name}} </a>
+          </span></el-col>
+        </el-row>
       </el-card>
       <el-row>
         <p class="text">
-          <el-row>
-            <span class="hg" v-for="site in fujianpath">
-            <img  :src="devapi + site" alt="">
-          </span>
-          </el-row>
+          <!--<el-row>-->
+            <!--<span class="hg" v-for="site in fujianpath">-->
+            <!--<img  :src="devapi + site" alt="">-->
+          <!--</span>-->
+          <!--</el-row>-->
           <el-row>
             {{form.mailContent}}
           </el-row>
@@ -100,6 +100,8 @@
         rules: {
         },
         fujianpath:'',
+        fujianName:'',
+        fujian:[],
         devapi:'',
       };
     },
@@ -125,8 +127,16 @@
           // this.form = response.data;
           this.form = response.data[0];
           this.fujianpath = this.form.filePath;
+          this.fujianName = this.form.fileName;
           // console.log(response.data);
           this.fujianpath =this.fujianpath.split(',')
+          this.fujianName =this.fujianName.split(',')
+          for(var i=0;i< this.fujianName.length;i++){
+            this.fujian.push({
+              "path": this.fujianpath[i],
+              "name":this.fujianName[i]
+            });
+          }
           this.devapi = process.env.VUE_APP_BASE_API
           // this.open = true;
           // this.title = "修改【请填写功能名称】";
@@ -201,7 +211,7 @@
         // this.reset();
         const mailDetailGuid = row.mailDetailGuid || this.ids
         console.log(mailDetailGuid);
-        this.$router.push({path:'/email/receiveList/xiangqing',query: {id:mailDetailGuid[0] }})
+        this.$router.push({path:'/Emile/receiveList/xiangqing',query: {id:mailDetailGuid[0] }})
 
         getDetail(mailDetailGuid).then(response => {
           // this.form = response.data;
@@ -289,7 +299,7 @@
   }
   .text{
     span{
-      margin: 20px;
+      /*margin: 20px;*/
     }
     padding: 0 20px;
   }

+ 43 - 23
src/views/system/email/senddetails.vue

@@ -14,7 +14,7 @@
         <el-col :span="1">
           <el-tag>时 间</el-tag>
         </el-col >
-        <el-col :span="22"><span class="hg">{{form.readTime}}</span></el-col>
+        <el-col :span="22"><span class="hg">{{form.createTime | format('yyyy-MM-dd hh:mm:ss')}}</span></el-col>
       </el-row>
       <el-row :gutter="80">
         <el-col :span="1">
@@ -28,26 +28,33 @@
         </el-col >
         <el-col :span="22"><span class="hg">{{form.mailTheme}}</span></el-col>
       </el-row>
-      <!--<el-row :gutter="80">-->
-      <!--<el-col :span="1">-->
-      <!--<el-tag>附件</el-tag>-->
-      <!--</el-col >-->
-      <!--<el-col :span="22">-->
-      <!--<span class="hg" v-for="site in fujianpath">-->
-      <!--<img  :src="devapi + site" alt="">-->
-      <!--</span></el-col>-->
-      <!--</el-row>-->
+      <el-row :gutter="80">
+      <el-col :span="1">
+      <el-tag>附件</el-tag>
+      </el-col >
+      <el-col :span="22">
+      <span class="hg" v-for="site in fujian">
+      <a class="fujian" :href="devapi + site.path">{{site.name}} </a>
+      </span></el-col>
+      </el-row>
     </el-card>
     <el-row>
       <p class="text">
+        <!--<el-row>-->
+            <!--<span class="hg" v-for="site in fujian">-->
+              <!--&lt;!&ndash;<img :src="devapi + site.path">&ndash;&gt;-->
+              <!--<a :href="devapi + site.path">{{site.name}} </a>-->
+          <!--</span>-->
+        <!--</el-row>-->
+        <!--<el-row>-->
+            <!--<span class="hg" v-for="site in fujianName">-->
+            <!--<img :src="devapi + site" alt="">-->
+              <!--<a :href="devapi + site"></a>-->
+          <!--</span>-->
+        <!--</el-row>-->
         <el-row>
-            <span class="hg" v-for="site in fujianpath">
-            <img  :src="devapi + site" alt="">
-          </span>
-        </el-row>
-        <el-row>
-          {{form}}
-          {{form.mailContent}}
+          <!--{{form}}-->
+          <span v-html="form.mailContent"></span>
         </el-row>
 
 
@@ -98,10 +105,11 @@
         // 表单参数
         form: {},
         // 表单校验
-        rules: {
-        },
-        // fujianpath:'',
-        // devapi:'',
+        rules: {},
+        fujianpath:'',
+        fujianName:'',
+        fujian:[],
+        devapi:'',
       };
     },
     created() {
@@ -126,8 +134,18 @@
           // this.form = response.data[0];
           console.log(this.form);
           this.fujianpath = this.form.filePath;
+          this.fujianName = this.form.fileName;
           console.log(response.data);
           this.fujianpath =this.fujianpath.split(',')
+          this.fujianName =this.fujianName.split(',')
+
+          for(var i=0;i< this.fujianName.length;i++){
+            this.fujian.push({
+              "path": this.fujianpath[i],
+              "name":this.fujianName[i]
+            });
+          }
+            console.log(this.fujian);
           this.devapi = process.env.VUE_APP_BASE_API
           // this.open = true;
           // this.title = "修改【请填写功能名称】";
@@ -291,9 +309,11 @@
   }
   .text{
     span{
-      margin: 20px;
+      /*margin:0 20px;*/
     }
     padding: 0 20px;
   }
-
+  .fujian{
+  padding-right: 10px;
+   }
 </style>