diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index 890eac4b8..8e2fce7e0 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -152,7 +152,7 @@
           <el-cascader class="u-item-width-normal"
                        size="small"
                        ref="myCascader"
-                       v-model="form.agencyId"
+                       v-model="cascaderAgencyId"
                        :options="orgOptions"
                        :props="orgOptionProps"
                        :show-all-levels="false"
@@ -331,6 +331,7 @@ export default {
 
     return {
       categoryAll:[],
+      cascaderAgencyId:[],
       categoryAllList:[
         {
           label:'群众',
@@ -925,6 +926,7 @@ export default {
     this.$EventBus.$on('handleClickResiTree', async (val) => {
            if(val.type === 'agency'){
               this.form.agencyId = val.id;
+              this.cascaderAgencyId = val.id;
               this.optionsV = [];
               this.form.villageId = '';
               this.form.buildId = '';
@@ -1056,16 +1058,18 @@ export default {
         }
       }
     },
-    handleChangeAgency(val) {
+   async handleChangeAgency(val) {
       this.sarr = []
       this.getLastItem(
         this.orgOptions,
         val,
         "agencyId"
       );
-      this.form.agencyId=this.sarr[this.sarr.length - 1].agencyId
       this.form.level = this.sarr[this.sarr.length - 1].level;
-      this.getValiheList()
+      this.form.agencyId = this.sarr[this.sarr.length - 1].agencyId;
+      this.optionsV = [];
+      this.optionsVPageNo = 1;
+      await this.getValiheList()
     },
     getLastItem(list, vals, key) {
       let LIST = list || [];
diff --git a/src/views/modules/communityParty/activity/index.vue b/src/views/modules/communityParty/activity/index.vue
index e5a474ca6..6ab550f5e 100644
--- a/src/views/modules/communityParty/activity/index.vue
+++ b/src/views/modules/communityParty/activity/index.vue
@@ -283,7 +283,6 @@
       },
       async communityActivityList() {
         const url = "/actual/base/communityActivity/page";
-
         let params = {
          pageSize: this.pageSize,
           pageNo: this.pageNo,
@@ -398,7 +397,7 @@
           pageSize: 10,
           pageNo: 1,
           typeName: "",
-          enabled: 1
+          enabled: 0
         }
         const { data, code, msg } = await requestPost(url, params)
         if (code === 0) {
diff --git a/src/views/modules/shequzhili/Delivery/index.vue b/src/views/modules/shequzhili/Delivery/index.vue
index 7f5413688..ce7c65c50 100644
--- a/src/views/modules/shequzhili/Delivery/index.vue
+++ b/src/views/modules/shequzhili/Delivery/index.vue
@@ -77,21 +77,30 @@
                 <div class="div_btn">
 
                     <el-button @click="handleExport" class="diy-button--white" size="small">导出</el-button>
+                    <el-button class="diy-button--white" size="small">
+                        <el-upload :headers="$getElUploadHeaders()" ref="upload" class="upload-btn"
+                                action="uploadUlr" :limit="1" :accept="'.xls,.xlsx'" :with-credentials="true"
+                                :show-file-list="false" :auto-upload="true" :on-progress="handleProgress"
+                                :on-success="handleExcelSuccess" :before-upload="beforeExcelUpload"
+                                :http-request="uploadHttpRequest">
+                               上传导入
+                            </el-upload>
+                    </el-button>
 
-                    <el-dropdown size="small" split-button type="primary" style="margin: 0 10px; height: 30px"
+                    <!-- <el-dropdown size="small" split-button type="primary" style="margin: 0 10px; height: 30px"
                         @command="(command) => importTypeChange(command)">
                         导入
-                        <el-dropdown-menu slot="dropdown">
-                            <el-dropdown-item command="0" @click.native="handleExportModule">下载模板</el-dropdown-item>
-                            <el-upload :headers="$getElUploadHeaders()" ref="upload" class="upload-btn"
+                        <el-dropdown-menu slot="dropdown"> -->
+                            <!-- <el-dropdown-item command="0" @click.native="handleExportModule">下载模板</el-dropdown-item> -->
+                            <!-- <el-upload :headers="$getElUploadHeaders()" ref="upload" class="upload-btn"
                                 action="uploadUlr" :limit="1" :accept="'.xls,.xlsx'" :with-credentials="true"
                                 :show-file-list="false" :auto-upload="true" :on-progress="handleProgress"
                                 :on-success="handleExcelSuccess" :before-upload="beforeExcelUpload"
                                 :http-request="uploadHttpRequest">
                                 <el-dropdown-item command="1">上传导入</el-dropdown-item>
                             </el-upload>
-                        </el-dropdown-menu>
-                    </el-dropdown>
+                        </el-dropdown-menu> -->
+                    <!-- </el-dropdown> -->
                 </div>
                 <el-table :data="tableData" border class="m-table-item" style="width: 100%"
                     @selection-change="handleSelectionChange" :height="maxTableHeight">
diff --git a/src/views/modules/shequzhili/event/cpts/event-info.vue b/src/views/modules/shequzhili/event/cpts/event-info.vue
index b42788f03..4b88a4dc4 100644
--- a/src/views/modules/shequzhili/event/cpts/event-info.vue
+++ b/src/views/modules/shequzhili/event/cpts/event-info.vue
@@ -24,7 +24,7 @@
                         <div class="div-btn">
                             <el-button size="small" @click="handleClose">关闭</el-button>
                             <el-button style="margin-left: 20px" type="primary" size="small"
-                                @click="handleComfirm">保存</el-button>
+                                @click="handleComfirm">{{this.pageType=="assign"?"确认指派":"保存"}}</el-button>
                         </div>
                     </el-card>
                 </div>
diff --git a/src/views/modules/shequzhili/eventHandling/index.vue b/src/views/modules/shequzhili/eventHandling/index.vue
index 9cef2ce64..66825013d 100644
--- a/src/views/modules/shequzhili/eventHandling/index.vue
+++ b/src/views/modules/shequzhili/eventHandling/index.vue
@@ -69,20 +69,27 @@
                 <div class="div_btn">
 
                     <el-button @click="handleExport" class="diy-button--white" size="small">导出</el-button>
-
-                    <el-dropdown size="small" split-button type="primary" style="margin: 0 10px; height: 30px"
+                    <el-button class="diy-button--white" size="small">
+                        <el-upload :headers="$getElUploadHeaders()" ref="upload" class="upload-btn" action="uploadUlr"
+                                     :limit="1" :accept="'.xls,.xlsx'" :with-credentials="true" :show-file-list="false"
+                                     :auto-upload="true" :on-progress="handleProgress" :on-success="handleExcelSuccess"
+                                     :before-upload="beforeExcelUpload" :http-request="uploadHttpRequest">
+                         上传导入
+                        </el-upload>
+                    </el-button>
+                    <!-- <el-dropdown size="small" split-button type="primary" style="margin: 0 10px; height: 30px"
                         @command="(command) => handleMarkDiffcult(command)">
                         导入
-                        <el-dropdown-menu slot="dropdown">
-                            <el-dropdown-item command="0" @click.native="handleExportModule">下载模板</el-dropdown-item>
-                            <el-upload :headers="$getElUploadHeaders()" ref="upload" class="upload-btn" action="uploadUlr"
+                        <el-dropdown-menu slot="dropdown"> -->
+                            <!-- <el-dropdown-item command="0" @click.native="handleExportModule">下载模板</el-dropdown-item> -->
+                            <!-- <el-upload :headers="$getElUploadHeaders()" ref="upload" class="upload-btn" action="uploadUlr"
                                      :limit="1" :accept="'.xls,.xlsx'" :with-credentials="true" :show-file-list="false"
                                      :auto-upload="true" :on-progress="handleProgress" :on-success="handleExcelSuccess"
                                      :before-upload="beforeExcelUpload" :http-request="uploadHttpRequest">
                           <el-dropdown-item command="1">上传导入</el-dropdown-item>
                         </el-upload>
                         </el-dropdown-menu>
-                    </el-dropdown>
+                    </el-dropdown> -->
                 </div>
 
                 <el-table :data="tableData" border class="m-table-item" style="width: 100%"
diff --git a/src/views/modules/shequzhili/eventOld/cpts/add.vue b/src/views/modules/shequzhili/eventOld/cpts/add.vue
index 5597b20a3..df2b0cfa9 100644
--- a/src/views/modules/shequzhili/eventOld/cpts/add.vue
+++ b/src/views/modules/shequzhili/eventOld/cpts/add.vue
@@ -21,7 +21,7 @@
                     </el-form-item>
 
                     <el-form-item v-if="formData.demandType === 'chengguan'" label="有无责任单位" prop="responsibleUnit" label-width="150px" style="display: block">
-                        <el-radio-group v-model.trim="formData.responsibleUnit">
+                        <el-radio-group v-model.trim="formData.responsibleUnit" @change="cleanDataRule">
                             <el-radio label="yes">有</el-radio>
                             <el-radio label="no">无</el-radio>
                         </el-radio-group>
@@ -49,7 +49,7 @@
                         </el-input>
                     </el-form-item>
 
-                    <el-form-item label="证件号" prop="idCard" label-width="150px" style="display: block">
+                    <el-form-item v-if="formData.demandType === 'report'" label="证件号" prop="idCard" label-width="150px" style="display: block">
                         <el-input class="cell-width-1" maxlength="30" placeholder="请输入证件号"
                             v-model.trim="formData.idCard"></el-input>
                     </el-form-item>
@@ -173,6 +173,8 @@ function iniFmData() {
         // content: '',//回复内容
         // status: '',//	处理中：processing；已办结：closed_case
         responsibleUnit:"yes",
+        responsibleName:"",
+        responsibleMobile:"",
     };
 }
 
@@ -274,7 +276,7 @@ export default {
                 mobile: [
                     { required: isReport, message: "联系电话不能为空", trigger: "blur" },
                 ],
-                responsibleName: [{ required: isChengguan, message: "责任人不能为空", trigger: "change" }],
+                responsibleName: [{ required: isChengguan, message: "责任人不能为空", trigger: "blur" }],
                 responsibleMobile: [
                     { required: isChengguan, message: "联系电话不能为空", trigger: "blur" },
                 ],
@@ -349,9 +351,13 @@ export default {
             this.obj.level = this.sarr[this.sarr.length - 1].level
         },
         handleDemandTypeChange() {
-            this.$refs.ref_form1.clearValidate();  // 清除所有验证
+            this.cleanDataRule();  // 清除所有验证
             this.formData.demandType = this.formData.demandType;  // 重新设置诉求类型
         },
+        cleanDataRule(){
+            this.$refs.ref_form1.clearValidate();  // 清除所有验证
+            this.$refs.ref_form2.clearValidate();  // 清除所有验证
+        },
         getLastItem(list, vals, key) {
             let LIST = list || [];
             for (let item of LIST) {
diff --git a/src/views/modules/shequzhili/eventOld/cpts/event-info.vue b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue
index 4384e2877..557844c23 100644
--- a/src/views/modules/shequzhili/eventOld/cpts/event-info.vue
+++ b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue
@@ -107,34 +107,34 @@
                                         </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>
-                                            <template v-if="i.type === 'voice'">
+                                            <template v-if="i.attachmentType === 'voice'">
                                                 <div class="detail">
                                                     <div class="detail-field">语音：</div>
                                                     <div
                                                         :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]">
                                                         <audio controls>
-                                                            <source :src="i.url" type="" :key="i.url" />
+                                                            <source :src="i.attachmentUrl" type="" :key="i.attachmentUrl" />
                                                         </audio>
                                                     </div>
                                                 </div>
                                             </template>
-                                            <template v-if="i.type === 'doc'">
+                                            <template v-if="i.attachmentType === 'doc'">
                                                 <div class="detail">
                                                     <div class="detail-field">附件：</div>
                                                     <div
                                                         :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' },]">
-                                                        <a :href="i.url">{{ i.name }}</a>
+                                                        <a :href="i.attachmentUrl">{{ i.attachmentName }}</a>
                                                     </div>
                                                 </div>
                                             </template>
diff --git a/src/views/modules/shequzhili/eventOld/cpts/process-form-designate.vue b/src/views/modules/shequzhili/eventOld/cpts/process-form-designate.vue
index bdf29576e..ea0979e4c 100644
--- a/src/views/modules/shequzhili/eventOld/cpts/process-form-designate.vue
+++ b/src/views/modules/shequzhili/eventOld/cpts/process-form-designate.vue
@@ -69,7 +69,7 @@ export default {
                 categoryId: "",//事件分类
                 deptId: "", //指派部门
                 deptName: "",
-                sendMsg:0,
+                sendMsg:1,
                 categoryList: [],
                 files: [] //附件
             },
diff --git a/src/views/modules/workSys/role/role.vue b/src/views/modules/workSys/role/role.vue
index e4a18e977..191fa6eb8 100644
--- a/src/views/modules/workSys/role/role.vue
+++ b/src/views/modules/workSys/role/role.vue
@@ -69,6 +69,12 @@
                     {{ scope.row.defaultRole == '0' ? 'X' : '√' }}
                 </template>
         </el-table-column>
+        <el-table-column prop="levelName"
+                         header-align="center"
+                         align="center"
+                         label="级别"
+                         in-width="30">
+        </el-table-column>
         <el-table-column prop="remark"
                          header-align="center"
                          align="center"
diff --git a/src/views/modules/workSys/role/roleForm.vue b/src/views/modules/workSys/role/roleForm.vue
index d79aa9e5f..930a55a82 100644
--- a/src/views/modules/workSys/role/roleForm.vue
+++ b/src/views/modules/workSys/role/roleForm.vue
@@ -22,6 +22,18 @@
 
         </el-form-item>
 
+        <el-form-item label="所属组织级别"
+                      prop="level"
+                      label-width="150px"
+                      style="display: block">
+          <el-select v-model.trim="formData.level" placeholder="请选择" size="small"
+                     class="list_item_width_1">
+            <el-option v-for="(item, index) in orgLevels" :key="item.code"
+                       :label="item.name" :value="item.code"></el-option>
+          </el-select>
+
+        </el-form-item>
+
         <el-form-item label="备注"
                       prop="remark"
                       label-width="150px"
@@ -107,13 +119,16 @@ export default {
       },
 
       defaultRole: '',
-
+      orgLevels: []
     }
   },
   components: {},
-  async mounted () {
-
+  mounted () {
+    this.listOrgLevels4Roles()
+  },
 
+  activated() {
+    this.listOrgLevels4Roles()
   },
 
   methods: {
@@ -310,6 +325,14 @@ export default {
       if (loading) {
         loading.close()
       }
+    },
+
+    // 加载行政组织级别
+    listOrgLevels4Roles() {
+      requestGet('/gov/access/govrole/orgLevels/list').then(({code, data, msg}) => {
+        this.orgLevels = data
+        console.log("行政组织级别:", data)
+      })
     }
   },
   computed: {
@@ -318,8 +341,6 @@ export default {
         name: [
           { required: true, message: '角色名称不能为空', trigger: 'change' }
         ],
-
-
       }
     },