From 0c6efcd1799ff87521f1fe74c9457e714a65d0a6 Mon Sep 17 00:00:00 2001
From: SjS <email@example.com>
Date: Tue, 8 Apr 2025 20:31:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E7=9B=B8=E5=85=B3=E3=80=81?=
 =?UTF-8?q?=E6=96=87=E7=AB=A0=E5=88=86=E7=B1=BBbug=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E3=80=81=E6=96=87=E7=AB=A0=E9=80=BB=E8=BE=91=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E3=80=81=E5=89=8D=E7=AB=AF=E7=95=8C=E9=9D=A2=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bst/ad/index.vue        | 14 +-----
 src/views/bst/agreement/index.vue | 71 +++++++++++++++++++++++--------
 src/views/bst/fault/index.vue     |  8 ++--
 3 files changed, 60 insertions(+), 33 deletions(-)

diff --git a/src/views/bst/ad/index.vue b/src/views/bst/ad/index.vue
index aab0197..a717915 100644
--- a/src/views/bst/ad/index.vue
+++ b/src/views/bst/ad/index.vue
@@ -122,7 +122,7 @@
 
     <!-- 添加或修改广告对话框 -->
     <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" label-width="80px">
         <el-form-item label="广告类型" prop="type">
           <el-select v-model="form.type" placeholder="请选择广告类型">
             <el-option
@@ -227,18 +227,6 @@ export default {
       },
       // 表单参数
       form: {},
-      // 表单校验
-      // rules: {
-      //   createTime: [
-      //     { required: true, message: "创建时间不能为空", trigger: "blur" }
-      //   ],
-      //   deleted: [
-      //     { required: true, message: "逻辑删除标志，0否，1是不能为空", trigger: "blur" }
-      //   ],
-      //   urlType: [
-      //     { required: true, message: "跳转类型，1外链跳转，2站内跳转不能为空", trigger: "change" }
-      //   ]
-      // }
     };
   },
   created() {
diff --git a/src/views/bst/agreement/index.vue b/src/views/bst/agreement/index.vue
index cde6df2..770344e 100644
--- a/src/views/bst/agreement/index.vue
+++ b/src/views/bst/agreement/index.vue
@@ -154,12 +154,11 @@
               </div>
             </form-col>
           </el-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="200"/>
+            <editor  v-model="form.content" :min-height="200"/>
           </form-col>
 
         </el-row>
@@ -176,6 +175,7 @@
 import { listAgreement, getAgreement, delAgreement, addAgreement, updateAgreement } from "@/api/bst/agreement";
 import { $showColumns } from '@/utils/mixins';
 import FormCol from "@/components/FormCol/index.vue";
+import Editor from "@/components/Editor/index.vue";
 
   // 默认排序字段
 const defaultSort = {
@@ -187,23 +187,59 @@ export default {
   name: "Agreement",
   mixins: [$showColumns],
   dicts: ['agreement_type'],
-  components: {FormCol},
+  components: {FormCol,Editor},
   data() {
     return {
       span: 24,
       // 字段列表
       columns: [
-        {key: 'id', visible: true, label: 'ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        { key: 'userName', visible: true, label: '商户', sortable: true, align: 'center' },
-        { key: 'areaName', visible: true, label: '运营区', sortable: true, align: 'center' },
+        {
+          key: 'id',
+          visible: true,
+          label: 'ID',
+          minWidth: null,
+          sortable: true,
+          overflow: false,
+          align: 'center',
+          width: null
+        },
+        {key: 'userName', visible: true, label: '商户', sortable: true, align: 'center'},
+        {key: 'areaName', visible: true, label: '运营区', sortable: true, align: 'center'},
         //{key: 'storeId', visible: true, label: '商户', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         //{key: 'areaId', 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: 'brief', 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: 'brief',
+          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: 'agreementType', visible: true, label: '协议类型', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-       // {key: 'duration', visible: true, label: '展示时间', minWidth: null, sortable: false, overflow: false, align: 'center', width: "100"},
+        // {key: 'content', visible: true, label: '内容详情', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {
+          key: 'agreementType',
+          visible: true,
+          label: '协议类型',
+          minWidth: null,
+          sortable: true,
+          overflow: false,
+          align: 'center',
+          width: null
+        },
+        // {key: 'duration', visible: true, label: '展示时间', minWidth: null, sortable: false, overflow: false, align: 'center', width: "100"},
       ],
       // 排序方式
       orderSorts: ['ascending', 'descending', null],
@@ -245,7 +281,7 @@ export default {
       // 表单校验
       rules: {
         title: [
-          { required: true, message: "标题不能为空", trigger: "blur" }
+          {required: true, message: "标题不能为空", trigger: "blur"}
         ],
       }
     };
@@ -308,7 +344,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -322,9 +358,7 @@ export default {
       this.reset();
       const id = row.id || this.ids
       getAgreement(id).then(response => {
-        const data = response.data;
-        this.form = { ...data, duration: data.duration
-        };
+        this.form = response.data;
         this.open = true;
         this.title = "修改协议";
       });
@@ -333,7 +367,10 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          const submitData = { ...this.form };
+          const submitData = {
+            ...this.form,
+          };
+
           if (this.form.id != null) {
             updateAgreement(submitData).then(response => {
               this.$modal.msgSuccess("修改成功");
diff --git a/src/views/bst/fault/index.vue b/src/views/bst/fault/index.vue
index ca9ffd1..77359c3 100644
--- a/src/views/bst/fault/index.vue
+++ b/src/views/bst/fault/index.vue
@@ -91,11 +91,13 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-audit"
+            :icon="scope.row.appealStatus === '1' ? 'el-icon-audit' : 'el-icon-check'"
             @click="handleNext(scope.row, 1)"
             v-has-permi="['bst:fault:edit']"
-            v-if="scope.row.appealStatus !=='3' && scope.row.appealStatus !=='0'"
-          >处理</el-button>
+            v-if="scope.row.appealStatus === '1' || scope.row.appealStatus === '2'"
+          >
+            {{ scope.row.appealStatus === '1' ? '处理' : '完成' }}
+          </el-button>
         </template>
 <!--        <template slot-scope="scope">-->
 <!--          <el-button-->