From c659f171b2dc87f99fd35689916a1160e870c27a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Wed, 20 Nov 2024 18:40:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=84=8F=E8=A7=81=E5=BE=81=E9=9B=86=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E5=88=A0=E5=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                           | 20 +++++++++++++-----
 .../modules/peopleOpinons/opinionsDaily.vue   | 13 +++++-------
 .../cpts/suggestionList.vue                   | 21 ++++++++-----------
 .../modules/solicitationSpecial/index.vue     | 16 +++++++++-----
 4 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index b46708be9..a74dd25ea 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -179,15 +179,25 @@ export const moduleRoutes = {
           },
         },
         {
-          path: "edit-resi",
+          path: "suggestionList",
           props: true,
-          name: "edit-resi",
-          component: () => import("@/views/components/editResi"),
+          name: "suggestionList",
+          component: () => import("@/views/modules/solicitationSpecial/cpts/suggestionList"),
             meta: {
               isTab: true,
-              title: "编辑居民",
+              title: "专题征集列表",
             },
-          }
+          },
+          {
+            path: "edit-resi",
+            props: true,
+            name: "edit-resi",
+            component: () => import("@/views/components/editResi"),
+              meta: {
+                isTab: true,
+                title: "编辑居民",
+              },
+            }
   ],
 };
 // pc端菜单的 如果没有配置 默认的 或者配置了默认的 但没有权限 默认选中第一
diff --git a/src/views/modules/peopleOpinons/opinionsDaily.vue b/src/views/modules/peopleOpinons/opinionsDaily.vue
index 54a128938..975b4abc9 100644
--- a/src/views/modules/peopleOpinons/opinionsDaily.vue
+++ b/src/views/modules/peopleOpinons/opinionsDaily.vue
@@ -9,14 +9,14 @@
                                 v-model.trim="formData.agencyId" :options="orgOptions" :props="orgOptionProps"
                                 :show-all-levels="false" @change="handleChangeAgency" clearable></el-cascader>
                         </el-form-item>
-                        <el-form-item label="征集领域" prop="typeCode" >
+                        <!-- <el-form-item label="征集领域" prop="typeCode" >
                             <el-select v-model="formData.typeCode" placeholder="请选择" class="u-item-width-normal">
                                 <el-option v-for="item in SpecialList" :key="item.value" :label="item.label" clearable
                                 :value="item.value"> 
                             </el-option>
                             </el-select>
                 
-                        </el-form-item>
+                        </el-form-item> -->
                         <el-form-item label="意见标题" prop="subjectTitle">
                             <el-input v-model.trim="formData.subjectTitle" class="u-item-width-normal" size="small"
                                 clearable placeholder="请输入">
@@ -84,12 +84,9 @@
 
                     <el-table-column prop="agencyName" align="center" label="所属组织" :show-overflow-tooltip="true">
                     </el-table-column>
-                    <el-table-column prop="typeCode" label="征集领域" min-width="140" align="center"
-                        :show-overflow-tooltip="true" />
-                    <!-- <template slot-scope="scope">
-                     {{ scope.row.firstName + '-' + scope.row.secondName }}
-                         </template>
-                         </el-table-column> -->
+                    <!-- <el-table-column prop="typeCode" label="征集领域" min-width="140" align="center"
+                        :show-overflow-tooltip="true" /> -->
+
                     <el-table-column prop="subjectTitle" label="意见标题" align="center" :show-overflow-tooltip="true">
                     </el-table-column>
                     <el-table-column prop="eventContent" label="意见内容" align="center" :show-overflow-tooltip="true">
diff --git a/src/views/modules/solicitationSpecial/cpts/suggestionList.vue b/src/views/modules/solicitationSpecial/cpts/suggestionList.vue
index 82aec627c..67f42adec 100644
--- a/src/views/modules/solicitationSpecial/cpts/suggestionList.vue
+++ b/src/views/modules/solicitationSpecial/cpts/suggestionList.vue
@@ -9,14 +9,14 @@
                                 v-model.trim="formData.agencyId" :options="orgOptions" :props="orgOptionProps"
                                 :show-all-levels="false" @change="handleChangeAgency" clearable></el-cascader>
                         </el-form-item>
