From ab701df859cd79ae036f8cc86268137d2c8da8ee Mon Sep 17 00:00:00 2001
From: guanqb <18720758508@163.com>
Date: Thu, 22 Feb 2024 18:00:56 +0800
Subject: [PATCH] 消防自查导出、消防自查和场所检查增加场所类别字段

---
 src/views/article/components/deitDiscussion.vue |   63 ++++++++++++++++++++++++-------
 1 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/src/views/article/components/deitDiscussion.vue b/src/views/article/components/deitDiscussion.vue
index 9c45f1e..abce4aa 100644
--- a/src/views/article/components/deitDiscussion.vue
+++ b/src/views/article/components/deitDiscussion.vue
@@ -41,7 +41,8 @@
     </el-dialog>
 
     <el-dialog title="" append-to-body :visible.sync="popupTableUserShow" width="80%" :before-close="userHandleClose">
-      <avue-crud :data="userData" :page="userPage" :option="userOption"></avue-crud>
+      <avue-crud :data="userData" :page="userPage" :option="userOption" @search-change="searchChange"
+        @search-reset="searchReset"></avue-crud>
     </el-dialog>
   </div>
 </template>
@@ -114,11 +115,17 @@
               prop: 'discussContent',
               type: 'input',
               row: true,
+              rules: [{
+                required: true,
+                message: '请输入议题',
+                trigger: 'blur'
+              }],
             },
             {
               label: '选项范围',
               prop: 'optionRange',
               type: 'radio',
+              value: 0,
               button: true,
               row: true,
               dicData: [{
@@ -127,14 +134,19 @@
               }, {
                 label: '单选',
                 value: 0
-              }]
+              }],
+              rules: [{
+                required: true,
+                message: '请选项范围',
+                trigger: 'blur'
+              }],
             },
-            {
-              label: '排序',
-              prop: 'sort',
-              controlsPosition: '',
-              type: 'number'
-            },
+            // {
+            //   label: '排序',
+            //   prop: 'sort',
+            //   controlsPosition: '',
+            //   type: 'number'
+            // },
             {
               label: '选项内容',
               prop: 'children',
@@ -193,18 +205,20 @@
           searchShow: true,
           searchMenuSpan: 3,
           // menuWidth: 500,
+          menu: false,
 
           height: "auto",
           calcHeight: 54,
           dialogWidth: 950,
           tip: false,
-          border: false,
+          border: true,
           //stripe:true,
           index: true,
           editBtn: false,
           addBtn: false,
           viewBtn: false,
           selection: true,
+          delBtn: false,
           excelBtn: true,
           dialogClickModal: false,
           column: [{
@@ -214,6 +228,8 @@
             search: true,
           }, {
             label: '头像',
+            type: 'upload',
+            listType: "picture-img",
             prop: 'avatar'
           }, {
             label: '手机',
@@ -244,6 +260,8 @@
           total: 0
         },
         query: {},
+        newData: {},
+        articleRange: {},
       }
     },
 
@@ -257,14 +275,22 @@
       },
 
       searchReset() {
-        this.query = {}
-        this.getUserPage(this.userPage)
+        if (this.articleRange) {
+          this.query.districtId = this.newData.articleRange
+        }
+        this.query.articleId = this.articleId
+        this.userPage.currentPage = 1
+        this.getUserPage(this.userPage, this.query)
       },
 
       searchChange(params, done) {
+        if (this.articleRange) {
+          this.query.districtId = this.newData.articleRange
+        }
         this.query = params
+        this.query.articleId = this.articleId
         this.userPage.currentPage = 1
-        this.getUserPage(this.userPage, params)
+        this.getUserPage(this.userPage, this.query)
         done()
       },
       initData(newData) {
@@ -273,6 +299,8 @@
         this.articleId = newData.id
         this.query.level = 1
         this.query.articleId = this.articleId
+        this.newData = newData
+        this.query.districtId = newData.articleRange
         this.onLoad(this.userPage, this.query)
       },
       // initData(newData) {
@@ -395,13 +423,20 @@
       openUser(row, type = 0) {
         this.popupTableUserShow = true
         this.query = {}
+        this.articleId = row.id
+        let districtId
         if (type == 0) {
+          this.newData = row
+          districtId = this.newData.articleRange
           this.userParams = {
-            articleId: row.id
+            articleId: row.id,
+            districtId: districtId
           }
         } else {
+          districtId = this.newData.articleRange
           this.userParams = {
-            topicsId: row.id
+            topicsId: row.id,
+            districtId: districtId
           }
         }
         this.getUserPage(this.userPage, this.userParams)

--
Gitblit v1.9.3