Compare commits

..

No commits in common. "5d9ee852122b4fcacc9d5a571b1628d29e995469" and "58d2e40f23637bd680cbf727f67393a71f4f5208" have entirely different histories.

6 changed files with 200 additions and 243 deletions

View File

@ -35,14 +35,6 @@ export function updateFault(data) {
}) })
} }
export function handleAudit(data){
return request({
url: '/bst/fault/handle',
method: 'put',
data: data
})
}
// 删除故障 // 删除故障
export function delFault(id) { export function delFault(id) {
return request({ return request({

View File

@ -6,7 +6,6 @@
v-model="queryParams.url" v-model="queryParams.url"
placeholder="请输入跳转链接" placeholder="请输入跳转链接"
clearable clearable
@input="handleQuery"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>

View File

@ -1,13 +1,36 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" > <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="文章ID" prop="id">
<el-input
v-model="queryParams.id"
placeholder="请输入文章ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="分类ID" prop="categoryId">
<el-input
v-model="queryParams.categoryId"
placeholder="请输入分类ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="运营区id" prop="areaId">
<el-input
v-model="queryParams.areaId"
placeholder="请输入运营区id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="标题" prop="title"> <el-form-item label="标题" prop="title">
<el-input <el-input
v-model="queryParams.title" v-model="queryParams.title"
placeholder="请输入标题" placeholder="请输入标题"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
@input="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
@ -69,9 +92,6 @@
<template v-if="column.key === 'id'"> <template v-if="column.key === 'id'">
{{d.row[column.key]}} {{d.row[column.key]}}
</template> </template>
<template v-else-if="column.key === 'code'">
<dict-tag :value="d.row.code" :options="dict.type.article_code"/>
</template>
<template v-else> <template v-else>
{{d.row[column.key]}} {{d.row[column.key]}}
</template> </template>
@ -107,47 +127,20 @@
/> />
<!-- 添加或修改文章对话框 --> <!-- 添加或修改文章对话框 -->
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body :close-on-click-modal="false"> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row> <el-row>
<form-col :span="12" label="文章分类" prop="categoryId"> <form-col :span="span" label="分类ID" prop="categoryId">
<el-select <el-input v-model="form.categoryId" placeholder="请输入分类ID" />
v-model="form.categoryId"
placeholder="请选择分类"
clearable
filterable
>
<el-option
v-for="item in categoryOptions"
:key="item.id"
:label="item.categoryName"
:value="item.id"
/>
</el-select>
</form-col> </form-col>
<form-col :span="12" label="文章类型" prop="code"> <form-col :span="span" label="运营区id" prop="areaId">
<el-select <el-input v-model="form.areaId" placeholder="请输入运营区id" />
v-model="form.code"
placeholder="请选择文章类型"
clearable
filterable
>
<el-option
v-for="dict in dict.type.article_code"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</form-col> </form-col>
<form-col :span="span" label="标题" prop="title"> <form-col :span="span" label="标题" prop="title">
<el-input v-model="form.title" placeholder="请输入内容" /> <el-input v-model="form.title" placeholder="请输入标题" />
</form-col>
<form-col :span="span" label="简介" prop="brief">
<el-input v-model="form.brief" placeholder="请输入内容" />
</form-col> </form-col>
<form-col :span="span" label="内容详情"> <form-col :span="span" label="内容详情">
<editor v-model="form.content" :min-height="192" placeholder="请输入内容"/> <editor v-model="form.content" :min-height="192"/>
</form-col> </form-col>
</el-row> </el-row>
</el-form> </el-form>
@ -161,7 +154,6 @@
<script> <script>
import { listArticle, getArticle, delArticle, addArticle, updateArticle } from "@/api/bst/article"; import { listArticle, getArticle, delArticle, addArticle, updateArticle } from "@/api/bst/article";
import {listArticleCategory} from "@/api/bst/articleCategory";
import { $showColumns } from '@/utils/mixins'; import { $showColumns } from '@/utils/mixins';
import FormCol from "@/components/FormCol/index.vue"; import FormCol from "@/components/FormCol/index.vue";
@ -175,20 +167,16 @@ export default {
name: "Article", name: "Article",
mixins: [$showColumns], mixins: [$showColumns],
components: {FormCol}, components: {FormCol},
dicts:["article_code"],
data() { data() {
return { return {
span: 24, span: 24,
// //
columns: [ columns: [
{key: 'id', visible: true, label: 'ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'id', visible: true, label: '文章ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
//{key: 'categoryId', visible: true, label: 'ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'categoryId', visible: true, label: '分类ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'articleCategoryName', visible: true, label: '分类名称', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'areaId', visible: true, label: '运营区id', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'title', visible: true, label: '标题', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'title', visible: true, label: '标题', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'code', visible: true, label: '文章类型', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'content', visible: true, label: '内容详情', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
//{key: 'content', visible: true, label: '', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'brief', visible: true, label: '简介', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'createTime', visible: true, label: '创建时间', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
], ],
// //
orderSorts: ['ascending', 'descending', null], orderSorts: ['ascending', 'descending', null],
@ -196,8 +184,6 @@ export default {
loading: true, loading: true,
// //
ids: [], ids: [],
//
categoryOptions: [],
// //
single: true, single: true,
// //
@ -220,7 +206,6 @@ export default {
orderByColumn: defaultSort.prop, orderByColumn: defaultSort.prop,
isAsc: defaultSort.order, isAsc: defaultSort.order,
id: null, id: null,
brief:null,
categoryId: null, categoryId: null,
areaId: null, areaId: null,
title: null, title: null,
@ -230,6 +215,12 @@ export default {
form: {}, form: {},
// //
rules: { rules: {
categoryId: [
{ required: true, message: "分类ID不能为空", trigger: "blur" }
],
areaId: [
{ required: true, message: "运营区id不能为空", trigger: "blur" }
],
title: [ title: [
{ required: true, message: "标题不能为空", trigger: "blur" } { required: true, message: "标题不能为空", trigger: "blur" }
], ],
@ -240,8 +231,6 @@ export default {
this.getList(); this.getList();
}, },
methods: { methods: {
/** 当排序按钮被点击时触发 **/ /** 当排序按钮被点击时触发 **/
onSortChange(column) { onSortChange(column) {
if (column.order == null) { if (column.order == null) {
@ -253,12 +242,6 @@ export default {
} }
this.getList(); this.getList();
}, },
/** 获取分类列表 */
getCategoryList() {
listArticleCategory().then(response => {
this.categoryOptions = response.data;
});
},
/** 查询文章列表 */ /** 查询文章列表 */
getList() { getList() {
this.loading = true; this.loading = true;
@ -305,14 +288,12 @@ export default {
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.getCategoryList();
this.open = true; this.open = true;
this.title = "添加文章"; this.title = "添加文章";
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
this.getCategoryList();
const id = row.id || this.ids const id = row.id || this.ids
getArticle(id).then(response => { getArticle(id).then(response => {
this.form = response.data; this.form = response.data;

View File

@ -1,17 +1,32 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="分类ID" prop="id">
<el-input
v-model="queryParams.id"
placeholder="请输入分类ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="分类名称" prop="categoryName"> <el-form-item label="分类名称" prop="categoryName">
<el-input <el-input
v-model="queryParams.categoryName" v-model="queryParams.categoryName"
placeholder="请输入分类名称" placeholder="请输入分类名称"
clearable clearable
@input="handleQuery"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="categoryStatus"> <el-form-item label="父分类ID" prop="parentId">
<el-select v-model="queryParams.categoryStatus" placeholder="请选择分类状态" clearable @change="handleQuery"> <el-input
v-model="queryParams.parentId"
placeholder="请输入父分类ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="状态0-禁用 1-启用" prop="categoryStatus">
<el-select v-model="queryParams.categoryStatus" placeholder="请选择状态0-禁用 1-启用" clearable>
<el-option <el-option
v-for="dict in dict.type.article_category_status" v-for="dict in dict.type.article_category_status"
:key="dict.value" :key="dict.value"
@ -20,6 +35,14 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="排序权重" prop="sort">
<el-input
v-model="queryParams.sort"
placeholder="请输入排序权重"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <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-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -58,13 +81,13 @@
:tree-props="{children: 'children', hasChildren: 'hasChildren'}" :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
> >
<el-table-column label="分类名称" prop="categoryName" /> <el-table-column label="分类名称" prop="categoryName" />
<el-table-column label="状态" align="center" prop="categoryStatus"> <el-table-column label="父分类ID" align="center" prop="parentId" />
<el-table-column label="状态0-禁用 1-启用" align="center" prop="categoryStatus">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.article_category_status" :value="scope.row.categoryStatus"/> <dict-tag :options="dict.type.article_category_status" :value="scope.row.categoryStatus"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="排序" align="center" prop="sort" /> <el-table-column label="排序权重" align="center" prop="sort" />
<el-table-column label="创建时间" align="center" prop="createTime" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -95,24 +118,24 @@
<!-- 添加或修改文章分类对话框 --> <!-- 添加或修改文章分类对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <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 ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="所属分类" prop="parentId">
<treeselect v-model="form.parentId" :options="articleCategoryOptions" :normalizer="normalizer" placeholder="请选择所属分类" />
</el-form-item>
<el-form-item label="分类名称" prop="categoryName"> <el-form-item label="分类名称" prop="categoryName">
<el-input v-model="form.categoryName" placeholder="请输入分类名称" /> <el-input v-model="form.categoryName" placeholder="请输入分类名称" />
</el-form-item> </el-form-item>
<el-form-item label="排序" prop="sort"> <el-form-item label="父分类ID" prop="parentId">
<el-input-number v-model="form.sort" placeholder="排序" min="0"/> <treeselect v-model="form.parentId" :options="articleCategoryOptions" :normalizer="normalizer" placeholder="请选择父分类ID" />
</el-form-item> </el-form-item>
<el-form-item label="分类状态" prop="categoryStatus" > <el-form-item label="状态0-禁用 1-启用" prop="categoryStatus">
<el-radio-group v-model="form.categoryStatus"> <el-radio-group v-model="form.categoryStatus">
<el-radio <el-radio
v-for="dict in dict.type.article_category_status" v-for="dict in dict.type.article_category_status"
:key="dict.value" :key="dict.value"
:label="dict.value" :label="parseInt(dict.value)"
>{{dict.label}}</el-radio> >{{dict.label}}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="排序权重" prop="sort">
<el-input v-model="form.sort" placeholder="请输入排序权重" />
</el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button> <el-button type="primary" @click="submitForm"> </el-button>
@ -123,7 +146,7 @@
</template> </template>
<script> <script>
import {getArticleCategory, listArticleCategory,delArticleCategory,addArticleCategory,updateArticleCategory} from "@/api/bst/articleCategory.js"; import {getArticleCategory, listArticleCategory,delArticleCategory,addArticleCategory} from "@/api/bst/articleCategory.js";
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import {delArea} from "@/api/bst/area"; import {delArea} from "@/api/bst/area";
@ -146,8 +169,6 @@
articleCategoryOptions: [], articleCategoryOptions: [],
// //
title: "", title: "",
//
treeData:[],
// //
open: false, open: false,
// //
@ -169,10 +190,12 @@
categoryName: [ categoryName: [
{ required: true, message: "分类名称不能为空", trigger: "blur" } { required: true, message: "分类名称不能为空", trigger: "blur" }
], ],
parentId: [ categoryStatus: [
{ required: true, message: "分类不能为空", trigger: "blur" } { required: true, message: "状态0-禁用 1-启用不能为空", trigger: "change" }
],
sort: [
{ required: true, message: "排序权重不能为空", trigger: "blur" }
], ],
} }
}; };
}, },
@ -184,23 +207,10 @@
getList() { getList() {
this.loading = true; this.loading = true;
listArticleCategory(this.queryParams).then(response => { listArticleCategory(this.queryParams).then(response => {
this.treeData = this.handleTree(response.data, "id", "parentId"); this.articleCategoryList = this.handleTree(response.data, "id", "parentId");
this.articleCategoryList = this.sortTreeBySortValue(this.treeData)
this.loading = false; this.loading = false;
}); });
}, },
//
sortTreeBySortValue(nodes) {
// 1. sort
nodes.sort((a, b) => a.sort - b.sort);
// 2.
nodes.forEach(node => {
if (node.children && node.children.length > 0) {
node.children = this.sortTreeBySortValue(node.children);
}
});
return nodes;
},
/** 转换文章分类数据结构 */ /** 转换文章分类数据结构 */
normalizer(node) { normalizer(node) {
if (node.children && !node.children.length) { if (node.children && !node.children.length) {
@ -216,7 +226,7 @@
getTreeselect() { getTreeselect() {
listArticleCategory().then(response => { listArticleCategory().then(response => {
this.articleCategoryOptions = []; this.articleCategoryOptions = [];
const data = { id: 0, categoryName:"文章分类" ,children: [] }; const data = { id: 0, categoryName: '顶级节点', children: [] };
data.children = this.handleTree(response.data, "id", "parentId"); data.children = this.handleTree(response.data, "id", "parentId");
this.articleCategoryOptions.push(data); this.articleCategoryOptions.push(data);
}); });
@ -232,7 +242,7 @@
id: null, id: null,
categoryName: null, categoryName: null,
parentId: null, parentId: null,
categoryStatus: "0", // categoryStatus: null,
sort: null, sort: null,
createTime: null createTime: null
}; };
@ -271,6 +281,9 @@
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
this.getTreeselect(); this.getTreeselect();
if (row != null) {
this.form.parentId = row.parentId;
}
getArticleCategory(row.id).then(response => { getArticleCategory(row.id).then(response => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;

View File

@ -1,105 +1,113 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="主键" prop="id">
<el-input
v-model="queryParams.id"
placeholder="请输入主键"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="用户ID" prop="userId">
<el-input
v-model="queryParams.userId"
placeholder="请输入用户ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="联系方式" prop="contact"> <el-form-item label="联系方式" prop="contact">
<el-input <el-input
v-model="queryParams.contact" v-model="queryParams.contact"
placeholder="请输入联系方式" placeholder="请输入联系方式"
clearable clearable
@input="handleQuery"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="类型" prop="type">
<el-select v-model="queryParams.type" placeholder="请选择反馈类型" clearable @change="handleQuery">
<el-option
v-for="dict in dict.type.complaint_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <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-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<!-- <el-row :gutter="10" class="mb8">--> <el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">--> <el-col :span="1.5">
<!-- <el-button--> <el-button
<!-- type="primary"--> type="primary"
<!-- plain--> plain
<!-- icon="el-icon-plus"--> icon="el-icon-plus"
<!-- size="mini"--> size="mini"
<!-- @click="handleAdd"--> @click="handleAdd"
<!-- v-has-permi="['bst:complaint:add']"--> v-has-permi="['bst:complaint:add']"
<!-- >新增</el-button>--> >新增</el-button>
<!-- </el-col>--> </el-col>
<!-- <el-col :span="1.5">--> <el-col :span="1.5">
<!-- <el-button--> <el-button
<!-- type="danger"--> type="danger"
<!-- plain--> plain
<!-- icon="el-icon-delete"--> icon="el-icon-delete"
<!-- size="mini"--> size="mini"
<!-- :disabled="multiple"--> :disabled="multiple"
<!-- @click="handleDelete"--> @click="handleDelete"
<!-- v-has-permi="['bst:complaint:remove']"--> v-has-permi="['bst:complaint:remove']"
<!-- >删除</el-button>--> >删除</el-button>
<!-- </el-col>--> </el-col>
<!-- <el-col :span="1.5">--> <el-col :span="1.5">
<!-- <el-button--> <el-button
<!-- type="warning"--> type="warning"
<!-- plain--> plain
<!-- icon="el-icon-download"--> icon="el-icon-download"
<!-- size="mini"--> size="mini"
<!-- @click="handleExport"--> @click="handleExport"
<!-- v-has-permi="['bst:complaint:export']"--> v-has-permi="['bst:complaint:export']"
<!-- >导出</el-button>--> >导出</el-button>
<!-- </el-col>--> </el-col>
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>--> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
<!-- </el-row>--> </el-row>
<el-table v-loading="loading" :data="complaintList" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="onSortChange"> <el-table v-loading="loading" :data="complaintList" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="onSortChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="id" align="center" prop="id" width="80"/> <template v-for="column of showColumns">
<el-table-column label="用户" align="center" prop="userName"> <el-table-column
<template slot-scope="d"> :key="column.key"
{{ d.row.userName }} :label="column.label"
:prop="column.key"
:align="column.align"
:min-width="column.minWidth"
:sort-orders="orderSorts"
:sortable="column.sortable"
:show-overflow-tooltip="column.overflow"
:width="column.width"
>
<template slot-scope="d">
<template v-if="column.key === 'id'">
{{d.row[column.key]}}
</template>
<template v-else>
{{d.row[column.key]}}
</template>
</template>
</el-table-column>
</template>
<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-has-permi="['bst:complaint:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-has-permi="['bst:complaint:remove']"
>删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="180"/>
<el-table-column label="类型" align="center" prop="type">
<template slot-scope="d">
<dict-tag :value="d.row.type" :options="dict.type.complaint_type"></dict-tag>
</template>
</el-table-column>
<el-table-column label="内容" align="center" prop="content" />
<el-table-column label="图片" align="center" prop="picture" >
<template slot-scope="d">
<image-preview :src="d.row.picture" :height="50" :width="50"/>
</template>
</el-table-column>
<el-table-column label="联系方式" align="center" prop="contact" />
<!-- <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-has-permi="['bst:complaint:edit']"-->
<!-- >修改</el-button>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-has-permi="['bst:complaint:remove']"-->
<!-- >删除</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table> </el-table>
<pagination <pagination
@ -151,19 +159,17 @@ export default {
name: "Complaint", name: "Complaint",
mixins: [$showColumns], mixins: [$showColumns],
components: {FormCol}, components: {FormCol},
dicts:["complaint_type"],
data() { data() {
return { return {
span: 24, span: 24,
// //
columns: [ columns: [
{key: 'id', visible: true, label: 'ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'id', visible: true, label: '主键', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
//{key: 'userId', visible: true, label: 'ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'userId', visible: true, label: '用户ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'userName', visible: true, label: '用户', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'content', visible: true, label: '内容', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'content', visible: true, label: '内容', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'type', visible: true, label: '类型', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'type', visible: true, label: '意见反馈类型1功能异常2意见与建议3其他', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'picture', visible: true, label: '图片', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'picture', visible: true, label: '图片路径,以逗号分开', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'contact', visible: true, label: '联系方式', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'contact', visible: true, label: '联系方式(手机、微信、邮箱)', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
], ],
// //
orderSorts: ['ascending', 'descending', null], orderSorts: ['ascending', 'descending', null],

View File

@ -1,15 +1,16 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="设备SN" prop="vehicleCode"> <el-form-item label="故障部位" prop="faultSiteList">
<el-input <el-select v-model="queryParams.faultSiteList" placeholder="请选择故障部位" clearable multiple @change="handleQuery">
v-model="queryParams.vehicleCode" <el-option
placeholder="请输入设备Sn" v-for="dict in dict.type.fault_site"
clearable :key="dict.value"
@input="handleQuery" :label="dict.label"
@keyup.enter.native="handleQuery" :value="dict.value"
/> />
</el-form-item> </el-select>
</el-form-item>
<el-form-item label="报修进度" prop="appealStatus"> <el-form-item label="报修进度" prop="appealStatus">
<el-select v-model="queryParams.appealStatus" placeholder="请选择报修进度" clearable @change="handleQuery"> <el-select v-model="queryParams.appealStatus" placeholder="请选择报修进度" clearable @change="handleQuery">
<el-option <el-option
@ -83,29 +84,11 @@
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-audit" icon="el-icon-delete"
@click="handleReject(scope.row, 0)" @click="handleDelete(scope.row)"
v-has-permi="['bst:fault:edit']" v-has-permi="['bst:fault:remove']"
v-if="scope.row.appealStatus ==='1'" >删除</el-button>
>驳回</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-audit"
@click="handleNext(scope.row, 1)"
v-has-permi="['bst:fault:edit']"
v-if="scope.row.appealStatus !=='3' && scope.row.appealStatus !=='0'"
>处理</el-button>
</template> </template>
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-has-permi="['bst:fault:remove']"-->
<!-- >删除</el-button>-->
<!-- </template>-->
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -120,7 +103,7 @@
</template> </template>
<script> <script>
import {handleAudit, listFault} from "@/api/bst/fault"; import { listFault} from "@/api/bst/fault";
import { $showColumns } from '@/utils/mixins'; import { $showColumns } from '@/utils/mixins';
import FormCol from "@/components/FormCol/index.vue"; import FormCol from "@/components/FormCol/index.vue";
import FaultEditDialog from "@/views/bst/fault/components/FaultEditDialog.vue"; import FaultEditDialog from "@/views/bst/fault/components/FaultEditDialog.vue";
@ -143,12 +126,12 @@ export default {
columns: [ columns: [
{key: 'id', visible: false, label: 'ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: "80"}, {key: 'id', visible: false, label: 'ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: "80"},
{key: 'userName', visible: true, label: '用户', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'userName', visible: true, label: '用户', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'orderId', visible: true, label: '订单号', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'vehicleCode', visible: true, label: 'SN', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'faultSite', visible: true, label: '故障原因', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'picture', visible: true, label: '图片', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'picture', visible: true, label: '图片', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'faultSite', visible: true, label: '故障部位', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'faultDetail', visible: true, label: '故障详情', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'faultDetail', visible: true, label: '故障详情', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'appealStatus', visible: true, label: '状态', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'appealStatus', visible: true, label: '状态', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'vehicleCode', visible: true, label: 'SN', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'orderId', visible: true, label: '订单号', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'createTime', visible: true, label: '提交时间', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'createTime', visible: true, label: '提交时间', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
], ],
// //
@ -218,23 +201,6 @@ export default {
this.getList(); this.getList();
}, },
methods: { methods: {
handleReject(row, status) {
this.$modal.confirm('确认驳回该故障申报吗?').then(() => {
this.handleAudit(row.id, status); //
});
},
handleNext(row, status) {
this.$modal.confirm('确认处理该故障申报吗?').then(() => {
this.handleAudit(row.id, status); //
});
},
handleAudit(id, handle) {
// handle01
handleAudit({id, handle}).then(response => {
this.$modal.msgSuccess("操作成功");
this.getList(); //
});
},
/** 当排序按钮被点击时触发 **/ /** 当排序按钮被点击时触发 **/
onSortChange(column) { onSortChange(column) {
if (column.order == null) { if (column.order == null) {