From 4e853edf7219c7324bf34962391a656a8f9d4907 Mon Sep 17 00:00:00 2001
From: SjS <email@example.com>
Date: Fri, 25 Apr 2025 11:20:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=B9=BF=E5=91=8A=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
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 | 199 +++++++++++++++++++++---------
 2 files changed, 145 insertions(+), 68 deletions(-)

diff --git a/src/views/bst/ad/index.vue b/src/views/bst/ad/index.vue
index 5af7233..6b3ca27 100644
--- a/src/views/bst/ad/index.vue
+++ b/src/views/bst/ad/index.vue
@@ -82,13 +82,13 @@
               v-hasPermi="['bst:ad:edit']">
               {{ scope.row.auditStatus === '1' ? '审核' : '查看详情' }}
             </el-button>
-<!--            <el-button-->
-<!--              size="mini"-->
-<!--              type="text"-->
-<!--              icon="el-icon-edit"-->
-<!--              @click="handleUpdate(scope.row)"-->
-<!--              v-has-permi="['bst:ad:edit']"-->
-<!--            >修改</el-button>-->
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleUpdate(scope.row)"
+              v-has-permi="['bst:ad:edit']"
+            >修改</el-button>
             <el-button
               size="mini"
               type="text"
diff --git a/src/views/bst/agreement/index.vue b/src/views/bst/agreement/index.vue
index 0f5719a..543eed6 100644
--- a/src/views/bst/agreement/index.vue
+++ b/src/views/bst/agreement/index.vue
@@ -34,19 +34,20 @@
           size="mini"
           @click="handleAdd"
           v-has-permi="['bst:agreement:add']"
-        >新增</el-button>
+        >新增
+        </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:agreement:remove']"-->
-<!--        >删除</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:agreement:remove']"-->
+      <!--        >删除</el-button>-->
+      <!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -55,38 +56,41 @@
           size="mini"
           @click="handleExport"
           v-has-permi="['bst:agreement:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="agreementList" @selection-change="handleSelectionChange" :default-sort="defaultSort"  @sort-change="onSortChange">
-      <el-table-column type="selection" width="55" align="center" />
+    <el-table v-loading="loading" :data="agreementList" @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"
+          :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]}}
+              {{ d.row[column.key] }}
             </template>
             <template v-else-if="column.key === 'title'">
-              {{d.row.title | dv}}
-              <dict-tag :options="dict.type.agreement_type" :value="d.row.agreementType" size="mini" style="margin-left: 4px;"/>
+              {{ d.row.title | dv }}
+              <dict-tag :options="dict.type.agreement_type" :value="d.row.agreementType" size="mini"
+                        style="margin-left: 4px;"/>
             </template>
             <template v-else-if="column.key === 'userName'">
               <user-link :id="d.row.storeId" :text="d.row.userName"/>
             </template>
             <template v-else>
-              {{d.row[column.key]}}
+              {{ d.row[column.key] }}
             </template>
           </template>
         </el-table-column>
@@ -99,14 +103,16 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-has-permi="['bst:agreement:edit']"
-          >修改</el-button>
+          >修改
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-has-permi="['bst:agreement:remove']"
-          >删除</el-button>
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -122,18 +128,35 @@
     <!-- 添加或修改协议对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px" v-loading="detailLoading">
-          <el-form-item :span="24" label="标题" prop="title">
-            <el-input v-model="form.title" placeholder="请输入标题" />
-          </el-form-item>
-          <el-form-item label="运营区" prop="areaId" >
-            <area-remote-select
-              v-model="form.areaId"
-              :init-options="initAreaOptions"
-              v-if="!detailLoading"
-              placeholder="请选择运营区"
-              style="width: 58%"
-            />
-          </el-form-item>
+        <el-form-item :span="24" label="标题" prop="title">
+          <el-input v-model="form.title" placeholder="请输入标题"/>
+        </el-form-item>
+        <el-form-item label="运营区" prop="areaId">
+          <area-remote-select
+            v-model="form.areaId"
+            :init-options="initAreaOptions"
+            v-if="!detailLoading"
+            placeholder="请选择运营区"
+            style="width: 58%"
+          />
+        </el-form-item>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <form-col label="内容类型" prop="contentType">
+              <el-select
+                v-model="form.contentType"
+                placeholder="请选择内容类型"
+                style="width: 95%"
+              >
+                <el-option
+                  v-for="dict in dict.type.agreement_content_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </form-col>
+          </el-col>
           <el-col :span="12">
             <form-col label="协议类型" prop="agreementType">
               <el-select
