From d6da6f9a6d0273a3040a20921f8df13f94137bac Mon Sep 17 00:00:00 2001
From: wanglei <wl2666675>
Date: Sun, 7 Apr 2024 09:08:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E8=AE=AF=E7=AE=A1=E7=90=86=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/carinfo/index.vue |   2 +-
 ruoyi-ui/src/views/szxc/news/index.vue    | 161 +++++++++++++---------
 2 files changed, 96 insertions(+), 67 deletions(-)

diff --git a/ruoyi-ui/src/views/szxc/carinfo/index.vue b/ruoyi-ui/src/views/szxc/carinfo/index.vue
index 524ca94..21e0784 100644
--- a/ruoyi-ui/src/views/szxc/carinfo/index.vue
+++ b/ruoyi-ui/src/views/szxc/carinfo/index.vue
@@ -196,7 +196,7 @@
           <image-upload v-model="form.carPicture"/>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
diff --git a/ruoyi-ui/src/views/szxc/news/index.vue b/ruoyi-ui/src/views/szxc/news/index.vue
index 3d006f2..265a739 100644
--- a/ruoyi-ui/src/views/szxc/news/index.vue
+++ b/ruoyi-ui/src/views/szxc/news/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 :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <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"
@@ -9,45 +13,20 @@
           @keyup.enter.native="handleQuery"
         />
       </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="级别(县/乡/村)" prop="leave">
-        <el-input
-          v-model="queryParams.leave"
-          placeholder="请输入级别(县/乡/村)"
-          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 label="创建者ID" prop="userId">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入创建者ID"
+      <el-form-item label="级别(县/乡/村)" prop="sort">
+        <el-select
+          v-model="queryParams.sort"
+          placeholder="级别(县/乡/村)"
           clearable
-          @keyup.enter.native="handleQuery"
-        />
+          style="width:100%"
+        >
+          <el-option
+            v-for="dict in dict.type.szxc_leave"
+            :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>
@@ -101,17 +80,27 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="newsList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="newsList" @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="type" />
-      <el-table-column label="图片" align="center" prop="picture" />
+      <el-table-column label="资讯类型" align="center" prop="type" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.szxc_zx_type" :value="scope.row.type"/>
+        </template>
+      </el-table-column>
+      <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" prop="leave" />
-      <el-table-column label="部门id" align="center" prop="deptId" />
-      <el-table-column label="所属网格" align="center" prop="deptName" />
-      <el-table-column label="创建者ID" align="center" prop="userId" />
+      <el-table-column label="级别(县/乡/村)" align="center" prop="sort" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.szxc_leave" :value="scope.row.sort"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="下发对象" align="center" prop="deptName" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -131,7 +120,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -141,28 +130,50 @@
     />
 
     <!-- 添加或修改公告资讯对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <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="图片" prop="picture">
-          <el-input v-model="form.picture" placeholder="请输入图片" />
-        </el-form-item>
-        <el-form-item label="内容">
-          <editor v-model="form.content" :min-height="192"/>
-        </el-form-item>
-        <el-form-item label="级别(县/乡/村)" prop="leave">
-          <el-input v-model="form.leave" placeholder="请输入级别(县/乡/村)" />
+        <el-form-item label="级别(县/乡/村)" prop="sort">
+          <el-select
+            v-model="form.sort"
+            placeholder="级别(县/乡/村)"
+            clearable
+            style="width:100%"
+          >
+            <el-option
+              v-for="dict in dict.type.szxc_leave"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
         </el-form-item>
-        <el-form-item label="部门id" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入部门id" />
+        <el-form-item label="资讯类型" prop="type">
+          <el-select
+            v-model="form.type"
+            placeholder="资讯类型"
+            clearable
+            style="width:100%"
+          >
+            <el-option
+              v-for="dict in dict.type.szxc_zx_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
         </el-form-item>
-        <el-form-item label="所属网格" prop="deptName">
-          <el-input v-model="form.deptName" placeholder="请输入所属网格" />
+        <el-form-item label="图片" prop="picture">
+          <image-upload v-model="form.picture"/>
         </el-form-item>
-        <el-form-item label="创建者ID" prop="userId">
-          <el-input v-model="form.userId" placeholder="请输入创建者ID" />
+        <el-form-item label="内容">
+          <editor v-model="form.content" :min-height="150"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -175,9 +186,14 @@
 
 <script>
 import { listNews, getNews, delNews, addNews, updateNews } from "@/api/szxc/news";
+import { deptTreeSelect } from "@/api/system/user";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "News",
+  components: { Treeselect },
+  dicts: ['szxc_leave', 'szxc_zx_type'],
   data() {
     return {
       // 遮罩层
@@ -196,6 +212,8 @@ export default {
       newsList: [],
       // 弹出层标题
       title: "",
+      // 组织树选项
+      deptOptions: undefined,
       // 是否显示弹出层
       open: false,
       // 查询参数
@@ -206,7 +224,7 @@ export default {
         type: null,
         picture: null,
         content: null,
-        leave: null,
+        sort: null,
         deptId: null,
         deptName: null,
         userId: null
@@ -226,8 +244,19 @@ export default {
   },
   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;
@@ -250,7 +279,7 @@ export default {
         type: null,
         picture: null,
         content: null,
-        leave: null,
+        sort: null,
         createBy: null,
         createTime: null,
         updateBy: null,