From e849eb92611ff4077a75178c66a04af46a162383 Mon Sep 17 00:00:00 2001
From: wanglei <wl2666675>
Date: Mon, 8 Apr 2024 14:29:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=B0=E8=AE=BF=E8=AE=B0=E5=BD=95=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/system/notice/index.vue    |   2 +-
 ruoyi-ui/src/views/szxc/visitrecard/index.vue | 359 +++++++++++-------
 2 files changed, 221 insertions(+), 140 deletions(-)

diff --git a/ruoyi-ui/src/views/system/notice/index.vue b/ruoyi-ui/src/views/system/notice/index.vue
index 7982b54..bdd340f 100644
--- a/ruoyi-ui/src/views/system/notice/index.vue
+++ b/ruoyi-ui/src/views/system/notice/index.vue
@@ -69,7 +69,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange" border>
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" prop="noticeId" width="100" />
       <el-table-column
diff --git a/ruoyi-ui/src/views/szxc/visitrecard/index.vue b/ruoyi-ui/src/views/szxc/visitrecard/index.vue
index 78fd401..dacdd37 100644
--- a/ruoyi-ui/src/views/szxc/visitrecard/index.vue
+++ b/ruoyi-ui/src/views/szxc/visitrecard/index.vue
@@ -1,6 +1,18 @@
 <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="90px">
+      <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"
+          placeholder="请输入标题"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="提报人" prop="visiterName">
         <el-input
           v-model="queryParams.visiterName"
@@ -17,30 +29,6 @@
           placeholder="请选择提报日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="开始时间" prop="startDate">
-        <el-date-picker clearable
-          v-model="queryParams.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="queryParams.endDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择结束时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="走访对像id" prop="jmId">
-        <el-input
-          v-model="queryParams.jmId"
-          placeholder="请输入走访对像id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="走访对象" prop="visitObj">
         <el-input
           v-model="queryParams.visitObj"
@@ -49,22 +37,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="标题" prop="title">
-        <el-input
-          v-model="queryParams.title"
-          placeholder="请输入标题"
-          clearable
-          @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="flowPeople">
         <el-input
           v-model="queryParams.flowPeople"
@@ -73,37 +45,21 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="审核备注" prop="shRemark">
-        <el-input
-          v-model="queryParams.shRemark"
-          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 label="开始时间" prop="startDate">
+        <el-date-picker clearable
+                        v-model="queryParams.startDate"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="请选择开始时间">
+        </el-date-picker>
       </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 label="结束时间" prop="endDate">
+        <el-date-picker clearable
+                        v-model="queryParams.endDate"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="请选择结束时间">
+        </el-date-picker>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -157,37 +113,47 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="visitrecardList" @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="visiterName" />
-      <el-table-column label="提报日期" align="center" prop="submitDate" width="180">
+      <el-table-column label="提报日期" align="center" prop="submitDate">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.submitDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <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="type" />
-      <el-table-column label="走访对像id" align="center" prop="jmId" />
+      <el-table-column label="走访类别" align="center" prop="type" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.szxc_zf_type" :value="scope.row.type"/>
+        </template>
+      </el-table-column>
+<!--      <el-table-column label="走访对像id" align="center" prop="jmId" />-->
       <el-table-column label="走访对象" align="center" prop="visitObj" />
       <el-table-column label="标题" align="center" prop="title" />
-      <el-table-column label="图片" align="center" prop="picture" />
+      <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="flowPeople" />
-      <el-table-column label="审核状态" align="center" prop="zfStatus" />
+      <el-table-column label="审核状态" align="center" prop="zfStatus" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.szxc_audit_status" :value="scope.row.zfStatus"/>
+        </template>
+      </el-table-column>
       <el-table-column label="审核备注" align="center" prop="shRemark" />
-      <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" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -207,7 +173,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -217,64 +183,124 @@
     />
 
     <!-- 添加或修改走访记录对话框 -->