@@ -150,6 +173,8 @@
               </el-select>
             </form-col>
           </el-col>
+        </el-row>
+        <el-row gutter="20">
           <el-col :span="12">
             <form-col label="展示时长" prop="duration">
               <div style="display: flex; align-items: center; gap: 10px">
@@ -165,12 +190,19 @@
               </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"/>
-          </form-col>
+        </el-row>
+        <el-row gutter="20">
+          <el-col :span="span">
+            <form-col label="简介" prop="brief">
+              <el-input v-model="form.brief" placeholder="请输入简介"/>
+            </form-col>
+          </el-col>
+          <el-col :span="span">
+            <form-col label="内容详情">
+              <editor v-model="form.content" :min-height="150"/>
+            </form-col>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -181,14 +213,14 @@
 </template>
 
 <script>
-import { listAgreement, getAgreement, delAgreement, addAgreement, updateAgreement } from "@/api/bst/agreement";
-import { $showColumns } from '@/utils/mixins';
+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";
 import AreaRemoteSelect from "@/components/Business/Area/AreaRemoteSelect.vue";
 import UserLink from "@/components/Business/User/UserLink.vue";
 
-  // 默认排序字段
+// 默认排序字段
 const defaultSort = {
   prop: "createTime",
   order: "descending"
@@ -197,16 +229,53 @@ const defaultSort = {
 export default {
   name: "Agreement",
   mixins: [$showColumns],
-  dicts: ['agreement_type'],
-  components: {FormCol,Editor,AreaRemoteSelect,UserLink},
+  dicts: ['agreement_type', 'agreement_content_type'],
+  components: {FormCol, Editor, AreaRemoteSelect, UserLink},
   data() {
     return {
       span: 24,
       // 字段列表
       columns: [
-        {key: 'id', visible: false, label: 'ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: "80"},
-        {key: 'title', visible: true, label: '标题', minWidth: "150", sortable: true, overflow: false, align: 'left', width: null},
-        {key: 'brief', visible: true, label: '简介', minWidth: null, sortable: true, overflow: true, align: 'center', width: null},
+        {
+          key: 'id',
+          visible: false,
+          label: 'ID',
+          minWidth: null,
+          sortable: true,
+          overflow: false,
+          align: 'center',
+          width: "80"
+        },
+        {
+          key: 'title',
+          visible: true,
+          label: '标题',
+          minWidth: "150",
+          sortable: true,
+          overflow: false,
+          align: 'left',
+          width: null
+        },
+        {
+          key: 'contentType',
+          visible: true,
+          label: '类型',
+          minWidth: "150",
+          sortable: true,
+          overflow: false,
+          align: 'left',
+          width: null
+        },
+        {
+          key: 'brief',
+          visible: true,
+          label: '简介',
+          minWidth: null,
+          sortable: true,
+          overflow: true,
+          align: 'center',
+          width: null
+        },
         {key: 'userName', visible: true, label: '商户', sortable: true, align: 'center'},
         {key: 'areaName', visible: true, label: '运营区', sortable: true, align: 'center'},
         {key: 'createTime', visible: true, label: '创建时间', sortable: true, align: 'center'},
@@ -244,6 +313,7 @@ export default {
         brief: null,
         content: null,
         agreementType: null,
+        contentType: null,
         duration: null,
       },
       // 表单参数
@@ -254,10 +324,16 @@ export default {
         title: [
           {required: true, message: "标题不能为空", trigger: "blur"}
         ],
+        areaId: [
+          {required: true, message: "运营区不能为空", trigger: "blur"}
+        ],
+        agreementType: [
+          {required: true, message: "协议类型不能为空", trigger: "blur"}
+        ],
       }
     };
   },
-  computed:{
+  computed: {
     initAreaOptions() {
       return [{id: this.form.areaId, name: this.form.areaName}]
     },
@@ -296,7 +372,7 @@ export default {
       this.form = {
         id: null,
         storeId: null,
-        areaName:null,
+        areaName: null,
         areaId: null,
         title: null,
         brief: null,
@@ -339,7 +415,7 @@ export default {
         this.form = response.data;
         this.open = true;
         this.title = "修改协议";
-      }).finally(()=>{
+      }).finally(() => {
         this.detailLoading = false;
       });
     },
@@ -370,12 +446,13 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除协议编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除协议编号为"' + ids + '"的数据项？').then(function () {
         return delAgreement(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => {
+      });
     },
     /** 导出按钮操作 */
     handleExport() {