Эх сурвалжийг харах

Merge branch 'master' of http://192.168.101.243:3000/gogs/zhaoshangyinzi

yrik 4 жил өмнө
parent
commit
a1dc7a48f1

+ 53 - 0
ruoyi-ui/src/api/projectInfo/info.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询项目-线索信息列表
+export function listInfo(query) {
+  return request({
+    url: '/projectInfo/info/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询项目-线索信息详细
+export function getInfo(id) {
+  return request({
+    url: '/projectInfo/info/' + id,
+    method: 'get'
+  })
+}
+
+// 新增项目-线索信息
+export function addInfo(data) {
+  return request({
+    url: '/projectInfo/info',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改项目-线索信息
+export function updateInfo(data) {
+  return request({
+    url: '/projectInfo/info',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除项目-线索信息
+export function delInfo(id) {
+  return request({
+    url: '/projectInfo/info/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出项目-线索信息
+export function exportInfo(query) {
+  return request({
+    url: '/projectInfo/info/export',
+    method: 'get',
+    params: query
+  })
+}

+ 575 - 0
ruoyi-ui/src/views/management/info/index.vue

@@ -0,0 +1,575 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="项目id*" prop="bmProjectId">
+        <el-input
+          v-model="queryParams.bmProjectId"
+          placeholder="请输入项目id*"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="项目名称*" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入项目名称*"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="是否删除(0未删除、1已删除)" prop="isDel">
+        <el-input
+          v-model="queryParams.isDel"
+          placeholder="请输入是否删除(0未删除、1已删除)"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="投资方联系人*" prop="contactor">
+        <el-input
+          v-model="queryParams.contactor"
+          placeholder="请输入投资方联系人*"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="投资方联系方式*" prop="phone">
+        <el-input
+          v-model="queryParams.phone"
+          placeholder="请输入投资方联系方式*"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="预计投资额*" prop="needAmt">
+        <el-input
+          v-model="queryParams.needAmt"
+          placeholder="请输入预计投资额*"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="固定资产投资*" prop="fixedAssets">
+        <el-input
+          v-model="queryParams.fixedAssets"
+          placeholder="请输入固定资产投资*"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="产品名称*" prop="productName">
+        <el-input
+          v-model="queryParams.productName"
+          placeholder="请输入产品名称*"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="设计产能*" prop="productQty">
+        <el-input
+          v-model="queryParams.productQty"
+          placeholder="请输入设计产能*"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="预计产值*" prop="productPrice">
+        <el-input
+          v-model="queryParams.productPrice"
+          placeholder="请输入预计产值*"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="预计税收*" prop="productTax">
+        <el-input
+          v-model="queryParams.productTax"
+          placeholder="请输入预计税收*"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="预计用工*" prop="productEmp">
+        <el-input
+          v-model="queryParams.productEmp"
+          placeholder="请输入预计用工*"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="项目计划用地" prop="plannedLand">
+        <el-input
+          v-model="queryParams.plannedLand"
+          placeholder="请输入项目计划用地"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="独立供地" prop="independentLand">
+        <el-input
+          v-model="queryParams.independentLand"
+          placeholder="请输入独立供地"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="流转土地" prop="circulationLan">
+        <el-input
+          v-model="queryParams.circulationLan"
+          placeholder="请输入流转土地"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="计划租赁用房" prop="needRoom">
+        <el-input
+          v-model="queryParams.needRoom"
+          placeholder="请输入计划租赁用房"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="计划租赁厂房" prop="needFactoryRoom">
+        <el-input
+          v-model="queryParams.needFactoryRoom"
+          placeholder="请输入计划租赁厂房"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="计划租赁办公生活用房" prop="needBusRoom">
+        <el-input
+          v-model="queryParams.needBusRoom"
+          placeholder="请输入计划租赁办公生活用房"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="其他需求" prop="other">
+        <el-input
+          v-model="queryParams.other"
+          placeholder="请输入其他需求"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="拟落户地点*" prop="address">
+        <el-input
+          v-model="queryParams.address"
+          placeholder="请输入拟落户地点*"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="是否签订框架协议* Y/N" prop="isFrameorder">
+        <el-input
+          v-model="queryParams.isFrameorder"
+          placeholder="请输入是否签订框架协议* Y/N"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['projectInfo:info:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['projectInfo:info:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['projectInfo:info:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['projectInfo:info:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="id*" align="center" prop="id" />
+      <el-table-column label="项目id*" align="center" prop="bmProjectId" />
+      <el-table-column label="项目名称*" align="center" prop="name" />
+      <el-table-column label="是否删除(0未删除、1已删除)" align="center" prop="isDel" />
+      <el-table-column label="投资方联系人*" align="center" prop="contactor" />
+      <el-table-column label="投资方联系方式*" align="center" prop="phone" />
+      <el-table-column label="预计投资额*" align="center" prop="needAmt" />
+      <el-table-column label="固定资产投资*" align="center" prop="fixedAssets" />
+      <el-table-column label="产品名称*" align="center" prop="productName" />
+      <el-table-column label="设计产能*" align="center" prop="productQty" />
+      <el-table-column label="预计产值*" align="center" prop="productPrice" />
+      <el-table-column label="预计税收*" align="center" prop="productTax" />
+      <el-table-column label="预计用工*" align="center" prop="productEmp" />
+      <el-table-column label="项目计划用地" align="center" prop="plannedLand" />
+      <el-table-column label="独立供地" align="center" prop="independentLand" />
+      <el-table-column label="流转土地" align="center" prop="circulationLan" />
+      <el-table-column label="计划租赁用房" align="center" prop="needRoom" />
+      <el-table-column label="计划租赁厂房" align="center" prop="needFactoryRoom" />
+      <el-table-column label="计划租赁办公生活用房" align="center" prop="needBusRoom" />
+      <el-table-column label="其他需求" align="center" prop="other" />
+      <el-table-column label="拟落户地点*" align="center" prop="address" />
+      <el-table-column label="是否签订框架协议* Y/N" align="center" prop="isFrameorder" />
+      <el-table-column label="框架协议附件url(框架协议为是,需要上传)" align="center" prop="attachment" />
+      <el-table-column label="备注" align="center" prop="description" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['projectInfo:info:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['projectInfo:info:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改项目-线索信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="项目id*" prop="bmProjectId">
+          <el-input v-model="form.bmProjectId" placeholder="请输入项目id*" />
+        </el-form-item>
+        <el-form-item label="项目名称*" prop="name">
+          <el-input v-model="form.name" placeholder="请输入项目名称*" />
+        </el-form-item>
+        <el-form-item label="是否删除(0未删除、1已删除)" prop="isDel">
+          <el-input v-model="form.isDel" placeholder="请输入是否删除(0未删除、1已删除)" />
+        </el-form-item>
+        <el-form-item label="投资方联系人*" prop="contactor">
+          <el-input v-model="form.contactor" placeholder="请输入投资方联系人*" />
+        </el-form-item>
+        <el-form-item label="投资方联系方式*" prop="phone">
+          <el-input v-model="form.phone" placeholder="请输入投资方联系方式*" />
+        </el-form-item>
+        <el-form-item label="预计投资额*" prop="needAmt">
+          <el-input v-model="form.needAmt" placeholder="请输入预计投资额*" />
+        </el-form-item>
+        <el-form-item label="固定资产投资*" prop="fixedAssets">
+          <el-input v-model="form.fixedAssets" placeholder="请输入固定资产投资*" />
+        </el-form-item>
+        <el-form-item label="产品名称*" prop="productName">
+          <el-input v-model="form.productName" placeholder="请输入产品名称*" />
+        </el-form-item>
+        <el-form-item label="设计产能*" prop="productQty">
+          <el-input v-model="form.productQty" placeholder="请输入设计产能*" />
+        </el-form-item>
+        <el-form-item label="预计产值*" prop="productPrice">
+          <el-input v-model="form.productPrice" placeholder="请输入预计产值*" />
+        </el-form-item>
+        <el-form-item label="预计税收*" prop="productTax">
+          <el-input v-model="form.productTax" placeholder="请输入预计税收*" />
+        </el-form-item>
+        <el-form-item label="预计用工*" prop="productEmp">
+          <el-input v-model="form.productEmp" placeholder="请输入预计用工*" />
+        </el-form-item>
+        <el-form-item label="项目计划用地" prop="plannedLand">
+          <el-input v-model="form.plannedLand" placeholder="请输入项目计划用地" />
+        </el-form-item>
+        <el-form-item label="独立供地" prop="independentLand">
+          <el-input v-model="form.independentLand" placeholder="请输入独立供地" />
+        </el-form-item>
+        <el-form-item label="流转土地" prop="circulationLan">
+          <el-input v-model="form.circulationLan" placeholder="请输入流转土地" />
+        </el-form-item>
+        <el-form-item label="计划租赁用房" prop="needRoom">
+          <el-input v-model="form.needRoom" placeholder="请输入计划租赁用房" />
+        </el-form-item>
+        <el-form-item label="计划租赁厂房" prop="needFactoryRoom">
+          <el-input v-model="form.needFactoryRoom" placeholder="请输入计划租赁厂房" />
+        </el-form-item>
+        <el-form-item label="计划租赁办公生活用房" prop="needBusRoom">
+          <el-input v-model="form.needBusRoom" placeholder="请输入计划租赁办公生活用房" />
+        </el-form-item>
+        <el-form-item label="其他需求" prop="other">
+          <el-input v-model="form.other" placeholder="请输入其他需求" />
+        </el-form-item>
+        <el-form-item label="拟落户地点*" prop="address">
+          <el-input v-model="form.address" placeholder="请输入拟落户地点*" />
+        </el-form-item>
+        <el-form-item label="是否签订框架协议* Y/N" prop="isFrameorder">
+          <el-input v-model="form.isFrameorder" placeholder="请输入是否签订框架协议* Y/N" />
+        </el-form-item>
+        <el-form-item label="框架协议附件url(框架协议为是,需要上传)" prop="attachment">
+          <el-input v-model="form.attachment" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="备注" prop="description">
+          <el-input v-model="form.description" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listInfo, getInfo, delInfo, addInfo, updateInfo, exportInfo } from "@/api/projectInfo/info";
+
+export default {
+  name: "Info",
+  components: {
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 项目-线索信息表格数据
+      infoList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        bmProjectId: null,
+        name: null,
+        isDel: null,
+        contactor: null,
+        phone: null,
+        needAmt: null,
+        fixedAssets: null,
+        productName: null,
+        productQty: null,
+        productPrice: null,
+        productTax: null,
+        productEmp: null,
+        plannedLand: null,
+        independentLand: null,
+        circulationLan: null,
+        needRoom: null,
+        needFactoryRoom: null,
+        needBusRoom: null,
+        other: null,
+        address: null,
+        isFrameorder: null,
+        attachment: null,
+        description: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询项目-线索信息列表 */
+    getList() {
+      this.loading = true;
+      listInfo(this.queryParams).then(response => {
+        this.infoList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        bmProjectId: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        name: null,
+        isDel: null,
+        contactor: null,
+        phone: null,
+        needAmt: null,
+        fixedAssets: null,
+        productName: null,
+        productQty: null,
+        productPrice: null,
+        productTax: null,
+        productEmp: null,
+        plannedLand: null,
+        independentLand: null,
+        circulationLan: null,
+        needRoom: null,
+        needFactoryRoom: null,
+        needBusRoom: null,
+        other: null,
+        address: null,
+        isFrameorder: null,
+        attachment: null,
+        description: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加项目-线索信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getInfo(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改项目-线索信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateInfo(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addInfo(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除项目-线索信息编号为"' + ids + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delInfo(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有项目-线索信息数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportInfo(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        })
+    }
+  }
+};
+</script>

+ 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 = "修改动态";
       });
     },
     /** 提交按钮 */