Merge branch 'master' of http://106.55.241.82:3000/lzf/zhbsq-vue-web into master

src/api/portal/COUNSELINGMESSAGE/COUNSELINGMESSAGE.js

@@ -0,0 +1,70 @@
+import request from '@/utils/request'
+
+// 查询咨询信息列表
+export function listCOUNSELINGMESSAGE(query) {
+  return request({
+    url: '/COUNSELINGMESSAGE/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询咨询信息所有列表
+export function listAllCOUNSELINGMESSAGE(query) {
+  return request({
+    url: '/COUNSELINGMESSAGE/listAll',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询咨询信息详细
+export function getCOUNSELINGMESSAGE(id) {
+  return request({
+    url: '/COUNSELINGMESSAGE/getInfo/' + id,
+    method: 'get'
+  })
+}
+
+// 新增咨询信息
+export function addCOUNSELINGMESSAGE(data) {
+  return request({
+    url: '/COUNSELINGMESSAGE/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改咨询信息
+export function updateCOUNSELINGMESSAGE(data) {
+  return request({
+    url: '/COUNSELINGMESSAGE/edit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除咨询信息
+export function delCOUNSELINGMESSAGE(id) {
+  return request({
+    url: '/COUNSELINGMESSAGE/remove/' + id,
+    method: 'get'
+  })
+}
+// 上传文件
+export function upload(data) {
+  return request({
+    url: '/common/upload/',
+    method: 'post',
+    data:data
+  })
+}
+
+// 提交审核   暂存提交  驳回提交   新增新闻都需要调用这个
+export function newCommit(CbNewsVo) {
+  return request({
+    url: '/COUNSELINGMESSAGE/audit/',
+    method: 'post',
+    data:CbNewsVo
+  })
+}

src/views/COUNSELINGMESSAGE/index.vue

@@ -0,0 +1,475 @@
+<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="title">
+        <el-input
+          v-model="queryParams.title"
+          placeholder="请输入标题"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="新闻状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择新闻状态"
+          clearable
+          filterable
+        >
+          <el-option
+            v-for="status in statusOptionList"
+            :key="status.value"
+            :label="status.label"
+            :value="status.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="['business:COUNSELINGMESSAGE: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="['business:COUNSELINGMESSAGE: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="['business:COUNSELINGMESSAGE: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="['business:COUNSELINGMESSAGE:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <!--列表-->
+    <el-table v-loading="loading" :data="COUNSELINGMESSAGEList" @selection-change="handleSelectionChange" height="calc(100vh - 300px)">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="标题信息" align="center" prop="title"/>
+      <el-table-column label="发布日期" align="center" prop="createTime"/>
+      <el-table-column label="上报日期" align="center" prop="deptId"/>
+      <el-table-column label="审核日期" align="center" prop="deptId"/>
+      <el-table-column label="提交审核日期" align="center" prop="deptId"/>
+      <el-table-column
+        label="信息状态"
+        align="center"
+        prop="status"
+      >
+        <template slot-scope="scope">
+          <span v-if="scope.row.status == 0"><el-tag>草稿</el-tag></span>
+          <span v-if="scope.row.status == 1"
+          ><el-tag type="warning">审核中</el-tag></span
+          >
+          <span v-if="scope.row.status == 2"
+          ><el-tag type="danger">审核驳回</el-tag></span
+          >
+          <span v-if="scope.row.status == 3"
+          ><el-tag type="success">已审核</el-tag></span
+          >
+          <span v-if="scope.row.status == 4"
+          ><el-tag type="success">已发布</el-tag></span
+          >
+          <span v-if="scope.row.status == 5"
+          ><el-tag type="info">已下架</el-tag></span
+          >
+          <span v-if="scope.row.status == 6"><el-tag>已置顶</el-tag></span>
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            v-if="scope.row.status == 4"
+            size="mini"
+            type="text"
+            v-hasPermi="['business:COUNSELINGMESSAGE:remove']"
+          >下架</el-button
+          >
+          <el-button
+            v-if="scope.row.status == 0 || scope.row.status == 2"
+            size="mini"
+            type="text"
+            v-hasPermi="['business:COUNSELINGMESSAGE:remove']"
+            @click="handleCommit(scope.row)"
+          >提交审核</el-button>
+
+          <el-button
+            v-if="scope.row.status == 0 || scope.row.status == 2 || scope.row.status == 5"
+            size="mini"
+            type="text"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['business:COUNSELINGMESSAGE:remove']"
+          >修改</el-button
+          >
+          <el-button
+            v-if="scope.row.status == 5 || scope.row.status == 3"
+            size="mini"
+            type="text"
+            @click="handleDownOrUp(scope.row)"
+            v-hasPermi="['business:COUNSELINGMESSAGE: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="title">
+          <el-input v-model="form.title" placeholder="请输入标题"></el-input>
+        </el-form-item>
+        <el-form-item label="内容" prop="content">
+          <editor v-model="form.content" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="附件上传" prop="fileUrl">
+          <el-upload
+            class="upload-demo"
+            drag
+            action="#"
+            :limit="1"
+            :before-upload="beforeupload"
+            :auto-upload="true"
+            :http-request="httprequest"
+          >
+            <i class="el-icon-upload"></i>
+            <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+            <div class="el-upload__tip" slot="tip">只能上传不超过200MB的文件</div>
+          </el-upload>
+        </el-form-item>
+      </el-form>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button type="info" @click="submitzc">暂 存</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listCOUNSELINGMESSAGE, getCOUNSELINGMESSAGE, delCOUNSELINGMESSAGE, addCOUNSELINGMESSAGE, updateCOUNSELINGMESSAGE, upload, newCommit } from "@/api/portal/COUNSELINGMESSAGE/COUNSELINGMESSAGE";
+
+export default {
+  name: "COUNSELINGMESSAGE",
+  data() {
+    return {
+      statusOptionList: [
+        { label: "草稿", value: 0 },
+        { label: "审核中", value: 1 },
+        { label: "审核驳回", value: 2 },
+        { label: "已审核", value: 3 },
+        { label: "已发布", value: 4 },
+        { label: "已下架", value: 5 },
+        { label: "已置顶", value: 6 },
+      ],
+      // 根路径
+      baseURL: process.env.VUE_APP_BASE_API,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 咨询信息表格数据
+      COUNSELINGMESSAGEList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        id: null,
+        createTime: null,
+        createBy: null,
+        updateTime: null,
+        updateBy: null,
+        delFlag: null,
+        deptId: null,
+        title: null,
+        content: null,
+        fileUrl: null,
+        picture: null,
+        status: null,
+        auditTime: null,
+        reportDate: null,
+        releaseDate: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        id: [
+          { required: true, message: "主键不能为空", trigger: "blur" }
+        ],
+        delFlag: [
+          { required: true, message: "删除标志不能为空", trigger: "blur" }
+        ],
+        deptId: [
+          { required: true, message: "部门id不能为空", trigger: "blur" }
+        ],
+        title: [
+          { required: true, message: "标题不能为空", trigger: "blur" }
+        ],
+        content: [
+          { required: true, message: "内容不能为空", trigger: "blur" }
+        ],
+        fileUrl: [
+          { required: true, message: "附件不能为空", trigger: "blur" }
+        ],
+        picture: [
+          { required: true, message: "图片不能为空", trigger: "blur" }
+        ],
+        status: [
+          { required: true, message: "状态不能为空", trigger: "blur" }
+        ],
+        auditTime: [
+          { required: true, message: "审核时间不能为空", trigger: "blur" }
+        ],
+        reportDate: [
+          { required: true, message: "提交时间不能为空", trigger: "blur" }
+        ],
+        releaseDate: [
+          { required: true, message: "发布时间不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+
+    /** 查询咨询信息列表 */
+    getList() {
+      this.loading = true;
+      listCOUNSELINGMESSAGE(this.queryParams).then(response => {
+        this.COUNSELINGMESSAGEList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        delFlag: null,
+        deptId: null,
+        title: null,
+        content: null,
+        fileUrl: null,
+        picture: null,
+        status: "0",
+        auditTime: null,
+        reportDate: null,
+        releaseDate: null
+      };
+      this.resetForm("form");
+    },
+    /** 发布 */
+    handleDownOrUp(row) {
+      //修改发布、下架状态
+      if (row.status == "4" || row.status == "3") {
+        //已发布 已审核
+        row.status = "5";
+        updateCOUNSELINGMESSAGE(row).then((response) => {
+          this.$modal.msgSuccess("修改成功");
+          this.open = false;
+          this.getList();
+          this.reset();
+        });
+      } else if (row.status == "5") {
+        //已下架
+        row.status = "4";
+        updateCOUNSELINGMESSAGE(row).then((response) => {
+          this.$modal.msgSuccess("下架成功");
+          this.open = false;
+          this.getList();
+          this.reset();
+        });
+      }
+    },
+    /** 提交审核 */
+    handleCommit(row) {
+      let CbNewsVo = row
+      newCommit(CbNewsVo).then((response) => {
+        this.$modal.msgSuccess("提交审核成功!");
+        this.getList();
+      });
+    },
+    /** 搜索按钮操作 */
+    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
+      getCOUNSELINGMESSAGE(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改咨询信息";
+      });
+    },
+    httprequest() {},
+    /** 上传附件 */
+    beforeupload(file) {
+      let formData = new FormData();
+      formData.append("file", file);
+      upload(formData).then((res) => {
+        this.form.fileUrl = res.url;
+      });
+    },
+    /** 暂存按钮 */
+    submitzc() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if(this.form.id == null){
+            this.form.status = "0";
+            addCOUNSELINGMESSAGE(this.form).then((response) => {
+              this.$modal.msgSuccess("暂存成功");
+              this.open = false;
+              this.getList();
+              this.reset();
+            });
+          }else if(this.form.status == 0 || this.form.status == 2 || this.form.status == 3 || this.form.status == 5){
+            updateCOUNSELINGMESSAGE(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+              this.reset();
+            });
+          }
+        }
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateCOUNSELINGMESSAGE(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addCOUNSELINGMESSAGE(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 delCOUNSELINGMESSAGE(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('business/COUNSELINGMESSAGE/export', {
+        ...this.queryParams
+      }, `COUNSELINGMESSAGE_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/COUNSELINGMESSAGE/task/index.vue

@@ -0,0 +1,145 @@
+<template>
+  <div>
+    <el-tabs v-model="activeName">
+
+      <el-tab-pane label="详细信息" name="详细信息">
+        <el-descriptions border>
+          <el-descriptions-item label="活动名称">{{
+              taskList.acname
+            }}</el-descriptions-item>
+          <el-descriptions-item label="任务启动时间">
+            {{
+              taskList.beginTime ? taskList.beginTime.substr(0, 10) : "无"
+            }}</el-descriptions-item
+          >
+          <el-descriptions-item label="业务备注">{{
+              taskList.fromKeyword
+            }}</el-descriptions-item>
+          <el-descriptions-item label="流程名称">{{
+              taskList.proname
+            }}</el-descriptions-item>
+          <el-descriptions-item label="审核状态">
+            <el-tag v-if="taskList.status == 1" type="success">同意</el-tag>
+            <el-tag v-else-if="taskList.status == 2" type="danger">驳回</el-tag>
+            <el-tag v-else-if="taskList.status == 3" type="info">退回</el-tag>
+            <el-tag v-else-if="taskList.status == 0">待审核</el-tag>
+          </el-descriptions-item>
+          <el-descriptions-item label="审核意见">{{
+              taskList.comments ? taskList.comments : "无"
+            }}</el-descriptions-item>
+        </el-descriptions>
+
+        <el-form
+          ref="form"
+          :model="taskList"
+          label-width="80px"
+          style="margin-top: 20px"
+        >
+          <el-form-item label="标题" prop="title">
+            <el-input
+              v-model="taskList.formobj.title"
+              placeholder="请输入标题"
+              disabled
+            ></el-input>
+          </el-form-item>
+
+          <el-form-item label="附件上传" prop="fileUrl">
+            <el-upload
+              class="upload-demo"
+              drag
+              action="#"
+              :limit="1"
+              :auto-upload="true"
+              :disabled="true"
+            >
+              <i class="el-icon-upload"></i>
+              <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+<!--              <div class="el-upload__tip" slot="tip">只能上传不超过200MB的文件</div>-->
+            </el-upload>
+          </el-form-item>
+
+<!--          <el-form-item label="封面图" prop="picture" disabled>-->
+<!--            <el-upload-->
+<!--              action="#"-->
+<!--              list-type="picture-card"-->
+<!--              :limit="1"-->
+<!--              :auto-upload="true"-->
+<!--              :file-list="fileList"-->
+<!--              :disabled="true"-->
+<!--            >-->
+<!--              <i slot="default" class="el-icon-plus"></i>-->
+<!--              <div slot="file" slot-scope="{ file }">-->
+<!--                <img class="el-upload-list__item-thumbnail" :src="file.url" />-->
+
+<!--                &lt;!&ndash; 放大预览 &ndash;&gt;-->
+<!--                <span class="el-upload-list__item-actions">-->
+<!--                  <span-->
+<!--                    class="el-upload-list__item-preview"-->
+<!--                    @click="handlePictureCardPreview(file)"-->
+<!--                  >-->
+<!--                    <i class="el-icon-zoom-in"></i>-->
+<!--                  </span>-->
+<!--                </span>-->
+<!--              </div>-->
+<!--            </el-upload>-->
+<!--          </el-form-item>-->
+
+          <el-form-item label="新闻内容" prop="content">
+            <editor
+              v-model="taskList.formobj.content"
+              :min-height="192"
+              :readOnly="true"
+            />
+          </el-form-item>
+        </el-form>
+
+        <el-dialog
+          :visible="BigImgVisible"
+          fullscreen
+          append-to-body
+          @close="BigImgVisible = false"
+        >
+          <img width="100%" :src="taskList.formobj.fileUrl" alt="" />
+        </el-dialog>
+      </el-tab-pane>
+      <el-tab-pane label="审批记录" name="审批记录">
+        <el-timeline>
+
+          <el-timeline-item v-for="(item,index) in taskList.taskHisAction" :timestamp="item.createTime" placement="top" :key="index+'taskHisAction'">
+            <el-card>
+              <p>{{item.execId}} {{item.acname}} 于 {{ item.createTime}}</p>
+            </el-card>
+          </el-timeline-item>
+
+        </el-timeline>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      activeName: "详细信息",
+      fileList: [],
+      BigImgVisible: false,
+    };
+  },
+  props: ["taskList"],
+  created() {
+    if (this.taskList.formobj.fileUrl) {
+      this.fileList.push({ name: "xxx", url: this.taskList.formobj.fileUrl });
+    }
+  },
+  methods: {
+    handlePictureCardPreview(file) {
+      this.taskList.formobj.fileUrl = file.url;
+      this.BigImgVisible = true;
+    },
+  },
+};
+</script>
+
+<style>
+</style>

src/views/task/index.vue

@@ -161,6 +161,7 @@
 <script>
 //导入审核页面的组件
 import newsTask from "@/views/news/task/index.vue";
+import couTask from "@/views/COUNSELINGMESSAGE/task/index.vue";
 
 import {
   listINSTACTIONTASK,
@@ -175,6 +176,10 @@ import {
 
 export default {
   name: "INSTACTIONTASK",
+  components:{
+    newsTask,
+    couTask
+  },
   data() {
     return {
       //审核意见对话框的form
@@ -186,7 +191,7 @@ export default {
       //审核页面的
       taskList: [],
       //动态组件
-      componentUrl: newsTask,
+      componentUrl: '',
       //审核的dialog
       dialogVisible: false,
       // 根路径
@@ -285,6 +290,7 @@ export default {
   },
   created() {
     this.getList();
+
   },
   methods: {
     extask() {
@@ -332,6 +338,7 @@ export default {
       getINSTACTIONTASK(row.id).then((res) => {
         this.taskList = res.data;
         this.dialogVisible = true;
+        this.componentUrl = res.data.infoUrl
       });
     },
     //点击查看详细