协议相关、文章分类bug修改、文章逻辑完善、前端界面完善

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() {

src/views/bst/agreement/index.vue

@@ -154,7 +154,6 @@
               </div>
             </form-col>
           </el-col>
-
           <form-col :span="span"  label="简介" prop="brief">
             <el-input v-model="form.brief" placeholder="请输入简介" />
           </form-col>
@@ -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,22 +187,58 @@ 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: '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: '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"},
       ],
       // 排序方式
@@ -322,9 +358,7 @@ export default {
       this.reset();
       const id = row.id || this.ids
       getAgreement(id).then(response => {
-        const data = response.data;
+        this.form = response.data;
-        this.form = { ...data, duration: data.duration
-        };
         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("修改成功");

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'"
+            v-if="scope.row.appealStatus === '1' || scope.row.appealStatus === '2'"
-          >处理</el-button>
+          >
+            {{ scope.row.appealStatus === '1' ? '处理' : '完成' }}
+          </el-button>
         </template>
 <!--        <template slot-scope="scope">-->
 <!--          <el-button-->