diff --git a/src/views/modules/peopleOpinons/cpts/eventDetail.vue b/src/views/modules/peopleOpinons/cpts/eventDetail.vue
index 3535705e9..6c8b231ec 100644
--- a/src/views/modules/peopleOpinons/cpts/eventDetail.vue
+++ b/src/views/modules/peopleOpinons/cpts/eventDetail.vue
@@ -7,7 +7,7 @@
             </h3>
             <div class="m-detail-main">
                 <div class="m-info">
-                    <!-- <div :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' }]">
+                    <div :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' }]">
                         <span class="u-info-title-2">所属网格：</span>
                         <template v-if="!info.gridName">
                             <el-select v-model.trim="info.gridId" placeholder="请选择" clearable class="cell-width-1">
@@ -19,7 +19,7 @@
                         <template v-else>
                             <span>{{ info.gridName|| info.agencyName }}</span>
                         </template>
-                    </div> -->
+                    </div>
                     <div :class="[
                         'm-info-prop',
                         { 'm-info-prop-vis': source === 'visiual' },
@@ -107,7 +107,8 @@
                     ]">
                         <span class="u-info-title-2">选为"金点子"建议:</span>
                         <!-- <span>{{info.goldenIdeaFlag==1?'是':'否'}}</span> -->
-                        <el-switch v-model="info.goldenIdeaFlag" active-color="#13ce66" inactive-color="#ff4949" @change="sendValue">
+                        <el-switch v-model="info.goldenIdeaFlag" :active-value=1 :inactive-value=0
+                            active-color="#13ce66" inactive-color="#ff4949" @change="sendValue">
                         </el-switch>
 
                     </div>
@@ -116,16 +117,16 @@
                         { 'm-info-prop-vis': source === 'visiual' },
                     ]">
                         <span class="u-info-title-2">办理前：</span>
-                        <img :src="imageUrl" :key="src" style="width: 150px; height: 150px; padding-right: 10px"
-                            v-for="src in info.imageList" @click="watchImg(src)" />
+                        <img :src="src" :key="src" style="width: 60px; height: 60px; padding-right: 10px"
+                            v-for="src in info.dealBeforeImageList" @click="watchImg(src)" />
                     </div>
                     <div :class="[
                         'm-info-prop',
                         { 'm-info-prop-vis': source === 'visiual' },
                     ]">
                         <span class="u-info-title-2">办理后</span>
-                        <img :src="src" :key="src" style="width: 150px; height: 150px; padding-right: 10px"
-                            v-for="src in info.imageList" @click="watchImg(src)" />
+                        <img :src="src" :key="src" style="width: 60px; height: 60px; padding-right: 10px"
+                            v-for="src in info.dealLateImageList" @click="watchImg(src)" />
                     </div>
                     <!-- <div v-if="info.operationType === '1'" :class="[
                         'm-info-prop',
@@ -189,6 +190,8 @@ function iniData() {
         satisfyLevel: "",
         //满意度评价
         showSatisfy: false,
+        gridList: [], //所属网格list--场所区域
+        agencyId: '',
     };
 }
 
