Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/api/system/guide.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询使用指南列表
+export function listGuide(query) {
+  return request({
+    url: '/system/use/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询使用指南详细
+export function getGuide(id) {
+  return request({
+    url: '/system/use/' + id,
+    method: 'get'
+  })
+}
+
+// 新增使用指南
+export function addGuide(data) {
+  return request({
+    url: '/system/use',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改使用指南
+export function updateGuide(data) {
+  return request({
+    url: '/system/use',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除使用指南
+export function delGuide(id) {
+  return request({
+    url: '/system/use/' + id,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/api/system/welfareGuide.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询小程序党建福利信息列表
+export function listGuide(query) {
+  return request({
+    url: '/system/welfare/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询小程序党建福利信息详细
+export function getGuide(id) {
+  return request({
+    url: '/system/welfare/' + id,
+    method: 'get'
+  })
+}
+
+// 新增小程序党建福利信息
+export function addGuide(data) {
+  return request({
+    url: '/system/welfare',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改小程序党建福利信息
+export function updateGuide(data) {
+  return request({
+    url: '/system/welfare',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除小程序党建福利信息
+export function delGuide(id) {
+  return request({
+    url: '/system/welfare/' + id,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/components/FileUpload/index.vue

@@ -55,7 +55,7 @@ export default {
     // 大小限制(MB)
     fileSize: {
       type: Number,
-      default: 5,
+      default: 100,
     },
     // 文件类型, 例如['png', 'jpg', 'jpeg']
     fileType: {

ruoyi-ui/src/views/system/guides/index.vue

@@ -0,0 +1,290 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="110px">
+      <el-form-item label="使用指南版本" prop="useVersion">
+        <el-input
+          v-model="queryParams.useVersion"
+          placeholder="请输入使用指南版本"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="使用指南内容" prop="useContent">
+        <el-input
+          v-model="queryParams.useContent"
+          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="['system:guide: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="['system:guide: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="['system:guide: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="['system:guide:export']"
+        >导出</el-button>
+      </el-col> -->
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="guideList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="标题" align="center" prop="useTitle" />
+      <el-table-column label="使用指南内容" align="center" prop="useContent" width="220" :show-overflow-tooltip="true" >
+      <template slot-scope="scope">
+        <!-- <el-tooltip class="item" effect="dark" :content="scope.row.businessPolicy" placement="top"> -->
+              <span v-html="scope.row.useContent"></span>
+        <!-- </el-tooltip> -->
+      </template>
+      </el-table-column>
+      <el-table-column label="使用指南版本" align="center" prop="useVersion" />
+
+      <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="['system:guide:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:guide: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="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+        <el-form-item label="标题" prop="useTitle">
+          <el-input v-model="form.useTitle" placeholder="请输入标题" />
+        </el-form-item>
+        <el-form-item label="使用指南简介" prop="useProfile">
+           <el-input  v-model="form.useProfile" placeholder="请输入使用指南版本" />
+        </el-form-item>
+        <el-form-item label="使用指南内容" prop="useContent">
+          <editor v-model="form.useContent" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="使用指南版本" prop="useVersion">
+          <el-input  v-model="form.useVersion" placeholder="请输入使用指南版本" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" 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 { listGuide, getGuide, delGuide, addGuide, updateGuide } from "@/api/system/guide";
+
+export default {
+  name: "Guide",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 使用指南表格数据
+      guideList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        useVersion: null,
+        status: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        useTitle: [
+          { required: true, message: "标题不能为空", trigger: "blur" }
+        ],
+        useContent: [
+          { required: true, message: "内容不能为空", trigger: "blur" }
+        ],
+
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询使用指南列表 */
+    getList() {
+      this.loading = true;
+      listGuide(this.queryParams).then(response => {
+        this.guideList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        useTitle: null,
+        useProfile: null,
+        useContent: null,
+        useVersion: null,
+        status: "0",
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        remark: 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.policyId)
+      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
+      getGuide(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) {
+            updateGuide(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addGuide(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 delGuide(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/guide/export', {
+        ...this.queryParams
+      }, `guide_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

ruoyi-ui/src/views/system/welfareGuide/index.vue

@@ -0,0 +1,267 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="标题" prop="welfareTitle">
+        <el-input
+          v-model="queryParams.welfareTitle"
+          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="['system:guide: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="['system:guide: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="['system:guide: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="['system:guide:export']"
+        >导出</el-button>
+      </el-col> -->
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="guideList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="标题" align="center" prop="welfareTitle" />
+      <el-table-column label="福利简介" align="center" prop="welfareProfile" />
+      <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="['system:guide:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:guide: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="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="标题" prop="welfareTitle">
+          <el-input v-model="form.welfareTitle" placeholder="请输入标题" />
+        </el-form-item>
+
+        <el-form-item label="福利简介" prop="welfareProfile">
+          <el-input v-model="form.welfareProfile" placeholder="请输入福利简介" />
+        </el-form-item>
+        <el-form-item label="福利内容">
+          <editor v-model="form.welfareContent" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="上传图片" prop="photoPath">
+          <image-upload v-model="form.photoPath"/>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" 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 { listGuide, getGuide, delGuide, addGuide, updateGuide } from "@/api/system/guide";
+
+export default {
+  name: "Guide",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 小程序党建福利信息表格数据
+      guideList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        welfareTitle: null,
+        status: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询小程序党建福利信息列表 */
+    getList() {
+      this.loading = true;
+      listGuide(this.queryParams).then(response => {
+        this.guideList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        welfareTitle: null,
+        welfareProfile: null,
+        welfareContent: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        remark: null,
+        photoPath: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
+      getGuide(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) {
+            updateGuide(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addGuide(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 delGuide(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/guide/export', {
+        ...this.queryParams
+      }, `guide_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>