sr 4 лет назад
Родитель
Сommit
ad8e81fc69
1 измененных файлов с 35 добавлено и 33 удалено
  1. 35 33
      ruoyi-ui/src/views/system/notice/index.vue

+ 35 - 33
ruoyi-ui/src/views/system/notice/index.vue

@@ -1,26 +1,26 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="公告标题" prop="noticeTitle">
+      <el-form-item label="标题" prop="noticeTitle">
         <el-input
           v-model="queryParams.noticeTitle"
-          placeholder="请输入公告标题"
+          placeholder="请输入标题"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="操作人员" prop="createBy">
+      <el-form-item label="作者" prop="createBy">
         <el-input
           v-model="queryParams.createBy"
-          placeholder="请输入操作人员"
+          placeholder="请输入作者"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item label="类型" prop="noticeType">
-        <el-select v-model="queryParams.noticeType" placeholder="公告类型" clearable size="small">
+        <el-select v-model="queryParams.noticeType" placeholder="类型" clearable size="small">
           <el-option
             v-for="dict in typeOptions"
             :key="dict.dictValue"
@@ -75,27 +75,26 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" prop="noticeId" width="100" />
       <el-table-column
-        label="公告标题"
+        label="标题"
         align="center"
         prop="noticeTitle"
         :show-overflow-tooltip="true"
       />
+      <el-table-column label="作者" align="center" prop="createBy" />
       <el-table-column
-        label="公告类型"
+        label="类型"
         align="center"
         prop="noticeType"
         :formatter="typeFormat"
-        width="100"
       />
-      <el-table-column
+     <!-- <el-table-column
         label="状态"
         align="center"
         prop="status"
         :formatter="statusFormat"
         width="100"
-      />
-      <el-table-column label="创建者" align="center" prop="createBy" width="100" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="100">
+      /> -->
+      <el-table-column label="创建时间" align="center" prop="createTime">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
         </template>
@@ -132,21 +131,24 @@
     <el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="公告标题" prop="noticeTitle">
+          <el-col :span="24">
+            <el-form-item label="标题" prop="noticeTitle">
               <el-input v-model="form.noticeTitle" placeholder="请输入公告标题" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="公告类型" prop="noticeType">
-              <el-select v-model="form.noticeType" placeholder="请选择">
-                <el-option
-                  v-for="dict in typeOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
-                ></el-option>
-              </el-select>
+          <el-col :span="24">
+            <el-form-item label="作者" prop="noticeTitle">
+              <el-input v-model="form.noticeTitle" placeholder="请输入作者" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="单位" prop="noticeTitle">
+              <el-input v-model="form.noticeTitle" placeholder="请输入单位" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="类型" prop="noticeType">
+              
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -230,13 +232,13 @@ export default {
     };
   },
   created() {
-    // this.getList();
-    // this.getDicts("sys_notice_status").then(response => {
-    //   this.statusOptions = response.data;
-    // });
-    // this.getDicts("sys_notice_type").then(response => {
-    //   this.typeOptions = response.data;
-    // });
+    this.getList();
+    this.getDicts("sys_notice_status").then(response => {
+      this.statusOptions = response.data;
+    });
+    this.getDicts("sys_notice_type").then(response => {
+      this.typeOptions = response.data;
+    });
   },
   methods: {
     /** 查询公告列表 */
@@ -292,7 +294,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加公告";
+      this.title = "添加动态";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -301,7 +303,7 @@ export default {
       getNotice(noticeId).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改公告";
+        this.title = "修改动态";
       });
     },
     /** 提交按钮 */