为新闻管理-添加置顶与取消置顶功能

src/api/portal/news/NEWS.js

@@ -60,3 +60,13 @@ export function upload(data) {
     data:data
   })
 }
+
+
+// 置顶
+export function setTop(data) {
+  return request({
+    url: '/news/top',
+    method: 'post',
+    data:data
+  })
+}

src/api/portal/task/task.js

@@ -0,0 +1,28 @@
+import request from '@/utils/request'
+
+// 查询审批任务实例列表
+export function listINSTACTIONTASK(query) {
+  return request({
+    url: '/actionTask/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询审批任务实例所有列表
+export function listAllINSTACTIONTASK(query) {
+  return request({
+    url: '/actionTask/listAll',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询审批任务实例详细
+export function getINSTACTIONTASK(id) {
+  return request({
+    url: '/actionTask/getInfo/' + id,
+    method: 'get'
+  })
+}
+

src/views/news/index.vue

@@ -9,7 +9,10 @@
       label-width="68px"
     >
       <el-form-item label="标题" prop="title">
-        <el-input v-model="queryParams.title" placeholder="请输入标题"></el-input>
+        <el-input
+          v-model="queryParams.title"
+          placeholder="请输入标题"
+        ></el-input>
       </el-form-item>
       <el-form-item label="新闻状态" prop="status">
         <el-select
@@ -213,6 +216,22 @@
             v-hasPermi="['business:NEWS:remove']"
             >发布</el-button
           >
+          <el-button
+            v-if="scope.row.status == 6"
+            size="mini"
+            type="text"
+            @click="hanleTop(scope.row)"
+            v-hasPermi="['business:NEWS:remove']"
+            >取消置顶</el-button
+          >
+          <el-button
+            v-else
+            size="mini"
+            type="text"
+            @click="hanleTop(scope.row)"
+            v-hasPermi="['business:NEWS:remove']"
+            >置顶</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -308,6 +327,7 @@ import {
   addNEWS,
   updateNEWS,
   upload,
+  setTop,
 } from "@/api/portal/news/NEWS.js";
 
 export default {
@@ -399,6 +419,19 @@ export default {
     this.getList();
   },
   methods: {
+    hanleTop(row) {
+      var data = new FormData()
+      //判断是否置顶
+      if (row.status == "6") {
+        data.append('status',4)
+      } else {
+        data.append('status',6)
+      }
+      data.append('id',row.id)
+      setTop(data).then((res) => {
+        this.getList();
+      });
+    },
     /** 查询网站新闻列表 */
     getList() {
       this.loading = true;
@@ -419,7 +452,7 @@ export default {
     },
     handleRemove(file) {
       this.form.picture = "";
-      this.fileList = []
+      this.fileList = [];
     },
     handlePictureCardPreview(file) {
       this.form.picture = file.url;
@@ -430,24 +463,24 @@ export default {
     },
     handleDownOrUp(row) {
       //修改发布、下架状态
-      if (row.status == 4) {
+      if (row.status == '4') {
         //已发布
-        row.status = 5;
+        row.status = '5'
         updateNEWS(row).then((response) => {
           this.$modal.msgSuccess("修改成功");
           this.open = false;
           this.getList();
           this.reset();
-        });
-      } else if (row.status == 5) {
+        })
+      } else if (row.status == '5') {
         //已下架
-        row.status = 4;
+        row.status = '4'
         updateNEWS(row).then((response) => {
           this.$modal.msgSuccess("修改成功");
           this.open = false;
           this.getList();
           this.reset();
-        });
+        })
       }
     },
     // 取消按钮

src/views/task/index.vue

@@ -0,0 +1,425 @@
+<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="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择审核状态"
+          clearable
+          filterable
+        >
+          <el-option
+            v-for="dict in statusList"
+            :key="dict.value + 'statusList'"
+            :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="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['business:INSTACTIONTASK:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row> -->
+
+    <!-- <el-table
+      v-loading="loading"
+      :data="INSTACTIONTASKList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="${comment}" align="center" prop="id">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.${column.dictType}"
+            :value="scope.row.id"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.${column.dictType}"
+            :value="scope.row.createTime"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="创建人" align="center" prop="createBy">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.${column.dictType}"
+            :value="scope.row.createBy"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="修改时间" align="center" prop="updateTime">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.${column.dictType}"
+            :value="scope.row.updateTime"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="修改人" align="center" prop="updateBy">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.${column.dictType}"
+            :value="scope.row.updateBy"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="删除标识" align="center" prop="delFlag">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.${column.dictType}"
+            :value="scope.row.delFlag"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="活动实例任务ID" align="center" prop="instAcId">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.${column.dictType}"
+            :value="scope.row.instAcId"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="活动实例id" align="center" prop="instProId">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.${column.dictType}"
+            :value="scope.row.instProId"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="活动名称" align="center" prop="acname">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.${column.dictType}"
+            :value="scope.row.acname"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="审核人" align="center" prop="execId">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.${column.dictType}"
+            :value="scope.row.execId"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="任务启动时间" align="center" prop="beginTime">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.${column.dictType}"
+            :value="scope.row.beginTime"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="任务结束时间" align="center" prop="endTime">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.${column.dictType}"
+            :value="scope.row.endTime"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="审核状态(1=同意,2=驳回）"
+        align="center"
+        prop="status"
+      >
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.${column.dictType}"
+            :value="scope.row.status"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="审核意见" align="center" prop="comments">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.${column.dictType}"
+            :value="scope.row.comments"
+          />
+        </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="['business:INSTACTIONTASK:edit']"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['business:INSTACTIONTASK: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"
+    />
+
+  </div>
+</template>
+
+<script>
+import {
+  listINSTACTIONTASK,
+  getINSTACTIONTASK,
+  delINSTACTIONTASK,
+  addINSTACTIONTASK,
+  updateINSTACTIONTASK,
+} from "@/api/portal/task/task";
+
+export default {
+  name: "INSTACTIONTASK",
+  data() {
+    return {
+      // 根路径
+      baseURL: process.env.VUE_APP_BASE_API,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 审批任务实例表格数据
+      INSTACTIONTASKList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        id: null,
+        createTime: null,
+        createBy: null,
+        updateTime: null,
+        updateBy: null,
+        delFlag: null,
+        instAcId: null,
+        instProId: null,
+        acname: null,
+        execId: null,
+        beginTime: null,
+        endTime: null,
+        status: null,
+        comments: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        id: [{ required: true, message: "$comment不能为空", trigger: "blur" }],
+        delFlag: [
+          { required: true, message: "删除标识不能为空", trigger: "blur" },
+        ],
+        instAcId: [
+          {
+            required: true,
+            message: "活动实例任务ID不能为空",
+            trigger: "blur",
+          },
+        ],
+        instProId: [
+          { required: true, message: "活动实例id不能为空", trigger: "blur" },
+        ],
+        acname: [
+          { required: true, message: "活动名称不能为空", trigger: "blur" },
+        ],
+        execId: [
+          { required: true, message: "审核人不能为空", trigger: "blur" },
+        ],
+        beginTime: [
+          { required: true, message: "任务启动时间不能为空", trigger: "blur" },
+        ],
+        endTime: [
+          { required: true, message: "任务结束时间不能为空", trigger: "blur" },
+        ],
+        status: [
+          {
+            required: true,
+            message: "审核状态(1=同意,2=驳回）不能为空",
+            trigger: "blur",
+          },
+        ],
+        comments: [
+          { required: true, message: "审核意见不能为空", trigger: "blur" },
+        ],
+      },
+      statusList: [
+        { value: "1", label: "同意" },
+        { value: "2", label: "驳回" },
+        { value: "3", label: "退回" },
+      ],
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询审批任务实例列表 */
+    getList() {
+      this.loading = true;
+      listINSTACTIONTASK(this.queryParams).then((response) => {
+        this.INSTACTIONTASKList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        delFlag: null,
+        instAcId: null,
+        instProId: null,
+        acname: null,
+        execId: null,
+        beginTime: null,
+        endTime: null,
+        status: "0",
+        comments: 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;
+      getINSTACTIONTASK(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) {
+            updateINSTACTIONTASK(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addINSTACTIONTASK(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 delINSTACTIONTASK(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "business/INSTACTIONTASK/export",
+        {
+          ...this.queryParams,
+        },
+        `INSTACTIONTASK_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
+};
+</script>

src/views/wf/index.vue

@@ -213,20 +213,15 @@
       <el-table :data="pronameform" style="width: 100%">
         <el-table-column prop="acname" label="节点名称"></el-table-column>
         <el-table-column
-          prop="approvaltype"
-          label="活动审批类型"
-        ></el-table-column>
-        <el-table-column
           prop="dealhours"
           label="办理期限 小时"
         ></el-table-column>
+        <el-table-column prop="pronotes" label="流程说明"></el-table-column>
         <el-table-column prop="exelIds" label="审核人">
           <template slot-scope="scope">
             {{ searchUserName(scope.row.exelIds) }}
           </template>
         </el-table-column>
-        <el-table-column prop="parentnr" label="父级活动"></el-table-column>
-        <el-table-column prop="proId" label="流程模板ID"></el-table-column>
         <el-table-column prop="reemail" label="邮件提醒">
           <template slot-scope="scope">
             <span v-if="scope.row.reemail == 1">提醒</span>
@@ -289,13 +284,6 @@
             type="text"
           />
         </el-form-item>
-        <el-form-item label="活动审批类型" prop="approvaltype">
-          <el-input
-            v-model="Proform.approvaltype"
-            placeholder="请输入活动审批类型"
-            type="text"
-          />
-        </el-form-item>
         <el-form-item label="办理期限 小时" prop="dealhours">
           <el-input
             v-model="Proform.keyword"
@@ -303,9 +291,6 @@
             type="text"
           />
         </el-form-item>
-        <el-form-item label="排序" prop="seqno">
-          <el-input v-model="Proform.seqno" placeholder="排序" type="number" />
-        </el-form-item>
         <el-form-item label="流程说明" prop="pronotes">
           <el-input
             v-model="Proform.pronotes"
@@ -460,7 +445,7 @@ export default {
   methods: {
     searchUserName(id) {
       let fined = this.user.find((item) => item.value == id);
-      return fined.label
+      return fined.label;
     },
     handleProAdd() {
       //节点的新增