Merge remote-tracking branch 'origin/master'

src/api/handleAffairs/gridType.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询网格类型配置列表
+export function listGridType(query) {
+  return request({
+    url: '/jnb/gridType/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询网格类型配置详细
+export function getGridType(id) {
+  return request({
+    url: '/jnb/gridType/' + id,
+    method: 'get'
+  })
+}
+
+// 新增网格类型配置
+export function addGridType(data) {
+  return request({
+    url: '/jnb/gridType',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改网格类型配置
+export function updateGridType(data) {
+  return request({
+    url: '/jnb/gridType',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除网格类型配置
+export function delGridType(id) {
+  return request({
+    url: '/jnb/gridType/' + id,
+    method: 'delete'
+  })
+}

src/api/handleAffairs/topicType.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询主题类型配置列表
+export function listTopicType(query) {
+  return request({
+    url: '/jnb/topicType/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询主题类型配置详细
+export function getTopicType(id) {
+  return request({
+    url: '/jnb/topicType/' + id,
+    method: 'get'
+  })
+}
+
+// 新增主题类型配置
+export function addTopicType(data) {
+  return request({
+    url: '/jnb/topicType',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改主题类型配置
+export function updateTopicType(data) {
+  return request({
+    url: '/jnb/topicType',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除主题类型配置
+export function delTopicType(id) {
+  return request({
+    url: '/jnb/topicType/' + id,
+    method: 'delete'
+  })
+}

src/views/handleAffairs/gridType/index.vue

@@ -0,0 +1,307 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
+      <el-form-item label="名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入名称"
+          clearable
+          @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="['jnb:gridType: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="['jnb:gridType: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="['jnb:gridType: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="['jnb:gridType:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="gridTypeList" @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="名称" align="center" prop="name" />
+      <el-table-column label="岗位描述" align="center" prop="jobDescription" />
+      <el-table-column label="图片路径" align="center" prop="fileUrl" width="100">
+        <template slot-scope="scope">
+          <image-preview :src="scope.row.fileUrl" :width="50" :height="50"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="是否首页展示" align="center" prop="yesOrNoShow">
+        <template slot-scope="scope">
+          <el-switch
+            v-model="scope.row.yesOrNoShow"
+            active-value="0"
+            inactive-value="1"
+            @change="update(scope.row)">
+          </el-switch>
+        </template>
+      </el-table-column>
+      <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="['jnb:gridType:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['jnb:gridType: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="100px">
+        <el-form-item label="名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入名称" maxlength="20"/>
+        </el-form-item>
+        <el-form-item label="岗位描述" prop="jobDescription">
+          <el-input v-model="form.jobDescription" placeholder="请输入岗位描述" maxlength="255"/>
+        </el-form-item>
+        <el-form-item label="图片路径" prop="fileUrl">
+          <image-upload v-model="form.fileUrl" :fileSize="10" :limit="1"/>
+        </el-form-item>
+        <el-form-item label="是否首页展示">
+          <el-radio-group v-model="form.yesOrNoShow" style="width: 100%">
+            <el-radio
+              v-for="dict in dict.type.sys_normal_disable"
+              :key="dict.value"
+              :label="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </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 { listGridType, getGridType, delGridType, addGridType, updateGridType } from "@/api/handleAffairs/gridType";
+
+
+export default {
+  name: "GridType",
+  dicts: ['sys_normal_disable'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 网格类型配置表格数据
+      gridTypeList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+        yesOrNoShow: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        name: [
+          { required: true, message: "名称不能为空", trigger: "blur" }
+        ],
+        jobDescription: [
+          { required: true, message: "岗位描述不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    //当是否展示发生变化时调用
+    update(value){
+      let text = value.yesOrNoShow === "0" ? "展示" : "关闭";
+      this.$modal.confirm('是否确认在首页: '+text+',部门为 "'+value.name+'" 的数据').then(function() {
+        return updateGridType(value);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("修改成功");
+      }).catch(() => {
+        value.yesOrNoShow = value.yesOrNoShow === "0" ? "1" : "0";
+      });
+    },
+    /** 查询网格类型配置列表 */
+    getList() {
+      this.loading = true;
+      listGridType(this.queryParams).then(response => {
+        this.gridTypeList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        remark: null,
+        delFlag: null,
+        version: null,
+        id: null,
+        name: null,
+        jobDescription: null,
+        fileUrl: null,
+        yesOrNoShow: '1'
+      };
+      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
+      getGridType(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) {
+            updateGridType(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addGridType(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除网格类型配置编号为"' + ids + '"的数据项？').then(function() {
+        return delGridType(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('jnb/gridType/export', {
+        ...this.queryParams
+      }, `gridType_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/handleAffairs/topicType/index.vue

@@ -0,0 +1,332 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
+      <el-form-item label="部门名称" prop="deptName">
+        <el-input
+          v-model="queryParams.deptName"
+          placeholder="请输入部门名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item label="办理对象" prop="objectOfHandling">
+        <el-select v-model="queryParams.objectOfHandling" placeholder="请选择办理对象" clearable>
+          <el-option
+            v-for="dict in dict.type.object_application"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </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="['jnb:topicType: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="['jnb:topicType: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="['jnb:topicType: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="['jnb:topicType:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="topicTypeList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="部门名称" align="center" prop="deptName" />
+      <el-table-column label="办理对象" align="center" prop="objectOfHandling">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.object_application" :value="scope.row.objectOfHandling"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="是否首页展示" align="center" prop="yesOrNoShow">
+        <template slot-scope="scope">
+          <el-switch
+            v-model="scope.row.yesOrNoShow"
+            active-value="0"
+            inactive-value="1"
+            @change="update(scope.row)">
+          </el-switch>
+        </template>
+      </el-table-column>
+      <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="['jnb:topicType:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['jnb:topicType: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="450px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-row :gutter="24">
+          <el-col :span="24">
+            <el-form-item label="部门名称" prop="deptName">
+              <el-input v-model="form.deptName" placeholder="请输入部门名称" maxlength="20" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="24">
+            <el-form-item label="办理对象" prop="objectOfHandling">
+              <el-select v-model="form.objectOfHandling" placeholder="请选择办理对象" style="width: 100%">
+                <el-option
+                  v-for="dict in dict.type.object_application"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="24">
+            <el-form-item label="是否首页展示">
+              <el-radio-group v-model="form.yesOrNoShow" style="width: 100%">
+                <el-radio
+                  v-for="dict in dict.type.sys_normal_disable"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </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 { listTopicType, getTopicType, delTopicType, addTopicType, updateTopicType } from "@/api/handleAffairs/topicType";
+
+export default {
+  name: "TopicType",
+  dicts: ['object_application','sys_normal_disable'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 主题类型配置表格数据
+      topicTypeList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        deptName: null,
+        yesOrNoShow: null,
+        objectOfHandling: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        deptName: [
+          { required: true, message: "部门名称不能为空", trigger: "blur" }
+        ],
+        objectOfHandling: [
+          { required: true, message: "办理对象不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    //当是否展示发生变化时调用
+    update(value){
+      let text = value.yesOrNoShow === "0" ? "展示" : "关闭";
+      this.$modal.confirm('是否确认在首页: '+text+',部门为 "'+value.deptName+'" 的数据').then(function() {
+        return updateTopicType(value);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("修改成功");
+      }).catch(() => {
+        value.yesOrNoShow = value.yesOrNoShow === "0" ? "1" : "0";
+      });
+    },
+    /** 查询主题类型配置列表 */
+    getList() {
+      this.loading = true;
+      listTopicType(this.queryParams).then(response => {
+        this.topicTypeList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        remark: null,
+        delFlag: null,
+        version: null,
+        deptName: null,
+        yesOrNoShow: '1',
+        objectOfHandling: 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
+      getTopicType(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) {
+            updateTopicType(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addTopicType(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除主题类型配置编号为"' + ids + '"的数据项？').then(function() {
+        return delTopicType(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('jnb/topicType/export', {
+        ...this.queryParams
+      }, `topicType_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>