From 2976ee8ff2b8f4f791526bdca2db3bc075246866 Mon Sep 17 00:00:00 2001
From: SjS <email@example.com>
Date: Fri, 4 Apr 2025 18:22:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=9C=8D=E7=9B=B8=E5=85=B3=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/bst/fault.js                    |   8 ++
 src/views/bst/ad/index.vue              |   1 +
 src/views/bst/article/index.vue         | 103 ++++++++------
 src/views/bst/articleCategory/index.vue |  83 +++++------
 src/views/bst/complaint/index.vue       | 180 ++++++++++++------------
 src/views/bst/fault/index.vue           |  68 ++++++---
 6 files changed, 243 insertions(+), 200 deletions(-)

diff --git a/src/api/bst/fault.js b/src/api/bst/fault.js
index b1a54e3..edaa7d8 100644
--- a/src/api/bst/fault.js
+++ b/src/api/bst/fault.js
@@ -35,6 +35,14 @@ export function updateFault(data) {
   })
 }
 
+export function handleAudit(data){
+  return request({
+      url: '/bst/fault/handle',
+      method: 'put',
+      data: data
+  })
+}
+
 // 删除故障
 export function delFault(id) {
   return request({
diff --git a/src/views/bst/ad/index.vue b/src/views/bst/ad/index.vue
index 6da679c..6fb3477 100644
--- a/src/views/bst/ad/index.vue
+++ b/src/views/bst/ad/index.vue
@@ -6,6 +6,7 @@
           v-model="queryParams.url"
           placeholder="请输入跳转链接"
           clearable
+          @input="handleQuery"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
diff --git a/src/views/bst/article/index.vue b/src/views/bst/article/index.vue
index c8dfef6..1262844 100644
--- a/src/views/bst/article/index.vue
+++ b/src/views/bst/article/index.vue
@@ -1,36 +1,13 @@
 <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="文章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 :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
       <el-form-item label="标题" prop="title">
         <el-input
           v-model="queryParams.title"
           placeholder="请输入标题"
           clearable
           @keyup.enter.native="handleQuery"
+          @input="handleQuery"
         />
       </el-form-item>
       <el-form-item>
@@ -92,6 +69,9 @@
             <template v-if="column.key === 'id'">
               {{d.row[column.key]}}
             </template>
+            <template v-else-if="column.key === 'code'">
+              <dict-tag :value="d.row.code" :options="dict.type.article_code"/>
+            </template>
             <template v-else>
               {{d.row[column.key]}}
             </template>
@@ -127,20 +107,47 @@
     />
 
     <!-- 添加或修改文章对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
-          <form-col :span="span"  label="分类ID" prop="categoryId">
-            <el-input v-model="form.categoryId" placeholder="请输入分类ID" />
+          <form-col :span="12"  label="文章分类" prop="categoryId">
+            <el-select
+              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 :span="span"  label="运营区id" prop="areaId">
-            <el-input v-model="form.areaId" placeholder="请输入运营区id" />
+          <form-col :span="12"  label="文章类型" prop="code">
+            <el-select
+              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 :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 :span="span"  label="内容详情">
-            <editor v-model="form.content" :min-height="192"/>
+            <editor v-model="form.content" :min-height="192" placeholder="请输入内容"/>
           </form-col>
         </el-row>
       </el-form>
@@ -154,6 +161,7 @@
 
 <script>
 import { listArticle, getArticle, delArticle, addArticle, updateArticle } from "@/api/bst/article";
+import {listArticleCategory} from "@/api/bst/articleCategory";
 import { $showColumns } from '@/utils/mixins';
 import FormCol from "@/components/FormCol/index.vue";
 
@@ -167,16 +175,20 @@ export default {
   name: "Article",
   mixins: [$showColumns],
   components: {FormCol},
+  dicts:["article_code"],
   data() {
     return {
       span: 24,
       // 字段列表
       columns: [
-        {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: 'areaId', 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: 'articleCategoryName', 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: 'content', 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: '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],
@@ -184,6 +196,8 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      // 分类下拉选项数据
+      categoryOptions: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -206,6 +220,7 @@ export default {
         orderByColumn: defaultSort.prop,
         isAsc: defaultSort.order,
         id: null,
+        brief:null,
         categoryId: null,
         areaId: null,
         title: null,
@@ -215,12 +230,6 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        categoryId: [
-          { required: true, message: "分类ID不能为空", trigger: "blur" }
-        ],
-        areaId: [
-          { required: true, message: "运营区id不能为空", trigger: "blur" }
-        ],
         title: [
           { required: true, message: "标题不能为空", trigger: "blur" }
         ],
@@ -231,6 +240,8 @@ export default {
     this.getList();
   },
   methods: {
+
+
     /** 当排序按钮被点击时触发 **/
     onSortChange(column) {
       if (column.order == null) {
@@ -242,6 +253,12 @@ export default {
       }
       this.getList();
     },
+    /** 获取分类列表 */
+    getCategoryList() {
+      listArticleCategory().then(response => {
+        this.categoryOptions = response.data;
+      });
+    },
     /** 查询文章列表 */
     getList() {
       this.loading = true;
@@ -288,12 +305,14 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.getCategoryList();
       this.open = true;
       this.title = "添加文章";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
+      this.getCategoryList();
       const id = row.id || this.ids
       getArticle(id).then(response => {
         this.form = response.data;
diff --git a/src/views/bst/articleCategory/index.vue b/src/views/bst/articleCategory/index.vue
index eba4b7a..6853eb1 100644
--- a/src/views/bst/articleCategory/index.vue
+++ b/src/views/bst/articleCategory/index.vue
@@ -1,32 +1,17 @@
 <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="分类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-input
           v-model="queryParams.categoryName"
           placeholder="请输入分类名称"
           clearable
+          @input="handleQuery"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="父分类ID" prop="parentId">
-        <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-form-item label="状态" prop="categoryStatus">
+        <el-select v-model="queryParams.categoryStatus" placeholder="请选择分类状态" clearable @change="handleQuery">
           <el-option
             v-for="dict in dict.type.article_category_status"
             :key="dict.value"
@@ -35,14 +20,6 @@
           />
         </el-select>
       </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-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>
@@ -81,13 +58,13 @@
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
       <el-table-column label="分类名称" prop="categoryName" />
-      <el-table-column label="父分类ID" align="center" prop="parentId" />
-      <el-table-column label="状态：0-禁用 1-启用" align="center" prop="categoryStatus">
+      <el-table-column label="状态" align="center" prop="categoryStatus">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.article_category_status" :value="scope.row.categoryStatus"/>
         </template>
       </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">
         <template slot-scope="scope">
           <el-button
@@ -118,24 +95,24 @@
     <!-- 添加或修改文章分类对话框 -->
     <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-item label="所属分类" prop="parentId">
+          <treeselect v-model="form.parentId" :options="articleCategoryOptions" :normalizer="normalizer" placeholder="请选择所属分类" />
+        </el-form-item>
         <el-form-item label="分类名称" prop="categoryName">
           <el-input v-model="form.categoryName" placeholder="请输入分类名称" />
         </el-form-item>
-        <el-form-item label="父分类ID" prop="parentId">
-          <treeselect v-model="form.parentId" :options="articleCategoryOptions" :normalizer="normalizer" placeholder="请选择父分类ID" />
+        <el-form-item label="排序" prop="sort">
+          <el-input-number v-model="form.sort" placeholder="排序" min="0"/>
         </el-form-item>
-        <el-form-item label="状态：0-禁用 1-启用" prop="categoryStatus">
+        <el-form-item label="分类状态" prop="categoryStatus" >
           <el-radio-group v-model="form.categoryStatus">
             <el-radio
               v-for="dict in dict.type.article_category_status"
               :key="dict.value"
-              :label="parseInt(dict.value)"
+              :label="dict.value"
             >{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="排序权重" prop="sort">
-          <el-input v-model="form.sort" placeholder="请输入排序权重" />
-        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -146,7 +123,7 @@
 </template>
 
 <script>
-  import {getArticleCategory, listArticleCategory,delArticleCategory,addArticleCategory} from "@/api/bst/articleCategory.js";
+  import {getArticleCategory, listArticleCategory,delArticleCategory,addArticleCategory,updateArticleCategory} from "@/api/bst/articleCategory.js";
   import Treeselect from "@riophae/vue-treeselect";
   import "@riophae/vue-treeselect/dist/vue-treeselect.css";
   import {delArea} from "@/api/bst/area";
@@ -169,6 +146,8 @@
       articleCategoryOptions: [],
       // 弹出层标题
       title: "",
+      // 数据树
+      treeData:[],
       // 是否显示弹出层
       open: false,
       // 是否展开，默认全部展开
@@ -190,12 +169,10 @@
         categoryName: [
           { required: true, message: "分类名称不能为空", trigger: "blur" }
         ],
-        categoryStatus: [
-          { required: true, message: "状态：0-禁用 1-启用不能为空", trigger: "change" }
-        ],
-        sort: [
-          { required: true, message: "排序权重不能为空", trigger: "blur" }
+        parentId: [
+          { required: true, message: "分类不能为空", trigger: "blur" }
         ],
+
       }
     };
   },
@@ -207,10 +184,23 @@
     getList() {
       this.loading = true;
       listArticleCategory(this.queryParams).then(response => {
-        this.articleCategoryList = this.handleTree(response.data, "id", "parentId");
+        this.treeData = this.handleTree(response.data, "id", "parentId");
+        this.articleCategoryList = this.sortTreeBySortValue(this.treeData)
         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) {
       if (node.children && !node.children.length) {
@@ -226,7 +216,7 @@
     getTreeselect() {
       listArticleCategory().then(response => {
         this.articleCategoryOptions = [];
-        const data = { id: 0, categoryName: '顶级节点', children: [] };
+        const data = { id: 0, categoryName:"文章分类" ,children: [] };
         data.children = this.handleTree(response.data, "id", "parentId");
         this.articleCategoryOptions.push(data);
       });
@@ -242,7 +232,7 @@
         id: null,
         categoryName: null,
         parentId: null,
-        categoryStatus: null,
+        categoryStatus: "0", // 默认启用
         sort: null,
         createTime: null
       };
@@ -281,9 +271,6 @@
     handleUpdate(row) {
       this.reset();
       this.getTreeselect();
-      if (row != null) {
-        this.form.parentId = row.parentId;
-      }
       getArticleCategory(row.id).then(response => {
         this.form = response.data;
         this.open = true;
diff --git a/src/views/bst/complaint/index.vue b/src/views/bst/complaint/index.vue
index 905dfcc..fc4ccbf 100644
--- a/src/views/bst/complaint/index.vue
+++ b/src/views/bst/complaint/index.vue
@@ -1,113 +1,105 @@
 <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="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-input
           v-model="queryParams.contact"
           placeholder="请输入联系方式"
           clearable
+          @input="handleQuery"
           @keyup.enter.native="handleQuery"
         />
       </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-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-has-permi="['bst:complaint:add']"
-        >新增</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-has-permi="['bst:complaint:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-has-permi="['bst:complaint:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
-    </el-row>
+<!--    <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-has-permi="['bst:complaint:add']"-->
+<!--        >新增</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-has-permi="['bst:complaint:remove']"-->
+<!--        >删除</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-has-permi="['bst:complaint:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
+<!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>-->
+<!--    </el-row>-->
 
     <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" />
-      <template v-for="column of showColumns">
-        <el-table-column
-            :key="column.key"
-            :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>
+      <el-table-column label="id" align="center" prop="id" width="80"/>
+      <el-table-column label="用户" align="center" prop="userName">
+        <template slot-scope="d">
+          {{ d.row.userName }}
         </template>
       </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>
 
     <pagination
@@ -159,17 +151,19 @@ export default {
   name: "Complaint",
   mixins: [$showColumns],
   components: {FormCol},
+  dicts:["complaint_type"],
   data() {
     return {
       span: 24,
       // 字段列表
       columns: [
-        {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: 'id', 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: '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: 'contact', 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: '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},
       ],
       // 排序方式
       orderSorts: ['ascending', 'descending', null],
diff --git a/src/views/bst/fault/index.vue b/src/views/bst/fault/index.vue
index 75c1b4d..ca9ffd1 100644
--- a/src/views/bst/fault/index.vue
+++ b/src/views/bst/fault/index.vue
@@ -1,16 +1,15 @@
 <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="faultSiteList">
-        <el-select v-model="queryParams.faultSiteList" placeholder="请选择故障部位" clearable multiple @change="handleQuery">
-          <el-option
-            v-for="dict in dict.type.fault_site"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
+        <el-form-item label="设备SN" prop="vehicleCode">
+          <el-input
+            v-model="queryParams.vehicleCode"
+            placeholder="请输入设备Sn"
+            clearable
+            @input="handleQuery"
+            @keyup.enter.native="handleQuery"
           />
-        </el-select>
-      </el-form-item>
+        </el-form-item>
       <el-form-item label="报修进度" prop="appealStatus">
         <el-select v-model="queryParams.appealStatus" placeholder="请选择报修进度" clearable @change="handleQuery">
           <el-option
@@ -84,11 +83,29 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-has-permi="['bst:fault:remove']"
-          >删除</el-button>
+            icon="el-icon-audit"
+            @click="handleReject(scope.row, 0)"
+            v-has-permi="['bst:fault:edit']"
+            v-if="scope.row.appealStatus ==='1'"
+          >驳回</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 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>
 
@@ -103,7 +120,7 @@
 </template>
 
 <script>
-import { listFault} from "@/api/bst/fault";
+import {handleAudit, listFault} from "@/api/bst/fault";
 import { $showColumns } from '@/utils/mixins';
 import FormCol from "@/components/FormCol/index.vue";
 import FaultEditDialog from "@/views/bst/fault/components/FaultEditDialog.vue";
@@ -126,12 +143,12 @@ export default {
       columns: [
         {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: '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: '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: '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},
       ],
       // 排序方式
@@ -201,6 +218,23 @@ export default {
     this.getList();
   },
   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) {
+      // 调用后端接口，传递handle参数（0或1）
+      handleAudit({id, handle}).then(response => {
+        this.$modal.msgSuccess("操作成功");
+        this.getList(); // 刷新列表
+      });
+    },
     /** 当排序按钮被点击时触发 **/
     onSortChange(column) {
       if (column.order == null) {