-    <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-item label="提报人" prop="visiterName">
-          <el-input v-model="form.visiterName" placeholder="请输入提报人" />
-        </el-form-item>
-        <el-form-item label="提报日期" prop="submitDate">
-          <el-date-picker clearable
-            v-model="form.submitDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择提报日期">
-          </el-date-picker>
-        </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>
-        </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>
-        </el-form-item>
-        <el-form-item label="走访对像id" prop="jmId">
-          <el-input v-model="form.jmId" placeholder="请输入走访对像id" />
-        </el-form-item>
-        <el-form-item label="走访对象" prop="visitObj">
-          <el-input v-model="form.visitObj" placeholder="请输入走访对象" />
-        </el-form-item>
-        <el-form-item label="标题" prop="title">
-          <el-input v-model="form.title" placeholder="请输入标题" />
-        </el-form-item>
+    <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <el-form-item label="提报人" prop="visiterName">
+              <el-input v-model="form.visiterName" placeholder="请输入提报人" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="提报日期" prop="submitDate">
+              <el-date-picker clearable style="width: 100%"
+                              v-model="form.submitDate"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              placeholder="请选择提报日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <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-col>
+          <el-col :span="12">
+            <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_zf_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <el-form-item label="开始时间" prop="startDate">
+              <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-col>
+          <el-col :span="12">
+            <el-form-item label="结束时间" prop="endDate">
+              <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-col>
+        </el-row>
+
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <el-form-item label="标题" prop="title">
+              <el-input v-model="form.title" placeholder="请输入标题" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="审核状态" prop="zfStatus">
+              <el-select
+                v-model="form.zfStatus"
+                placeholder="审核状态"
+                clearable
+                style="width:100%"
+              >
+                <el-option
+                  v-for="dict in dict.type.szxc_audit_status"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <el-form-item label="走访对象" prop="visitObj">
+              <el-input v-model="form.visitObj" placeholder="请输入走访对象" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="随行走访人" prop="flowPeople">
+              <el-input v-model="form.flowPeople" placeholder="请输入随行走访人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
         <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"/>
+          <image-upload v-model="form.picture"/>
         </el-form-item>
-        <el-form-item label="随行走访人" prop="flowPeople">
-          <el-input v-model="form.flowPeople" placeholder="请输入随行走访人" />
+        <el-form-item label="走访内容" prop="content">
+          <el-input v-model="form.content" type="textarea" placeholder="请输入走访内容" />
         </el-form-item>
+
         <el-form-item label="审核备注" prop="shRemark">
-          <el-input v-model="form.shRemark" placeholder="请输入审核备注" />
-        </el-form-item>
-        <el-form-item label="部门id" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入部门id" />
-        </el-form-item>
-        <el-form-item label="所属网格" prop="deptName">
-          <el-input v-model="form.deptName" placeholder="请输入所属网格" />
-        </el-form-item>
-        <el-form-item label="创建者ID" prop="userId">
-          <el-input v-model="form.userId" placeholder="请输入创建者ID" />
+          <el-input v-model="form.shRemark" type="textarea" placeholder="请输入审核备注" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -287,9 +313,14 @@
 
 <script>
 import { listVisitrecard, getVisitrecard, delVisitrecard, addVisitrecard, updateVisitrecard } from "@/api/szxc/visitrecard";
+import { deptTreeSelect } from "@/api/system/user";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "Visitrecard",
+  components: { Treeselect },
+  dicts: ['szxc_zf_type', 'szxc_audit_status'],
   data() {
     return {
       // 遮罩层
@@ -305,9 +336,11 @@ export default {
       // 总条数
       total: 0,
       // 走访记录表格数据
-      visitrecardList: [],
+      list: [],
       // 弹出层标题
       title: "",
+      // 组织树选项
+      deptOptions: undefined,
       // 是否显示弹出层
       open: false,
       // 查询参数
@@ -338,18 +371,65 @@ export default {
         visiterName: [
           { required: true, message: "提报人不能为空", trigger: "blur" }
         ],
+        submitDate: [
+          { required: true, message: "提报日期不能为空", trigger: "blur" }
+        ],
+        deptId: [
+          { required: true, message: "所属网格不能为空", trigger: "blur" }
+        ],
+        type: [
+          { required: true, message: "走访类别不能为空", trigger: "blur" }
+        ],
+        startDate: [
+          { required: true, message: "开始时间不能为空", trigger: "blur" }
+        ],
+        endDate: [
+          { required: true, message: "结束时间不能为空", trigger: "blur" }
+        ],
+        title: [
+          { required: true, message: "标题不能为空", trigger: "blur" }
+        ],
+        visitObj: [
+          { required: true, message: "走访对象不能为空", trigger: "blur" }
+        ],
+        flowPeople: [
+          { required: true, message: "随行走访人不能为空", trigger: "blur" }
+        ],
+        picture: [
+          { required: true, message: "图片不能为空", trigger: "blur" }
+        ],
+        content: [
+          { required: true, message: "走访内容不能为空", trigger: "blur" }
+        ],
+        zfStatus: [
+          { required: true, message: "审核状态不能为空", trigger: "blur" }
+        ],
+        shRemark: [
+          { 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;
       listVisitrecard(this.queryParams).then(response => {
-        this.visitrecardList = response.rows;
+        this.list = response.rows;
         this.total = response.total;
         this.loading = false;
       });
@@ -429,6 +509,7 @@ export default {
               this.getList();
             });
           } else {
+            this.form.zfStatus = '0'
             addVisitrecard(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;