-                        <el-form-item label="征集领域" prop="typeCode" >
+                        <!-- <el-form-item label="征集领域" prop="typeCode" >
                             <el-select v-model="formData.typeCode" placeholder="请选择" class="u-item-width-normal">
                                 <el-option v-for="item in SpecialList" :key="item.value" :label="item.label" clearable
                                 :value="item.value"> 
                             </el-option>
                             </el-select>
                 
-                        </el-form-item>
+                        </el-form-item> -->
                         <el-form-item label="意见标题" prop="subjectTitle">
                             <el-input v-model.trim="formData.subjectTitle" class="u-item-width-normal" size="small"
                                 clearable placeholder="请输入">
@@ -82,15 +82,15 @@
                     <el-table-column label="" fixed="left" type="selection" align="center" width="50" />
                     <!-- <el-table-column label="序号" fixed="left" type="index" align="center" width="50" /> -->
 
-                    <el-table-column prop="agencyName" align="center" label="所属组织" :show-overflow-tooltip="true">
-                    </el-table-column>
-                    <el-table-column prop="typeCode" label="征集领域" min-width="140" align="center"
-                        :show-overflow-tooltip="true" />
+                    <!-- <el-table-column prop="agencyName" align="center" label="所属组织" :show-overflow-tooltip="true">
+                    </el-table-column> -->
+                    <!-- <el-table-column prop="typeCode" label="征集领域" min-width="140" align="center"
+                        :show-overflow-tooltip="true" /> -->
                     <!-- <template slot-scope="scope">
                      {{ scope.row.firstName + '-' + scope.row.secondName }}
                          </template>
                          </el-table-column> -->
-                    <el-table-column prop="subjectTitle" label="意见标题" align="center" :show-overflow-tooltip="true">
+                    <el-table-column prop="subjectTitle" label="所属专题" align="center" :show-overflow-tooltip="true">
                     </el-table-column>
                     <el-table-column prop="eventContent" label="意见内容" align="center" :show-overflow-tooltip="true">
                     </el-table-column>
@@ -131,7 +131,7 @@
                     <el-table-column fixed="right" label="操作" align="center" width="200px" prop="status">
                         <template slot-scope="scope">
                             <el-button @click="handleDispose(scope.row,'dispose')" type="text" size="small"
-                            >办理</el-button>
+                            >转办</el-button>
                             <el-button @click="handleDel(scope.row,'info')" type="text" size="small"
                                 >删除</el-button>
                         </template>
@@ -429,10 +429,7 @@ export default {
         },
     },
     mounted() {
-        console.log(this.optionDate.id,"sdflkjsdlkfjkls");
-        this.formData.specialSubjectId=this.optionDate.id
-        console.log(this.formData.specialSubjectId,"sdglk;jsdljgk");
-        
+        this.formData.specialSubjectId=  this.$route.query.id
         this.user = this.$store.state.user;
         this.formData.agencyId = this.user.agencyId;
         this.getOrgTreeList()
diff --git a/src/views/modules/solicitationSpecial/index.vue b/src/views/modules/solicitationSpecial/index.vue
index 982895c05..67f3f094d 100644
--- a/src/views/modules/solicitationSpecial/index.vue
+++ b/src/views/modules/solicitationSpecial/index.vue
@@ -10,7 +10,7 @@
                                 :show-all-levels="false" @change="handleChangeAgency" clearable></el-cascader>
                         </el-form-item>
                             <el-form-item label="征集领域" prop="typeCode" >
-                            <el-select v-model="formData.typeCode" placeholder="请选择" class="u-item-width-normal">
+                            <el-select v-model="formData.typeCode" placeholder="请选择" class="u-item-width-normal" clearable>
                                 <el-option v-for="item in SpecialList" :key="item.value" :label="item.label" clearable
                                 :value="item.value">
                             </el-option>
@@ -401,11 +401,17 @@ export default {
             }
         },
         onClickOpinion(row,type){
-            console.log(row,type,"sdfkljdslf");
-            this.optionDate={},
-            this.optionDate=row
+            this.$router.push({
+                name: "suggestionList", query: {
+                    id: row.id,
+                
+                }
+            });
+            // console.log(row,type,"sdfkljdslf");
+            // this.optionDate={},
+            // this.optionDate=row
             
-            this.showType=type
+            // this.showType=type
             
 
         },