Merge branch 'lzw' of yinet2020/YinetOASystemWeb into master

src/views/dashboard/PieChart.vue

@@ -7,7 +7,7 @@
     <el-table v-loading="loading" :data="infoList" size="small" :show-header="showHeader">
       <el-table-column label="标题"style="color:#1890ff"  prop="tatle" align="left"  :show-header="showHeader">
         <template slot-scope="scope">
-          <el-button type="text"  style="color: black">{{scope.row.title}}</el-button>
+          <el-button type="text" @click="handleUpdate(scope.row)"  style="color: black">{{scope.row.title}}</el-button>
         </template>
       </el-table-column>
       <el-table-column label="发布日期" align="right"prop="updateTime" :show-header="showHeader" >
@@ -16,15 +16,48 @@
         </template>
       </el-table-column>
     </el-table>
+    <!-- 通知详情 -->
+    <el-dialog :title="tztitle" :visible.sync="tzshow" width="1000px" append-to-body>
+      <el-form :model="form" label-width="100px"  v-loading="xxloading">
+        <el-form-item label="通知标题" prop="Title">
+          <el-input v-model="form.title" placeholder="请输入通知标题" clearable :style="{width: '100%'}">
+          </el-input>
+        </el-form-item>
+<!--          <div v-html="form.content" style="border: 1px solid #e5e5e5;border-radius: 4px;"></div>-->
+          <el-form-item label="通知内容" prop="Content" style="height: 240px;">
+            <Editor v-model="form.content" />
+            <!--            <el-input v-model="formData.Content" type="textarea" placeholder="请输入通知内容"-->
+            <!--              :autosize="{minRows: 4, maxRows: 4}" :style="{width: '100%'}"></el-input>-->
+          </el-form-item>
+        <el-form-item label="附件列表：">
+          <div v-html="form.fj" style="border: 1px solid #e5e5e5;border-radius: 4px;">{{form.fj}}</div>
+        </el-form-item>
+        <el-form-item label="发送时间：">{{form.sendtime}}
+        </el-form-item>
+        <el-form-item label="联系人" prop="contactPerson">
+          <el-input v-model="form.contactperson" clearable :style="{width: '100%'}">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="联系电话" prop="contactTel">
+          <el-input v-model="form.contacttel"  clearable :style="{width: '100%'}">
+          </el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="cancel">关 闭</el-button>
+      </div>
+    </el-dialog>
   </el-card>
 </template>
 <script>
-  import { listInfo, } from "@/api/system/notify_info/mylist";
+  import { listInfo, xxInfo} from "@/api/system/notify_info/mylist";
   import log from '../monitor/job/log'
   export default {
     name: "Info",
     data() {
       return {
+        tzshow:false,
+        xxloading:true,
         showHeader:true,
 // 遮罩层
         loading: true,
@@ -66,6 +99,27 @@
       this.getList();
     },
     methods: {
+      // 取消按钮
+      cancel() {
+        this.tzshow = false;
+        this.reset();
+      },
+      // 表单重置
+      reset() {
+        this.form = {
+          id: undefined,
+          guid: undefined,
+          title: undefined,
+          content: undefined,
+          sendtime: undefined,
+          filename: undefined,
+          filepath: undefined,
+          contactperson: undefined,
+          contacttel: undefined,
+          recvperson: undefined
+        };
+        this.resetForm("form");
+      },
       /** 查询【请填写功能名称】列表 */
       getList() {
         this.loading = true;
@@ -81,7 +135,27 @@
           }
         });
       },
-
+      /** 详情按钮操作 */
+      handleUpdate(row) {
+        /** 详细按钮操作 */
+        this.reset();
+        this.tzshow=true;
+        this.xxloading=true;
+        xxInfo(row.id).then(response => {
+          this.form.title = response.data.title;
+          this.form.content = response.data.content;
+          this.form.sendtime = response.data.sendtime;
+          this.form.contactperson = response.data.contactperson;
+          this.form.contacttel = response.data.contacttel;
+          this.form.fj = "";
+          let fjname=response.data.filename.split(",");
+          let fjpath=response.data.filepath.split(",");
+          for (let i = 0; i <fjname.length ; i++) {
+            this.form.fj+="<a href='"+process.env.VUE_APP_BASE_API+fjpath[i]+"' target='_blank'>"+fjname[i]+'</a><br/>';
+          }
+        });
+        this.xxloading=false;
+      },
       //指定跳转地址
       more(){
         this.$router.replace('/mylist')