@@ -226,7 +229,9 @@ export default {
 
 
     watch: {},
-    created() { },
+    created() {
+
+     },
     computed: {
         containerStyle() {
             if (this.type === 'info') {
@@ -244,6 +249,7 @@ export default {
         this.user = this.$store.state.user;
         if (this.eventId) {
             this.info = JSON.parse(JSON.stringify(this.eventDetailData));
+            this.agencyId = this.info.agencyId
         }
         this.$EventBus.$on('handelInputEventContent', ({ type, value }) => {
             if (type === 'opinion') {
@@ -252,9 +258,23 @@ export default {
                 this.info.handlingReq = value;
             }
         })
+        this.loadGrid()
     },
 
     methods: {
+        async loadGrid() {
+            const url = "/gov/org/customergrid/gridoption";
+            let params = {
+                agencyId: this.agencyId,
+                purpose: "query",
+            };
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.gridList = data;
+            } else {
+                this.$message.error(msg);
+            }
+        },
         sendValue(){
             this.$emit('update-value', this.info); // 触发事件并传递值
         },
diff --git a/src/views/modules/peopleOpinons/cpts/eventInfo.vue b/src/views/modules/peopleOpinons/cpts/eventInfo.vue
index 0250c4410..a239722eb 100644
--- a/src/views/modules/peopleOpinons/cpts/eventInfo.vue
+++ b/src/views/modules/peopleOpinons/cpts/eventInfo.vue
@@ -87,14 +87,14 @@
                                         </div>
                                         <template v-if="item.internalFile && item.internalFile.length > 0"
                                             v-for="i in item.internalFile">
-                                            <template v-if="i.type === 'image'">
+                                            <template v-if="i.attachmentType === 'image'">
                                                 <div class="detail">
                                                     <div class="detail-field">图片：</div>
                                                     <div
                                                         :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]">
-                                                        <img :src="i.url" :key="i.url"
+                                                        <img :src="i.attachmentUrl" :key="i.attachmentUrl"
                                                             style="width: 50px; height: 50px; padding-right: 10px"
-                                                            @click="watchImg(i.url)" />
+                                                            @click="watchImg(i.attachmentUrl)" />
                                                     </div>
                                                 </div>
                                             </template>
@@ -436,6 +436,7 @@ export default {
                 this.formData.operationType = this.$refs.ref_processinfo_dispose.operationType;
                 this.replayInfo = this.$refs.ref_processinfo_dispose.replayInfo;
                 this.replayInfo.icEventId = this.eventId;
+                this.replayInfo.eventId = this.eventId;
                 await this.submitDispose('/governance/icEventOld/reply', this.replayInfo);
  
             } else {
@@ -443,7 +444,8 @@ export default {
             }
         },
         async submitDispose(url, params) {
-            console.log(params);
+            console.log(params,"lknnkjk");
+  
             const { data, code, msg } = await requestPost(url, {
                 ...params,
             });
@@ -456,13 +458,14 @@ export default {
                 this.$message.error(msg);
             }
         },
+        
 
         async icEventOldupdate(url) {
             console.log("sdfl;sdm.fm ",this.eventId);
             
             const params={
                 goldenIdeaFlag:this.goldenIdeaFlag,
-                id:this.newgoldList.icEventId
+                icEventId:this.newgoldList.icEventId
             }
             const { data, code, msg } = await requestPost(url, params);
             if (code === 0) {
diff --git a/src/views/modules/peopleOpinons/opinionsDaily.vue b/src/views/modules/peopleOpinons/opinionsDaily.vue
index 8bc04a6d2..25a147dbd 100644
--- a/src/views/modules/peopleOpinons/opinionsDaily.vue
+++ b/src/views/modules/peopleOpinons/opinionsDaily.vue
@@ -4,29 +4,26 @@
             <div class="m-search">
                 <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'120px'">
                     <div>
-                        <el-form-item label="所属组织" prop="departId">
+                        <el-form-item label="所属组织" prop="agencyId">
                             <el-cascader class="u-item-width-normal" size="small" ref="myCascader"
-                                v-model.trim="formData.departId" :options="orgOptions" :props="orgOptionProps"
+                                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="firstIdList">
-                            <el-cascader ref="cascaderEvent" v-model.trim="formData.firstIdList" :options="cateOptions"
-                                collapse-tags :show-all-levels="false" :props="{
-                                    multiple: true,
-                                    checkStrictly: true,
-                                    emitPath: false,
-                                    children: 'children',
-                                    label: 'categoryName',
-                                    value: 'id',
-                                }" clearable class="u-item-width-normal" />
+                        <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 label="意见标题" prop="workOrderNum">
-                            <el-input v-model.trim="formData.workOrderNum" class="u-item-width-normal" size="small"
+                        <el-form-item label="意见标题" prop="subjectTitle">
+                            <el-input v-model.trim="formData.subjectTitle" class="u-item-width-normal" size="small"
                                 clearable placeholder="请输入">
                             </el-input>
                         </el-form-item>
-                        <el-form-item label="提交人姓名" prop="mobile">
-                            <el-input v-model.trim="formData.mobile" class="u-item-width-normal" size="small" clearable
+                        <el-form-item label="提交人姓名" prop="name">
+                            <el-input v-model.trim="formData.name" class="u-item-width-normal" size="small" clearable
                                 placeholder="请输入">
                             </el-input>
                         </el-form-item>
@@ -35,29 +32,29 @@
                                 placeholder="请输入">
                             </el-input>
                         </el-form-item>
-                        <el-form-item label="是否愿意公开" prop="operationType">
-                            <el-select v-model.trim="formData.operationType" clearable class="u-item-width-normal">
+                        <el-form-item label="是否愿意公开" prop="openFlag">
+                            <el-select v-model.trim="formData.openFlag" clearable class="u-item-width-normal">
                                 <el-option v-for="item in openList" :key="item.value" :label="item.label"
                                     :value="item.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item label="是否设为金点子" prop="deliveryStatus">
-                            <el-select v-model.trim="formData.goldenIdea" clearable class="u-item-width-normal">
-                                <el-option v-for="item in openList" :key="item.value" :label="item.label"
+                        <el-form-item label="是否设为金点子" prop="goldenIdeaFlag">
+                            <el-select v-model.trim="formData.goldenIdeaFlag" clearable class="u-item-width-normal">
+                                <el-option v-for="item in goldListType" :key="item.value" :label="item.label"
                                     :value="item.value">
                                 </el-option>
                             </el-select>
                         </el-form-item>
-                 
-                
-                        <el-form-item label="提交时间" prop="limitEndTime">
-                            <el-date-picker v-model.trim="formData.limitStartTime" class="u-item-width-daterange"
+
+
+                        <el-form-item label="提交时间" prop="startSubmitTime">
+                            <el-date-picker v-model.trim="formData.startSubmitTime" class="u-item-width-daterange"
                                 size="small" type="date" value-format="yyyy-MM-dd HH:mm:ss" value="yyyy-MM-dd"
                                 placeholder="开始时间">
                             </el-date-picker>
                             <span class="u-data-tag">至</span>
-                            <el-date-picker v-model.trim="formData.limitEndTime"
+                            <el-date-picker v-model.trim="formData.endSubmitTime"
                                 class="u-item-width-daterange u-data-tag" size="small" type="date"
                                 value-format="yyyy-MM-dd HH:mm:ss" value="yyyy-MM-dd" placeholder="结束时间">
                             </el-date-picker>
@@ -78,7 +75,7 @@
                 <div class="div_btn">
 
                     <el-button @click="handleExport" class="diy-button--white" size="small">导出</el-button>
-                  
+
                 </div>
                 <el-table :data="tableData" border class="m-table-item" style="width: 100%"
                     @selection-change="handleSelectionChange" :height="maxTableHeight">
@@ -117,14 +114,14 @@
                     <el-table-column prop="openFlag" align="center" width="110" label="是否愿意公开"
                         :show-overflow-tooltip="true">
                         <template slot-scope="scope">
-                            <span v-if="scope.row.openFlag === 0"  style="color: #ff6600;">否</span>
+                            <span v-if="scope.row.openFlag === 0" style="color: #ff6600;">否</span>
                             <span v-else-if="scope.row.openFlag ===1">是</span>
                         </template>
                     </el-table-column>
                     <el-table-column prop="goldenIdeaFlag" align="center" width="110" label="是否金点子建议"
                         :show-overflow-tooltip="true">
                         <template slot-scope="scope">
-                            <span v-if="scope.row.goldenIdeaFlag === 0"  style="color: #ff6600;">否</span>
+                            <span v-if="scope.row.goldenIdeaFlag === 0" style="color: #ff6600;">否</span>
                             <span v-else-if="scope.row.goldenIdeaFlag ===1">是</span>
                         </template>
                     </el-table-column>
@@ -133,10 +130,9 @@
                     </el-table-column>
                     <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 @click="handleDispose(scope.row,'info')" type="text" size="small"
-                                >删除</el-button>
+                            <el-button @click="handleDispose(scope.row,'dispose')" type="text"
+                                size="small">办理</el-button>
+                            <el-button @click="handleDispose(scope.row,'info')" type="text" size="small">删除</el-button>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -214,6 +210,7 @@ export default {
         };
 
         let orgOptionProps = {
+            emitPath: false,
             multiple: false,
             value: 'agencyId',
             label: 'agencyName',
@@ -222,6 +219,24 @@ export default {
         }
 
         return {
+            formData: {
+                openFlag:"",
+                publicationPeople:"",
+                typeCode:"",
+                demandType: "",
+                name: "",
+                mobile: "",
+                eventContent: "",
+                operationType: 4,
+                openFlag: "",
+                specialSubjectId: "",
+                subjectTitle: "",
+                goldenIdeaFlag: "",
+                agencyId: "",
+                clientType: "web",
+                startSubmitTime:"",
+                endSubmitTime:""
+            },
             pageType: "list", // 列表list 新增add  处理dispose 详情info
             user: {},
             agencyId: "",
@@ -236,11 +251,21 @@ export default {
             openList:[
             {
                     value: 0,
-                    label: "已催办",
+                    label: "否",
                 },
                 {
                     value: 1,
-                    label: "未催办",
+                    label: "是",
+                },
+            ],
+            goldListType:[
+            {
+                    value: 0,
+                    label: "否",
+                },
+                {
+                    value: 1,
+                    label: "是",
                 },
             ],
             statusArray: [
@@ -330,24 +355,12 @@ export default {
                 {label:'违章拉客',value:'0'},
                 {label:'违章停车',value:'1'}
             ],
-            formData: {
-                demandType: "",
-                name: "",
-                mobile: "",
-                eventContent: "",
-                operationType: 4,
-                openFlag: "",
-                specialSubjectId: "",
-                subjectTitle: "",
-                goldenIdeaFlag: "",
-                agencyId: "",
-                clientType: "web"
-            },
+    
             cateOptions: [],
             optionProps: {
                 multiple: true,
                 checkStrictly: false,
-                emitPath: false,
+                emitPath: true,
                 children: 'children',
                 label: 'categoryName',
                 value: 'id',
@@ -363,7 +376,7 @@ export default {
                 disabledDate: startDisabledDate,
             },
             eventId: "",
-
+            SpecialList:[],
             searchH: 180,
 
             eventDetailData: {},
@@ -398,12 +411,27 @@ export default {
     mounted() {
         this.user = this.$store.state.user;
         this.agencyId = this.user.agencyId;
-        // this.getOrgTreeList()
+        this.getOrgTreeList()
         // this.getGridList()
         this.getTableData();
         this.getCateOptions();
+        this.getSpecialList()
     },
     methods: {
+        //获取征集领域字典
+        async getSpecialList() {
+            const url = "/sys/dict/data/dictlist";
+
+            const { data, code, msg } = await requestPost(url, {
+                dictType: "solicitation_fields",
+            });
+
+            if (code === 0) {
+                this.SpecialList = data || [];
+            } else {
+                this.$message.error(msg);
+            }
+        },
         handleEventType(val) {
             const nodes = this.$refs.cascaderEvent.getCheckedNodes();
             this.formData.firstIdList = [];
@@ -597,6 +625,7 @@ export default {
             const url = "/governance/icEventOld/detail";
             const { data, code, msg } = await requestPost(url, {
                 icEventId: this.eventId,
+                specialSubjectId:""
             });
             if (code === 0) {
                 this.eventDetailData = { ...data };
@@ -780,7 +809,6 @@ export default {
                 if (res.code !== 0) {
                     return this.$message.error(res.msg)
                 } else {
-                   
                     this.orgOptions = []
                     this.orgOptions.push(res.data)
                 }
@@ -806,15 +834,16 @@ export default {
         },
 
         handleChangeAgency (val) {
-
-            this.sarr = []
-            const map = new Map();
-            this.getLastItem(
-            this.orgOptions,
-            val,
-            "agencyId"
-            );
-            this.level = this.sarr[this.sarr.length - 1].level
+            console.log(val,"DFLKSJFKL");
+            
+            // this.sarr = []
+            // const map = new Map();
+            // this.getLastItem(
+            // this.orgOptions,
+            // val,
+            // "agencyId"
+            // );
+            // this.level = this.sarr[this.sarr.length - 1].level
         },
         getLastItem (list, vals, key) {
             let LIST = list || [];
diff --git a/src/views/modules/solicitationSpecial/cpts/add.vue b/src/views/modules/solicitationSpecial/cpts/add.vue
index e8969c921..cf7f95402 100644
--- a/src/views/modules/solicitationSpecial/cpts/add.vue
+++ b/src/views/modules/solicitationSpecial/cpts/add.vue
@@ -1,48 +1,65 @@
 <template>
     <div>
-       <div class="dialog-h-content scroll-h">
-          <el-form ref="ref_form" :inline="true" :model="formData" :rules="dataRule" 
-             class="form">
-             <el-row>
-          <el-col :span="12">
-                 <el-form-item label="专题标题" prop="subjectTitle" label-width="150px">
-                <el-input v-model.trim="formData.subjectTitle" size="small" clearable placeholder="请输入活动名称"
-                   class="u-item-width-normal"></el-input>
-             </el-form-item>
-                 </el-col>
-            <el-col :span="12">
-                <el-form-item label-width="150px" label="征集领域" prop="typeCode">
-                        <el-select v-model="formData.typeCode" placeholder="请选择" clearable>
-                            <el-option v-for="item in SpecialList" :key="item.value" :label="item.label"
-                                :value="item.value">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-          </el-col>
-            <el-col :span="24">
-            <el-form-item label="专题内容" prop="subjectContent" style="display: block"  label-width="150px"> 
-              <div class="item_width_1">
-                <Tinymce class="tinymce_view " v-model.trim="formData.subjectContent" :height="180" placeholder="请输入活动内容" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-          <el-form-item  label="开始征集
+        <div class="dialog-h-content scroll-h">
+            <el-form ref="ref_form" :inline="true" :model="formData" :rules="dataRule" class="form">
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="专题标题" prop="subjectTitle" label-width="150px">
+                            <el-input v-model.trim="formData.subjectTitle" size="small" clearable placeholder="请输入活动名称"
+                                class="u-item-width-normal"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label-width="150px" label="征集领域" prop="typeCode">
+                            <el-select v-model="formData.typeCode" placeholder="请选择" clearable>
+                                <el-option v-for="item in SpecialList" :key="item.value" :label="item.label"
+                                    :value="item.value">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <el-form-item label="封面图片" label-width="150px" prop="fileList">
+                            <template>
+                                <!-- <upload-image :defaultFileList="fileList" :limit="3" @change="onChangeFileList"
+                                 @file-removed="removedImg"></upload-image> -->
+                                <el-upload :headers="$getElUploadHeaders()" :data="{ customerId: customerId }"
+                                    :action="uploadUrl" list-type="picture-card" :show-file-list="true" :drag="true"
+                                    :file-list="formData.attachmentList" :on-exceed="handleImgExceed" :limit="3"
+                                    :before-upload="beforeImgUpload" :on-preview="handleImgPreview"
+                                    :on-remove="handleImgRemove" :on-success="handleImgSuccess">
+                                    <template v-if="formData.attachmentList.length < 3">
+                                        <i class="el-icon-plus"></i>
+                                    </template>
+                                    <!-- <i v-if="showAttach" class="el-icon-plus"></i> -->
+                                </el-upload>
+                            </template>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <el-form-item label="专题内容" prop="subjectContent" style="display: block" label-width="150px">
+                            <div class="item_width_1">
+                                <Tinymce class="tinymce_view " v-model.trim="formData.subjectContent" :height="180"
+                                    placeholder="请输入活动内容" />
+                            </div>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <el-form-item label="开始征集
           " style="display: block" prop="peopleCount" label-width="150px">
-              <el-switch v-model="formData.status" :active-value="0" :inactive-value="1"
-                @change="handleSwitchChange"></el-switch>
-            </el-form-item>
-        </el-col>
-          </el-row></el-form>
-       </div>
-       <div class="div_btn">
-          <el-button size="small" @click="handleCancle">取 消</el-button>
-          <el-button size="small" type="primary" :disabled="btnDisable"
-             @click="handleComfirm">确 定</el-button>
- 
-       </div>
+                            <el-switch v-model="formData.status" :active-value="0" :inactive-value="1"
+                                @change="handleSwitchChange"></el-switch>
+                        </el-form-item>
+                    </el-col>
+                </el-row></el-form>
+        </div>
+        <div class="div_btn">
+            <el-button size="small" @click="handleCancle">取 消</el-button>
+            <el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm">确 定</el-button>
+
+        </div>
     </div>
- </template>
+</template>
  
  <script>
  import { mapGetters } from 'vuex'
@@ -64,6 +81,8 @@
     data() {
  
         return {
+            attachmentList: [],//活动照片
+            fileList:[],
             SpecialList: [
                     { value: 0, label: "消息发布" },
                     { value: 1, label: "志愿风采" },
@@ -75,17 +94,90 @@
                 typeCode:"",
                 status:"0",
                 id:"",
+                attachmentList:[]
                 },
+    uploadUrl: `${window.SITE_CONFIG['apiURL']}/oss/file/uploadqrcodeV2`,
+    customerId: localStorage.getItem('customerId'),
+    
         }
         
     },
  
     components: { Tinymce, UploadImage },
     mounted() {
+
      this.getSpecialList()
     },
  
     methods: {
+        // 上传前的验证
+        beforeImgUpload(file) {
+            // const isLt1M = file.size / 1024 / 1024 < 10;
+            // const srcType = file.type;
+            // const format = file.name.split('.').pop();
+            // if (!isLt1M) {
+            //     this.$message.error('上传文件大小不能超过 10MB!');
+            //     return false;
+            // }
+            // if (srcType.indexOf('image') == -1) {
+            //     this.$message.error('仅限图片格式');
+            //     return false;
+            // }
+            // return true;
+        },
+        // 文件数量超过限制
+        handleImgExceed() {
+            this.$message({
+                type: 'warning',
+                message: '文件数量最多不超过一个'
+            });
+      
+
+        },
+        // 删除图片
+        handleImgRemove(file) {
+            console.log('handleImgRemove', file);
+            if (file.response) {
+                let index =this.formData.attachmentList.findIndex(item => item.url == file.response.data.url);
+                this.formData.attachmentList.splice(index, 1);
+            } else if (file.url) {
+                let index = this.formData.attachmentList.findIndex(item => item.url == file.url);
+                this.formData.attachmentList.splice(index, 1);
+            }
+            console.log(this.formData.attachmentList,"sdjflskdfjklds");
+            
+        },
+          // 上传成功
+          handleImgSuccess(res, file, fileList) {
+            console.log(res,file,fileList,"dsfkljsdklfj");
+            
+            if (res.code === 0 && res.msg === 'success') {
+                // let format = file.name.split('.').pop();
+                // let srcType = file.raw.type;
+                // let type = 'file';
+                // if (srcType.indexOf('image') != -1) {
+                //     type = 'image';
+                // } else if (srcType.indexOf('video') != -1) {
+                //     type = 'video';
+                // }
+                this.formData.attachmentList.push(res.data.url);
+                console.log(  this.formData.attachmentList,":sdfkjslk");
+                if(this.formData.attachmentList.length>=3){
+                    const element = document.querySelector('.el-upload--picture-card'); // 选择第一个匹配的元素
+                    if (element) {
+                        element.style.display = 'none';
+            }
+                }
+                
+            } else {
+                this.$message.error(res.msg);
+            }
+        },
+          // 图片预览
+          handleImgPreview(file) {
+            console.log(file);
+            window.open(file.url || file.response.data.url);
+        },
         //获取征集领域字典
         async getSpecialList() {
       const url = "/sys/dict/data/dictlist";
@@ -149,10 +241,10 @@
               return;
            }
  
-           if (!this.formData.status) {
-              this.$message.error('请选择状态');
-              return;
-           }
+        //    if (!this.formData.status) {
+        //       this.$message.error('请选择状态');
+        //       return;
+        //    }
  
            console.log(this.formData,"this.formData");
            this.addSpecial()
@@ -229,6 +321,19 @@
  @import "@/assets/scss/modules/visual/communityManageForm.scss";
  </style>
  <style lang="scss" scoped>
+/deep/ .el-upload--picture-card {
+    width: 60px;
+    height: 60px;
+    line-height: 70px;
+}
+/deep/ .el-upload-list--picture-card .el-upload-list__item  {
+    width: 60px;
+    height: 60px;
+}
+/deep/ .el-upload-dragger{
+    width: 60px;
+    height: 60px;
+}
  .item_width_1 {
     width: 634px;
  
diff --git a/src/views/modules/solicitationSpecial/cpts/suggestionList.vue b/src/views/modules/solicitationSpecial/cpts/suggestionList.vue
new file mode 100644
index 000000000..8b9763258
--- /dev/null
+++ b/src/views/modules/solicitationSpecial/cpts/suggestionList.vue
@@ -0,0 +1,941 @@
+<template>
+    <div class="g-main">
+        <div v-show="pageType == 'list'">
+            <div class="m-search">
+                <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'120px'">
+                    <div>
+                        <el-form-item label="所属组织" prop="agencyId">
+                            <el-cascader class="u-item-width-normal" size="small" ref="myCascader"
+                                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-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 label="意见标题" prop="subjectTitle">
+                            <el-input v-model.trim="formData.subjectTitle" class="u-item-width-normal" size="small"
+                                clearable placeholder="请输入">
+                            </el-input>
+                        </el-form-item>
+                        <el-form-item label="提交人姓名" prop="name">
+                            <el-input v-model.trim="formData.name" class="u-item-width-normal" size="small" clearable
+                                placeholder="请输入">
+                            </el-input>
+                        </el-form-item>
+                        <el-form-item label="报件人电话" prop="mobile">
+                            <el-input v-model.trim="formData.mobile" class="u-item-width-normal" size="small" clearable
+                                placeholder="请输入">
+                            </el-input>
+                        </el-form-item>
+                        <el-form-item label="是否愿意公开" prop="openFlag">
+                            <el-select v-model.trim="formData.openFlag" clearable class="u-item-width-normal">
+                                <el-option v-for="item in openList" :key="item.value" :label="item.label"
+                                    :value="item.value">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label="是否设为金点子" prop="goldenIdeaFlag">
+                            <el-select v-model.trim="formData.goldenIdeaFlag" clearable class="u-item-width-normal">
+                                <el-option v-for="item in goldListType" :key="item.value" :label="item.label"
+                                    :value="item.value">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+
+
+                        <el-form-item label="提交时间" prop="startSubmitTime">
+                            <el-date-picker v-model.trim="formData.startSubmitTime" class="u-item-width-daterange"
+                                size="small" type="date" value-format="yyyy-MM-dd HH:mm:ss" value="yyyy-MM-dd"
+                                placeholder="开始时间">
+                            </el-date-picker>
+                            <span class="u-data-tag">至</span>
+                            <el-date-picker v-model.trim="formData.endSubmitTime"
+                                class="u-item-width-daterange u-data-tag" size="small" type="date"
+                                value-format="yyyy-MM-dd HH:mm:ss" value="yyyy-MM-dd" placeholder="结束时间">
+                            </el-date-picker>
+                        </el-form-item>
+                        <el-row>
+                            <el-col :span="24" align="right">
+                                <el-button style="margin-left: 30px" size="small" type="primary "
+                                    @click="handleSearch">查询</el-button>
+                                <el-button style="margin-left: 10px" size="small" class="diy-button--white"
+                                    @click="resetSearch">重置</el-button>
+                            </el-col>
+                        </el-row>
+                    </div>
+                </el-form>
+            </div>
+
+            <div class="m-table">
+                <div class="div_btn">
+
+                    <el-button @click="handleExport" class="diy-button--white" size="small">导出</el-button>
+                  
+                </div>
+                <el-table :data="tableData" border class="m-table-item" style="width: 100%"
+                    @selection-change="handleSelectionChange" :height="maxTableHeight">
+                    <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" />
+                    <!-- <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>
+                    <el-table-column prop="eventContent" label="意见内容" align="center" :show-overflow-tooltip="true">
+                    </el-table-column>
+                    <el-table-column prop="name" label="提交人" align="center" :show-overflow-tooltip="true">
+                    </el-table-column>
+                    <el-table-column prop="mobile" align="center" width="110" label="提交人电话">
+                        <!-- <template slot-scope="scope">
+                            <el-button
+                                v-if="scope.row.reportUserId !== null && scope.row.reportUserId !== ''"
+                                @click="handleLook(scope.row)"
+                                type="text"
+                                size="small"
+                            >
+                                {{ scope.row.phone }}
+                            </el-button>
+                            <span v-else>
+                                {{ scope.row.phone }}
+                            </span>
+                        </template> -->
+                    </el-table-column>
+                    <el-table-column prop="openFlag" align="center" width="110" label="是否愿意公开"
+                        :show-overflow-tooltip="true">
+                        <template slot-scope="scope">
+                            <span v-if="scope.row.openFlag === 0"  style="color: #ff6600;">否</span>
+                            <span v-else-if="scope.row.openFlag ===1">是</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="goldenIdeaFlag" align="center" width="110" label="是否金点子建议"
+                        :show-overflow-tooltip="true">
+                        <template slot-scope="scope">
+                            <span v-if="scope.row.goldenIdeaFlag === 0"  style="color: #ff6600;">否</span>
+                            <span v-else-if="scope.row.goldenIdeaFlag ===1">是</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="submitTime" align="center" width="110" label="提交时间"
+                        :show-overflow-tooltip="true">
+                    </el-table-column>
+                    <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 @click="handleDispose(scope.row,'info')" type="text" size="small"
+                                >删除</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <div>
+                    <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                        :current-page.sync="pageNo" :page-sizes="[20, 50, 100, 200]" :page-size="parseInt(pageSize)"
+                        layout="sizes, prev, pager, next, total" :total="total">
+                    </el-pagination>
+                </div>
+            </div>
+        </div>
+        <div v-if="pageType == 'dispose' || pageType == 'info' || pageType == 'add'">
+            <event-info ref="eleEditForm" :pageType="pageType" :eventId="eventId" :eventDetailData="eventDetailData"
+                @handleClose="handleClose" @handleOk="handleOk" @dialogOk="handleEditSuccess" />
+        </div>
+
+        <el-dialog :title="'播放语音'" :visible.sync="showVoice" width="40%" top="5vh" append-to-body class="dialog-h"
+            :close-on-click-modal="false">
+            <div class="dialog-h-content scroll-h">
+                <div style="display: flex; justify-content: center; margin: 50px">
+                    <audio controls>
+                        <source :src="selVoiceUrl" type="" />
+                    </audio>
+                </div>
+            </div>
+
+            <div class="resi-btns">
+                <el-button size="small" @click="showVoice = false">取消</el-button>
+            </div>
+        </el-dialog>
+        <el-dialog :title="'催办'" :visible.sync="showSupervise" width="40%" top="5vh" append-to-body class="dialog-h"
+            :close-on-click-modal="false">
+            <el-form :model="superviseFrom" ref="superviseFrom">
+                <el-form-item label="催办说明" prop="content">
+                    <el-input v-model.trim="superviseFrom.content" class="cell-width-2" type="textarea" maxlength="500"
+                        show-word-limit :rows="5" placeholder="请填写催办说明，不超过500字"></el-input>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="showSupervise = false">取 消</el-button>
+                <el-button type="primary" @click="doSuperviseEvent">确 定</el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import { requestPost } from "@/js/dai/request";
+import nextTick from "dai-js/tools/nextTick";
+import { mapGetters } from "vuex";
+import eventInfo from "../../peopleOpinons/cpts/eventInfo.vue";
+import axios from "axios";
+
+export default {
+    props: {
+    message: {
+      type: String,
+      required: true
+    },
+    optionDate: {
+      type: Object,
+      required: true
+    }
+  },
+    components: { eventInfo },
+    data() {
+        let endDisabledDate = (time) => {
+            //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+            let nowData = Date.now();
+            if (this.formData.startTime) {
+                let startTime = new Date(this.formData.startTime);
+                return (
+                    time.getTime() > nowData ||
+                    time.getTime() < startTime ||
+                    time.getTime() === startTime
+                );
+            } else {
+                return time.getTime() > nowData;
+            }
+        };
+        let startDisabledDate = (time) => {
+            //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+            let nowData = Date.now();
+            return time.getTime() > nowData;
+        };
+
+        let orgOptionProps = {
+            emitPath: false,
+            multiple: false,
+            value: 'agencyId',
+            label: 'agencyName',
+            children: 'subAgencyList',
+            checkStrictly: true
+        }
+
+        return {
+            pageType: "list", // 列表list 新增add  处理dispose 详情info
+            user: {},
+            agencyId: "",
+            gridList: [], //所属网格list--场所区域
+            tableData: [],
+            online: 0,
+            orgOptions: [],
+            orgOptionProps,
+            level: '',
+            optionsG: [],
+            sarr: [],
+            openList:[
+            {
+                    value: 0,
+                    label: "已催办",
+                },
+                {
+                    value: 1,
+                    label: "未催办",
+                },
+            ],
+            statusArray: [
+                {
+                    value: "processing",
+                    label: "处理中",
+                },
+                {
+                    value: "closed_case",
+                    label: "已完成",
+                },
+            ],
+            Publicvoting:[
+            {
+                    value: 0,
+                    label: "否",
+                },
+                {
+                    value: 1,
+                    label: "是",
+                },
+            ],
+            statusArray: [
+                {
+                    value: "processing",
+                    label: "处理中",
+                },
+                {
+                    value: "closed_case",
+                    label: "已完成",
+                },
+            ],
+
+            typeArray: [
+                {
+                    value: "1",
+                    label: "难点痛点",
+                },
+                {
+                    value: "2",
+                    label: "矛盾纠纷",
+                },
+                {
+                    value: "3",
+                    label: "自身问题",
+                },
+                {
+                    value: "4",
+                    label: "超出服务范围",
+                },
+            ],
+
+            overPeriodArray: [
+                {
+                    value: "0",
+                    label: "2天以下",
+                },
+                {
+                    value: "1",
+                    label: "3-4天",
+                },
+                {
+                    value: "2",
+                    label: "4天以上",
+                },
+            ],
+
+            qudaoArray: [
+                {
+                    value: "0",
+                    label: "综治网格事件",
+                },
+                {
+                    value: "1",
+                    label: "诚心办事件",
+                },
+                {
+                    value: "2",
+                    label: "城管事件",
+                },
+                {
+                    value: "3",
+                    label: "信访事件",
+                }
+            ],
+            keyProblemList:[
+                {label:'违章拉客',value:'0'},
+                {label:'违章停车',value:'1'}
+            ],
+            formData: {
+                openFlag:"",
+                publicationPeople:"",
+                typeCode:"",
+                demandType: "",
+                name: "",
+                mobile: "",
+                eventContent: "",
+                operationType: 4,
+                openFlag: "",
+                specialSubjectId: "",
+                subjectTitle: "",
+                goldenIdeaFlag: "",
+                agencyId: "",
+                clientType: "web",
+                startSubmitTime:"",
+                endSubmitTime:""
+            },
+            openList:[
+            {
+                    value: 0,
+                    label: "否",
+                },
+                {
+                    value: 1,
+                    label: "是",
+                },
+            ],
+            goldListType:[
+            {
+                    value: 0,
+                    label: "否",
+                },
+                {
+                    value: 1,
+                    label: "是",
+                },
+            ],
+            cateOptions: [],
+            optionProps: {
+                multiple: true,
+                checkStrictly: false,
+                emitPath: false,
+                children: 'children',
+                label: 'categoryName',
+                value: 'id',
+            },
+            eventTypeCheck: [],
+            pageNo: 1,
+            pageSize: window.localStorage.getItem("pageSize") || 20,
+            total: 1,
+            endPickerOptions: {
+                disabledDate: endDisabledDate,
+            },
+            startPickerOptions: {
+                disabledDate: startDisabledDate,
+            },
+            eventId: "",
+
+            searchH: 180,
+            SpecialList:[],
+            eventDetailData: {},
+
+            showVoice: false,
+            showSupervise: false,
+            selVoiceUrl: "",
+
+            multipleSelection: [],
+
+            superviseFrom:{
+                content: "",
+            },
+        };
+    },
+    computed: {
+        maxTableHeight() {
+            const h = this.clientHeight - this.searchH - 275 + this.iframeHeight;
+            const _h = this.clientHeight - 275 - this.searchH;
+            return this.$store.state.inIframe ? h : _h;
+        },
+        ...mapGetters(["clientHeight", "iframeHeight"]),
+    },
+    watch: {
+        "formData.endTime": function (val) {
+            if (val && val != "") {
+                let arrayTemp = val.split(" ");
+                this.formData.endTime = arrayTemp[0] + " 23:59:59";
+            }
+        },
+    },
+    mounted() {
+        console.log(this.optionDate.id,"sdflkjsdlkfjkls");
+        this.formData.specialSubjectId=this.optionDate.id
+        console.log(this.formData.specialSubjectId,"sdglk;jsdljgk");
+        
+        this.user = this.$store.state.user;
+        this.formData.agencyId = this.user.agencyId;
+        this.getOrgTreeList()
+        // this.getGridList()
+        this.getTableData();
+        this.getCateOptions();
+        this.getSpecialList()
+    },
+    methods: {
+            //获取征集领域字典
+            async getSpecialList() {
+            const url = "/sys/dict/data/dictlist";
+
+            const { data, code, msg } = await requestPost(url, {
+                dictType: "solicitation_fields",
+            });
+
+            if (code === 0) {
+                this.SpecialList = data || [];
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        handleEventType(val) {
+            const nodes = this.$refs.cascaderEvent.getCheckedNodes();
+            this.formData.firstIdList = [];
+            this.formData.secondIdList = [];
+            let level1 = nodes.filter((item) => item.level === 1);
+            let level2 = nodes.filter((item) => item.level === 2);
+            level1.forEach((item) => {
+                if (item.hasChildren) {
+                    for (let i = level2.length - 1; i >= 0; i--) {
+                        if (level2[i].parent.value === item.value) level2.splice(i, 1);
+                    }
+                }
+            });
+            this.formData.firstIdList = level1.map((item) => item.value);
+            this.formData.secondIdList = level2.map((item) => item.value);
+        },
+        handleSelectionChange(val) {
+            this.multipleSelection = [];
+            val.forEach((element) => {
+                this.multipleSelection.push(element.icEventId);
+            });
+        },
+
+        tableRowClassName({ row }) {
+            switch (row.overPeriod) {
+                case '0':
+                return 'row-over-period-0';
+                case '1':
+                return 'row-over-period-1';
+                case '2':
+                return 'row-over-period-2';
+                default:
+                return 'row-default';
+            }
+        },
+
+        // 查看
+        handleLook(row) {
+            let { name,reportUserId } = row
+            const resiId = reportUserId;
+            this.$store.dispatch('saveData', { name,resiId });
+            this.$router.push({ name: 'jumin-huaxiang' });
+            this.$store.state.contentTabs = this.$store.state.contentTabs.map(item => {
+                if (item.name === "jumin-huaxiang") {
+                return {...item, title: name };
+                }
+                return item;
+            });
+        },
+        
+        async handleMarkDiffcult(command) {
+            const url = "/governance/icEventOld/difficultpointevent";
+            if (this.multipleSelection.length == 0) {
+                this.$message.warning('请选择需要标记的事件')
+                return
+            }
+            let params = {
+                icEventIdList: this.multipleSelection,
+                type: command,
+            };
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.$message.success("标记成功");
+                this.getTableData();
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        async handleCancalDiffcult() {
+            const url = "/governance/icEventOld/difficultpointevent";
+            if (this.multipleSelection.length == 0) {
+                this.$message.warning('请选择取消标记的事件')
+                return
+            }
+            let params = {
+                icEventIdList: this.multipleSelection,
+                type: "0",
+            };
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.$message.success("取消标记成功");
+                this.getTableData();
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        async handleSuperviseEvent(){
+            this.showSupervise = true;
+        },
+
+        async doSuperviseEvent() {
+            const url = "/governance/icEventOld/doSuperviseEvent";
+            if (this.multipleSelection.length == 0) {
+                this.$message.warning('请选择催办的事件')
+                return
+            }
+            let params = {
+                icEventIdList: this.multipleSelection,
+                content: this.superviseFrom.content,
+                operationType:21 // 21:催办
+            };
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.$message.success("催办成功");
+                this.getTableData();
+            } else {
+                this.$message.error(msg);
+            }
+            this.showSupervise = false;
+        },
+
+        handleSearch(val) {
+            this.pageNo = 1;
+            this.getTableData();
+        },
+
+        async loadGrid() {
+            const url = "/gov/org/customergrid/gridoption";
+            let params = {
+                agencyId: this.agencyId,
+                purpose: "query",
+            };
+
+            const { data, code, msg } = await requestPost(url, params);
+
+            if (code === 0) {
+                this.gridList = data;
+            } else {
+                this.$message.error(msg);
+            }
+        },
+
+        async handleExport() {
+            const url = "/governance/icEventOld/export";
+            const { pageSize, pageNo, formData } = this;
+            axios({
+                url: window.SITE_CONFIG["apiURL"] + url,
+                method: "post",
+                data: {
+                    pageSize,
+                    pageNo,
+                    ...formData,
+                },
+                responseType: "blob",
+            })
+                .then((res) => {
+                    let fileName = window.decodeURI(
+                        res.headers["content-disposition"].split(";")[1].split("=")[1]
+                    );
+                    console.log("filename", fileName);
+                    let blob = new Blob([res.data], { type: "application/vnd.ms-excel" });
+                    var url = window.URL.createObjectURL(blob);
+                    var aLink = document.createElement("a");
+                    aLink.style.display = "none";
+                    aLink.href = url;
+                    aLink.setAttribute("download", fileName);
+                    document.body.appendChild(aLink);
+                    aLink.click();
+                    document.body.removeChild(aLink); //下载完成移除元素
+                    window.URL.revokeObjectURL(url); //释放掉blob对象
+                })
+                .catch((err) => {
+                    console.log("获取导出情失败", err);
+                    return this.$message.error("网络错误");
+                });
+        },
+
+        async handleAdd() {
+            this.pageType = "add";
+        },
+
+        async handleWatch(row) {
+            this.eventId = row.icEventId;
+            const url = "/governance/icEventOld/detail";
+            const { data, code, msg } = await requestPost(url, {
+                icEventId: this.eventId,
+            });
+            if (code === 0) {
+                this.eventDetailData = { ...data };
+                this.pageType = "info";
+            } else {
+                this.$message.error(msg);
+            }
+        },
+
+        //加载组织数据
+        async handleDispose(row,type) {
+            // this.eventDetailData = { ...data };
+            // this.pageType =  type 
+            this.eventId = row.icEventId;
+            const url = "/governance/icEventOld/detail";
+            const { data, code, msg } = await requestPost(url, {
+                icEventId: this.eventId,
+                specialSubjectId:this.formData.specialSubjectId
+            });
+            if (code === 0) {
+                this.eventDetailData = { ...data };
+                this.pageType =  type 
+;
+            } else {
+                this.$message.error(msg);
+            }
+        },
+
+        //显示语音窗口
+        handleShowVoice(url) {
+            this.selVoiceUrl = url;
+            this.showVoice = true;
+        },
+
+        handleClose() {
+            this.pageType = "list";
+            this.eventId = "";
+            this.getTableData();
+        },
+        handleOk() {
+            this.pageType = "list";
+            this.eventId = "";
+            this.pageNo = 1;
+            this.getTableData();
+        },
+
+        handleEditSuccess() {
+            this.handleClose();
+            this.getTableData();
+        },
+        async handleVote(row){
+            const url = "/governance/icEventOld/updateSpecialColumn";
+            let params = {
+                icEventId:row.icEventId,
+                openFlag:row.openFlag==1?0:1,
+            }
+            const { data, code, msg } = await requestPost(url, params);
+            
+            if (code === 0) {
+                this.$message.success("操作成功！");
+                this.getTableData();
+            } else {
+                this.$message.error("操作失败！");
+            }
+        },
+        async handleDel(rowData) {
+            let message = "确认删除?";
+            this.$confirm(message, "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    this.delEvent(rowData.icEventId);
+                })
+                .catch((err) => { });
+        },
+        async delEvent(eventId) {
+            const url = "/governance/icEventOld/delete";
+            let idsArr = [eventId];
+            const { data, code, msg } = await requestPost(url, idsArr);
+            if (code === 0) {
+                this.$message.success("删除成功！");
+                this.getTableData();
+            } else {
+                this.$message.error("操作失败！");
+            }
+        },
+
+        async getTableData() {
+            const url = "/governance/icEventOld/ideaList";
+            console.log(this.formData,"formData");
+            // if (this.eventTypeCheck) {
+            //     this.formData.secondIdList = this.eventTypeCheck
+            // }
+            // // 处理 agencyId
+            // if (Array.isArray(this.formData.agencyId) && this.formData.agencyId.length) {
+            //     if(this.level=="grid"){
+            //         this.formData.gridId = this.formData.agencyId[this.formData.agencyId.length - 1];
+            //         this.formData.agencyId = "";
+            //     }else{
+            //         this.formData.agencyId = this.formData.agencyId[this.formData.agencyId.length - 1];
+            //         this.formData.gridId = "";
+            //     }
+            // } else {
+            //     this.formData.agencyId = "";
+            //     this.formData.gridId = "";
+            // }
+
+            const { pageSize, pageNo, formData } = this;
+            const { data, code, msg } = await requestPost(url, {
+                pageSize,
+                pageNo,
+                ...formData,
+            });
+            if (code === 0) {
+                this.total = data.total || 0;
+                this.tableData = data.list
+                    ? data.list.map((item) => {
+                        return item;
+                    })
+                    : [];
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        async getCateOptions() {
+            const url = '/governance/icEvent/getCategoryTree';
+            let params = {};
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                let treeDataNew = this.deepTree(data, "children");
+                //组织级联数据
+                ++this.iscascaderShow;
+                this.cateOptions = [];
+                this.cateOptions = treeDataNew;
+            } else {
+                this.$message.error(msg);
+            }
+            if (this.eventDetailCopy.parentCategoryId) {
+                const pids = this.eventDetailCopy.parentCategoryId.split(',');
+                pids.push(this.eventDetailCopy.categoryId);
+                let nodes = this.cateOptions;
+                for (let i = 0; i < pids.length; i++) {
+                    nodes = this.buildNode(nodes, pids[i])
+                }
+                if (nodes) {
+                    this.formData.categoryList.push(nodes)
+                }
+            }
+        },
+        buildNode(nodes, treeId) {
+            for (let i = 0; i < nodes.length; i++) {
+                if (nodes[i].id === treeId) {
+                    if (nodes[i].children) {
+                        return nodes[i].children
+                    } else {
+                        return nodes[i]
+                    }
+                }
+            }
+        },
+        handleSizeChange(val) {
+            this.pageSize = val;
+            window.localStorage.setItem("pageSize", val);
+            this.getTableData();
+        },
+        handleCurrentChange(val) {
+            this.pageNo = val;
+            this.getTableData();
+        },
+        resetSearch() {
+            this.formData = {
+                agencyId: "",
+                gridId: "",
+                sourceType: "",
+                eventContent: "",
+                name: "",
+                mobile: "",
+                startTime: "",
+                endTime: "",
+                status: "",
+                firstIdList: [],
+                secondIdList: [],
+                keyProblem:'',
+            };
+            this.eventTypeCheck = [];
+
+            this.pageNo = 1;
+            this.getTableData();
+            // this.loadTable()
+        },
+
+
+        getOrgTreeList () {
+            this.$http
+                .post('/gov/org/customeragency/agencygridtree', {})
+                .then(({ data: res }) => {
+                if (res.code !== 0) {
+                    return this.$message.error(res.msg)
+                } else {
+                   
+                    this.orgOptions = []
+                    this.orgOptions.push(res.data)
+                }
+                })
+                .catch(() => {
+                return this.$message.error('网络错误')
+                })
+        },
+        getGridList () {
+            this.$http
+                .post('/gov/org/customergrid/gridoption', { agencyId: this.agencyId, purpose: 'addorupdate' })
+                .then(({ data: res }) => {
+                if (res.code !== 0) {
+                    return this.$message.error(res.msg)
+                } else {
+                    
+                    this.optionsG = res.data
+                }
+                })
+                .catch(() => {
+                return this.$message.error('网络错误')
+                })
+        },
+
+        handleChangeAgency (val) {
+
+            this.sarr = []
+            const map = new Map();
+            this.getLastItem(
+            this.orgOptions,
+            val,
+            "agencyId"
+            );
+            this.level = this.sarr[this.sarr.length - 1].level
+        },
+        getLastItem (list, vals, key) {
+            let LIST = list || [];
+            for (let item of LIST) {
+            // console.log(item[key]);
+            for (let i of vals) {
+                if (item[key] === i) {
+                this.sarr.push(item);
+                } else {
+                this.getLastItem(item.subAgencyList, vals, key);
+                }
+            }
+            }
+        },
+
+        //重构树，去除网格
+        deepTree(arr, children) {
+            if (Array.isArray(arr) && arr.length > 0) {
+                return arr.map((item) => {
+                    return {
+                        ...item,
+                        [children]:
+                            (item[children] &&
+                                item[children].length > 0 &&
+                                this.deepTree(item[children], children)) ||
+                            null,
+                    };
+                });
+            }
+        },
+    },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/management/list-main.scss";
+
+.m-search {
+    .u-item-width-normal {
+        width: 200px;
+    }
+}
+
+::v-deep .el-dropdown__caret-button {
+    height: 30px;
+}
+
+::v-deep .el-image-viewer__close {
+    top: 129px;
+    right: 129px;
+    width: 40px;
+    height: 40px;
+    font-size: 40px;
+    color: #fff;
+}
+</style>
+
+<style>
+.row-over-period-0 {
+  background-color: #ffffe0 !important; /* 淡黄色 */
+}
+.row-over-period-1 {
+  background-color: #ffebcd !important; /* 淡橙色 */
+}
+.row-over-period-2 {
+  background-color: #ffc0cb !important; /* 淡红色 */
+}
+.row-default {
+  background-color: #e0ffe0 !important; /* 淡绿色 */
+}
+</style>
diff --git a/src/views/modules/solicitationSpecial/index.vue b/src/views/modules/solicitationSpecial/index.vue
index b42b45efc..638597317 100644
--- a/src/views/modules/solicitationSpecial/index.vue
+++ b/src/views/modules/solicitationSpecial/index.vue
@@ -1,48 +1,44 @@
 <template>
     <div class="g-main">
-        <div>
+        <div v-if="showType=='zhuanti'">
             <div class="m-search">
                 <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'120px'">
                     <div>
                         <el-form-item label="所属组织" prop="agencyId">
                             <el-cascader class="u-item-width-normal" size="small" ref="myCascader"
-                                v-model.trim="formData.agencyId" :options="orgOptions"
-                                :show-all-levels="false"  clearable></el-cascader>
+                                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="firstIdList">
-                            <el-cascader ref="cascaderEvent" v-model.trim="eventTypeCheck" :options="cateOptions"
-                                collapse-tags :show-all-levels="false" :props="optionProps" clearable
-                                class="u-item-width-normal" @change="handleEventType" />
-                            <!-- <template slot-scope="{ node, data }">
-                  <div @click="cascaderClick(node, data)">
-                    <span>{{ data.name }}</span>
-                  </div>
-                </template>
-              </el-cascader> -->
+                            <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 label="专题标题" prop="eventContent">
-                            <el-input v-model.trim="formData.eventContent" class="u-item-width-normal" size="small"
+                        <el-form-item label="专题标题" prop="subjectTitle">
+                            <el-input v-model.trim="formData.subjectTitle" class="u-item-width-normal" size="small"
                                 clearable placeholder="请输入">
                             </el-input>
                         </el-form-item>
 
-                        <el-form-item label="专题内容" prop="name">
-                            <el-input v-model.trim="formData.name" class="u-item-width-normal" size="small" clearable
+                        <el-form-item label="专题内容" prop="subjectContent">
+                            <el-input v-model.trim="formData.subjectContent" class="u-item-width-normal" size="small" clearable
                                 placeholder="请输入">
                             </el-input>
                         </el-form-item>
-                        <el-form-item label="发布人" prop="mobile">
-                            <el-input v-model.trim="formData.mobile" class="u-item-width-normal" size="small" clearable
+                        <el-form-item label="发布人" prop="publicationPeople">
+                            <el-input v-model.trim="formData.publicationPeople" class="u-item-width-normal" size="small" clearable
                                 placeholder="请输入">
                             </el-input>
                         </el-form-item>
                         <el-form-item label="发布时间" prop="startTime">
-                            <el-date-picker v-model.trim="formData.startTime"
+                            <el-date-picker v-model.trim="formData.publicationTimeStart"
                                 class="u-item-width-daterange" size="small" type="date"
                                 value-format="yyyy-MM-dd HH:mm:ss" value="yyyy-MM-dd" placeholder="开始时间">
                             </el-date-picker>
                             <span class="u-data-tag">至</span>
-                            <el-date-picker v-model.trim="formData.endTime" 
+                            <el-date-picker v-model.trim="formData.publicationTimeEnd" 
                                 class="u-item-width-daterange u-data-tag" size="small" type="date"
                                 value-format="yyyy-MM-dd HH:mm:ss" value="yyyy-MM-dd" placeholder="结束时间">
                             </el-date-picker>
@@ -89,6 +85,9 @@
                     </el-table-column>
                     <el-table-column prop="eventNum" align="center" width="110" label="提交建议数"
                         :show-overflow-tooltip="true">
+                        <template slot-scope="scope">
+                            <el-button type="text" @click="onClickOpinion(scope.row,'optionList')">{{ scope.row.eventNum }}</el-button>
+                        </template>
                     </el-table-column>
                     <el-table-column prop="publicationPeopleName" align="center" label="专题发布人" 
                         :show-overflow-tooltip="true">
@@ -116,7 +115,10 @@
                 </div>
             </div>
         </div>
-        <el-dialog :title="formTitle" :visible.sync="showSupervise" width="40%" top="5vh" append-to-body class="dialog-h"
+        <div v-if="showType=='optionList'">
+            <suggestionList :optionDate="optionDate"></suggestionList>
+        </div>
+        <el-dialog :title="formTitle" :visible.sync="showSupervise" width="850px" top="5vh" append-to-body class="dialog-h"
             :close-on-click-modal="false">
             <add v-if="showSupervise" ref="speclialAdd" @showAddClose="showAddClose"></add>
         </el-dialog>
@@ -128,15 +130,41 @@ import { requestPost } from "@/js/dai/request";
 import nextTick from "dai-js/tools/nextTick";
 import { mapGetters } from "vuex";
 import add from "./cpts/add.vue";
+import suggestionList from "./cpts/suggestionList.vue";
 import axios from "axios";
-
+ 
 export default {
     components: { 
-        add
+        add,suggestionList
      },
 
     data() {
+        
+        let orgOptionProps = {
+            emitPath: false,
+            multiple: false,
+            value: 'agencyId',
+            label: 'agencyName',
+            children: 'subAgencyList',
+            checkStrictly: true
+        }
         return {
+            SpecialList:[],
+            formData: {
+                publicationTimeStart:"",
+                publicationTimeEnd:"",
+                agencyId: "",
+                clientType:"web",
+                typeCode:"",
+                subjectTitle:"",
+                subjectContent:"",
+                publicationPeople:"",
+                publicationTimeStart:"",
+                publicationTimeEnd:"",
+                publicationPeople:""
+            },
+            orgOptionProps,
+            showType:"zhuanti",
             tableData: [
             {
                 gridName: '人力资源部',
@@ -285,16 +313,7 @@ export default {
                 {label:'违章拉客',value:'0'},
                 {label:'违章停车',value:'1'}
             ],
-            formData: {
-                agencyId: "",
-                clientType:"web",
-                typeCode:"",
-                subjectTitle:"",
-                subjectContent:"",
-                publicationPeople:"",
-                publicationTimeStart:"",
-                publicationTimeEnd:""
-            },
+     
             cateOptions: [],
             optionProps: {
                 multiple: true,
@@ -309,7 +328,7 @@ export default {
             pageSize: window.localStorage.getItem("pageSize") || 20,
             total: 1,
             eventId: "",
-
+            optionDate:{},
             searchH: 180,
 
             eventDetailData: {},
@@ -344,12 +363,52 @@ export default {
     mounted() {
         this.user = this.$store.state.user;
         this.agencyId = this.user.agencyId;
-        // this.getOrgTreeList()
+        this.getOrgTreeList()
         // this.getGridList()
         this.getTableData();
         // this.getCateOptions();
+        this.getSpecialList()
     },
     methods: {
+        //
+        getOrgTreeList () {
+            this.$http
+                .post('/gov/org/customeragency/agencygridtree', {})
+                .then(({ data: res }) => {
+                if (res.code !== 0) {
+                    return this.$message.error(res.msg)
+                } else {
+                    this.orgOptions = []
+                    this.orgOptions.push(res.data)
+                }
+                })
+                .catch(() => {
+                return this.$message.error('网络错误')
+                })
+        },
+             //获取征集领域字典
+             async getSpecialList() {
+            const url = "/sys/dict/data/dictlist";
+
+            const { data, code, msg } = await requestPost(url, {
+                dictType: "solicitation_fields",
+            });
+
+            if (code === 0) {
+                this.SpecialList = data || [];
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        onClickOpinion(row,type){
+            console.log(row,type,"sdfkljdslf");
+            this.optionDate={},
+            this.optionDate=row
+            
+            this.showType=type
+            
+
+        },
         handleSuperviseEvent(){
             let message = "确认删除?";
             this.$confirm(message, "提示", {