From d07c101e65a63312bc63d0f456b626b4becccae4 Mon Sep 17 00:00:00 2001
From: wanglei <wl2666675>
Date: Sun, 7 Apr 2024 11:01:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=AE=E4=BA=8B=E4=B8=AD=E5=BF=83=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/szxc/activily/index.vue |   6 +-
 ruoyi-ui/src/views/szxc/yscentre/index.vue | 170 ++++++++++++---------
 2 files changed, 103 insertions(+), 73 deletions(-)

diff --git a/ruoyi-ui/src/views/szxc/activily/index.vue b/ruoyi-ui/src/views/szxc/activily/index.vue
index 0ce4dfe..f8356fd 100644
--- a/ruoyi-ui/src/views/szxc/activily/index.vue
+++ b/ruoyi-ui/src/views/szxc/activily/index.vue
@@ -97,7 +97,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="activilyList" @selection-change="handleSelectionChange" border>
+    <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange" border>
       <el-table-column type="selection" width="45" align="center" />
       <el-table-column label="ID" align="center" prop="id" />
       <el-table-column label="标题" align="center" prop="title" />
@@ -238,7 +238,7 @@ export default {
       // 组织树选项
       deptOptions: undefined,
       // 公益活动表格数据
-      activilyList: [],
+      list: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -308,7 +308,7 @@ export default {
     getList() {
       this.loading = true;
       listActivily(this.queryParams).then(response => {
-        this.activilyList = response.rows;
+        this.list = response.rows;
         this.total = response.total;
         this.loading = false;
       });
diff --git a/ruoyi-ui/src/views/szxc/yscentre/index.vue b/ruoyi-ui/src/views/szxc/yscentre/index.vue
index 72e313d..cf8313b 100644
--- a/ruoyi-ui/src/views/szxc/yscentre/index.vue
+++ b/ruoyi-ui/src/views/szxc/yscentre/index.vue
@@ -1,6 +1,10 @@
 <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="deptId">
+        <treeselect v-model="queryParams.deptId" :options="deptOptions" :disable-branch-nodes="true" style="width:215px;"
+                    placeholder="请选择所属网格"/>
+      </el-form-item>
       <el-form-item label="标题" prop="title">
         <el-input
           v-model="queryParams.title"
@@ -33,38 +37,6 @@
           placeholder="请选择结束时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="图片" prop="picture">
-        <el-input
-          v-model="queryParams.picture"
-          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="部门id" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入部门id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="所属网格" prop="deptName">
-        <el-input
-          v-model="queryParams.deptName"
-          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>
@@ -117,27 +89,33 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="yscentreList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange" border>
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="id" align="center" prop="id" />
+      <el-table-column label="ID" align="center" prop="id" />
       <el-table-column label="标题" align="center" prop="title" />
-      <el-table-column label="议事描述" align="center" prop="content" />
+      <el-table-column label="所属网格" align="center" prop="deptName" />
+      <el-table-column label="活动状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.szxc_hd_status" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
       <el-table-column label="渠道" align="center" prop="channel" />
-      <el-table-column label="开始时间" align="center" prop="startDate" width="180">
+      <el-table-column label="开始时间" align="center" prop="startDate">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="结束时间" align="center" prop="endDate" width="180">
+      <el-table-column label="结束时间" align="center" prop="endDate">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="状态(待开始、进行中、已结束)" align="center" prop="status" />
-      <el-table-column label="图片" align="center" prop="picture" />
-      <el-table-column label="创建者ID" align="center" prop="userId" />
-      <el-table-column label="部门id" align="center" prop="deptId" />
-      <el-table-column label="所属网格" align="center" prop="deptName" />
+      <el-table-column label="图片" align="center" prop="picture" >
+        <template slot-scope="scope">
+          <image-preview :src="scope.row.picture" :width="50" :height="50"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="议事描述" align="center" prop="content" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -157,7 +135,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -167,44 +145,54 @@
     />
 
     <!-- 添加或修改议事中心对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="所属网格" prop="deptId">
+          <treeselect v-model="form.deptId" :options="deptOptions" :disable-branch-nodes="true"
+                      placeholder="请选择所属网格" style="width:100%;" @select="selectedTree"/>
+        </el-form-item>
         <el-form-item label="标题" prop="title">
           <el-input v-model="form.title" placeholder="请输入标题" />
         </el-form-item>
-        <el-form-item label="议事描述">
-          <editor v-model="form.content" :min-height="192"/>
-        </el-form-item>
-        <el-form-item label="渠道" prop="channel">
-          <el-input v-model="form.channel" placeholder="请输入渠道" />
+        <el-form-item label="活动状态" prop="status">
+          <el-select
+            v-model="form.status"
+            placeholder="活动状态"
+            clearable
+            style="width:100%"
+          >
+            <el-option
+              v-for="dict in dict.type.szxc_hd_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
         </el-form-item>
         <el-form-item label="开始时间" prop="startDate">
-          <el-date-picker clearable
-            v-model="form.startDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择开始时间">
+          <el-date-picker clearable style="width:100%"
+                          v-model="form.startDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择开始时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="结束时间" prop="endDate">
-          <el-date-picker clearable
-            v-model="form.endDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择结束时间">
+          <el-date-picker clearable style="width:100%"
+                          v-model="form.endDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择结束时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="图片" prop="picture">
-          <el-input v-model="form.picture" placeholder="请输入图片" />
-        </el-form-item>
-        <el-form-item label="创建者ID" prop="userId">
-          <el-input v-model="form.userId" placeholder="请输入创建者ID" />
+        <el-form-item label="渠道" prop="channel">
+          <el-input v-model="form.channel" placeholder="请输入渠道" />
         </el-form-item>
-        <el-form-item label="部门id" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入部门id" />
+        <el-form-item label="图片" prop="picture">
+          <image-upload v-model="form.picture"/>
         </el-form-item>
-        <el-form-item label="所属网格" prop="deptName">
-          <el-input v-model="form.deptName" placeholder="请输入所属网格" />
+        <el-form-item label="议事描述" prop="content">
+          <editor v-model="form.content" :min-height="150"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -217,9 +205,14 @@
 
 <script>
 import { listYscentre, getYscentre, delYscentre, addYscentre, updateYscentre } from "@/api/szxc/yscentre";
+import { deptTreeSelect } from "@/api/system/user";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "Yscentre",
+  components: { Treeselect },
+  dicts: ['szxc_hd_status'],
   data() {
     return {
       // 遮罩层
@@ -234,8 +227,10 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
+      // 组织树选项
+      deptOptions: undefined,
       // 议事中心表格数据
-      yscentreList: [],
+      list: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -259,18 +254,53 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        deptId: [
+          { required: true, message: "所属网格不能为空", trigger: "blur" }
+        ],
+        title: [
+          { required: true, message: "标题不能为空", trigger: "blur" }
+        ],
+        status: [
+          { required: true, message: "活动状态不能为空", trigger: "blur" }
+        ],
+        startDate: [
+          { required: true, message: "开始时间不能为空", trigger: "blur" }
+        ],
+        endDate: [
+          { required: true, message: "结束时间不能为空", trigger: "blur" }
+        ],
+        content: [
+          { required: true, message: "议事描述不能为空", trigger: "blur" }
+        ],
+        channel: [
+          { required: true, message: "渠道不能为空", trigger: "blur" }
+        ],
+        picture: [
+          { required: true, message: "图片不能为空", trigger: "blur" }
+        ],
       }
     };
   },
   created() {
     this.getList();
+    this.getDeptTree();
   },
   methods: {
+    /** 查询组织下拉树结构 */
+    getDeptTree() {
+      deptTreeSelect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
+    selectedTree(node){
+      this.form.deptId = node.id;
+      this.form.deptName = node.label;
+    },
     /** 查询议事中心列表 */
     getList() {
       this.loading = true;
       listYscentre(this.queryParams).then(response => {
-        this.yscentreList = response.rows;
+        this.list = response.rows;
         this.total = response.total;
         this.loading = false;
       });