diff --git a/src/views/modules/shequzhili/Delivery/index.vue b/src/views/modules/shequzhili/Delivery/index.vue
index 79854759f..1dc73ee03 100644
--- a/src/views/modules/shequzhili/Delivery/index.vue
+++ b/src/views/modules/shequzhili/Delivery/index.vue
@@ -6,8 +6,8 @@
                 <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
                     <div>
                         <el-form-item label="事件类别" prop="firstIdList">
-                            <el-cascader ref="cascaderEvent" v-model.trim="formData.firstIdList" :options="cateOptions" collapse-tags
-                                :show-all-levels="false" :props="{
+                            <el-cascader ref="cascaderEvent" v-model.trim="formData.firstIdList" :options="cateOptions"
+                                collapse-tags :show-all-levels="false" :props="{
                                     multiple: true,
                                     checkStrictly: true,
                                     emitPath: false,
@@ -17,8 +17,8 @@
                                 }" clearable class="u-item-width-normal" />
                         </el-form-item>
                         <el-form-item label="工单编号" prop="workOrderNum">
-                            <el-input v-model.trim="formData.workOrderNum" class="u-item-width-normal" size="small" clearable
-                                placeholder="请输入">
+                            <el-input v-model.trim="formData.workOrderNum" class="u-item-width-normal" size="small"
+                                clearable placeholder="请输入">
                             </el-input>
                         </el-form-item>
                         <el-form-item label="报件人电话" prop="mobile">
@@ -27,41 +27,38 @@
                             </el-input>
                         </el-form-item>
                         <el-form-item label="事件描述" prop="eventContent">
-                            <el-input v-model.trim="formData.eventContent" class="u-item-width-normal" size="small" clearable
-                                placeholder="请输入">
+                            <el-input v-model.trim="formData.eventContent" class="u-item-width-normal" size="small"
+                                clearable placeholder="请输入">
                             </el-input>
                         </el-form-item>
                         <el-form-item label="派件状态" prop="deliveryStatus">
-                                <el-select v-model.trim="formData.deliveryStatus" clearable class="u-item-width-normal">
-                                    <el-option v-for="item in ProcessingList" :key="item.value" :label="item.label" :value="item.value">
-                                    </el-option>
-                                </el-select>
+                            <el-select v-model.trim="formData.deliveryStatus" clearable class="u-item-width-normal">
+                                <el-option v-for="item in ProcessingList" :key="item.value" :label="item.label"
+                                    :value="item.value">
+                                </el-option>
+                            </el-select>
                         </el-form-item>
                         <el-form-item label="办理状态" prop="operationType">
-                                <el-select v-model.trim="formData.operationType" clearable class="u-item-width-normal">
-                                    <el-option v-for="item in handleList" :key="item.value" :label="item.label" :value="item.value">
-                                    </el-option>
-                                </el-select>
+                            <el-select v-model.trim="formData.operationType" clearable class="u-item-width-normal">
+                                <el-option v-for="item in handleList" :key="item.value" :label="item.label"
+                                    :value="item.value">
+                                </el-option>
+                            </el-select>
                         </el-form-item>
                         <el-form-item label="指派部门" prop="departId">
-                            <el-cascader class="u-item-width-normal"
-                                size="small"
-                                ref="myCascader"
-                                v-model.trim="formData.departId"
-                                :options="orgOptions"
-                                :props="orgOptionProps"
-                                :show-all-levels="false"
-                                @change="handleChangeAgency"
-                                clearable></el-cascader>
+                            <el-cascader class="u-item-width-normal" size="small" ref="myCascader"
+                                v-model.trim="formData.departId" :options="orgOptions" :props="orgOptionProps"
+                                :show-all-levels="false" @change="handleChangeAgency" clearable></el-cascader>
                         </el-form-item>
-                        <el-form-item label="办结时限" prop="timeLimit">
-                            <el-date-picker v-model.trim="formData.timeLimit" class="u-item-width-daterange" size="small"
-                                type="date" value-format="yyyy-MM-dd HH:mm:ss" value="yyyy-MM-dd" placeholder="开始时间">
+                        <el-form-item label="办结时限" prop="limitEndTime">
+                            <el-date-picker v-model.trim="formData.limitStartTime" 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" 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 v-model.trim="formData.limitEndTime"
+                                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>
@@ -82,16 +79,17 @@
                     <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"
-                    @command="(command) => importTypeChange(command)">
+                        @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" 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-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>
                 </div>
@@ -102,7 +100,7 @@
 
                     <el-table-column prop="workOrderNum" align="center" label="工单编号" :show-overflow-tooltip="true">
                     </el-table-column>
-                    <el-table-column prop="categoryAllName"  label="事件类别" min-width="140" align="center"
+                    <el-table-column prop="categoryAllName" label="事件类别" min-width="140" align="center"
                         :show-overflow-tooltip="true" />
                     <!-- <template slot-scope="scope">
                      {{ scope.row.firstName + '-' + scope.row.secondName }}
@@ -112,7 +110,7 @@
                     </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="联系电话" >
+                    <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 !== ''"
@@ -127,7 +125,8 @@
                             </span>
                         </template> -->
                     </el-table-column>
-                    <el-table-column prop="statusName" align="center" width="110" label="指派状态" :show-overflow-tooltip="true">
+                    <el-table-column prop="statusName" align="center" width="110" label="指派状态"
+                        :show-overflow-tooltip="true">
                         <template slot-scope="scope">
                             <span v-if="scope.row.status === 'unassigned'">未指派</span>
                             <span v-else-if="scope.row.status ==='assigned'">已指派</span>
@@ -135,7 +134,8 @@
                             <span v-else="scope.row.status ==='processing'">处理中</span>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="operationTypeName" align="center" width="110" label="办理状态" :show-overflow-tooltip="true">
+                    <el-table-column prop="operationTypeName" align="center" width="110" label="办理状态"
+                        :show-overflow-tooltip="true">
                         <!-- <template slot-scope="scope">
                             <span v-if="scope.row.handlestatus === 0">未联系当事人</span>
                             <span v-else-if="scope.row.handlestatus ===1">已联系当事人</span>
@@ -143,18 +143,23 @@
                             <span v-else>--</span>
                         </template> -->
                     </el-table-column>
-                    <el-table-column prop="deptName" align="center" width="110" label="指定部门" :show-overflow-tooltip="true">
+                    <el-table-column prop="deptName" align="center" width="110" label="指定部门"
+                        :show-overflow-tooltip="true">
                     </el-table-column>
-                    <el-table-column prop="limitTime" align="center" width="110" label="办结时限（部门）" :show-overflow-tooltip="true">
+                    <el-table-column prop="limitTime" 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="handleWatch(scope.row)"   type="text" size="small" class="">查看</el-button>
+                            <el-button @click="handleWatch(scope.row)" type="text" size="small" class="">查看</el-button>
                             <!-- <el-button  @click="handleDispose(scope.row)" type="text" size="small" class="">{{scope.row.deliverystatus==0?"派件":"办理"}}</el-button>
                              -->
-                            <el-button  @click="handleDispose(scope.row,'dispose')" type="text" size="small"   v-if="(scope.row.status == 'processing'|| scope.row.status === 'assigned') && scope.row.operationType === '5'">处理</el-button>
-                            <el-button  @click="handleDispose(scope.row,'assign')" type="text" size="small"  v-if="scope.row.status =='unassigned'||scope.row.status =='processing'">派件</el-button>
-                            <el-button @click="handleDispose(scope.row,'check')" type="text" size="small"  v-if="scope.row.operationType === '11'">审核</el-button>
+                            <el-button @click="handleDispose(scope.row,'dispose')" type="text" size="small"
+                                v-if="(scope.row.status == 'processing'|| scope.row.status === 'assigned') && scope.row.operationType === '5'">处理</el-button>
+                            <el-button @click="handleDispose(scope.row,'assign')" type="text" size="small"
+                                v-if="scope.row.status =='unassigned'||scope.row.status =='processing'">派件</el-button>
+                            <el-button @click="handleDispose(scope.row,'check')" type="text" size="small"
+                                v-if="scope.row.operationType === '11'">审核</el-button>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -206,7 +211,7 @@ export default {
             sarr: [],
             ProcessingList: [
                 {
-                    value: "assigned ",
+                    value: "assigned",
                     label: "已指派",
                 },
                 {
diff --git a/src/views/modules/shequzhili/timeOut/index.vue b/src/views/modules/shequzhili/timeOut/index.vue
index fe1813913..2f3117d63 100644
--- a/src/views/modules/shequzhili/timeOut/index.vue
+++ b/src/views/modules/shequzhili/timeOut/index.vue
@@ -1,23 +1,23 @@
 <template>
     <div class="g-main">
-        <div v-show="pageType == 'list'" >
+        <div v-show="pageType == 'list'">
             <div class="m-search">
                 <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
                     <div>
-                        <el-form-item label="事件类别" prop="categoryAllName">
-                            <el-cascader ref="cascaderEvent" v-model.trim="formData.categoryAllName" :options="cateOptions" collapse-tags
-                                :show-all-levels="false" :props="{
+                        <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: false,
+                                    checkStrictly: true,
                                     emitPath: false,
                                     children: 'children',
                                     label: 'categoryName',
                                     value: 'id',
-                                }" clearable class="u-item-width-normal" @change="handleEventType" />
+                                }" clearable class="u-item-width-normal" />
                         </el-form-item>
                         <el-form-item label="工单编号" prop="workOrderNum">
-                            <el-input v-model.trim="formData.workOrderNum" class="u-item-width-normal" size="small" clearable
-                                placeholder="请输入">
+                            <el-input v-model.trim="formData.workOrderNum" class="u-item-width-normal" size="small"
+                                clearable placeholder="请输入">
                             </el-input>
                         </el-form-item>
                         <el-form-item label="报件人电话" prop="mobile">
@@ -26,28 +26,18 @@
                             </el-input>
                         </el-form-item>
                         <el-form-item label="事件描述" prop="eventContent">
-                            <el-input v-model.trim="formData.eventContent" class="u-item-width-normal" size="small" clearable
-                                placeholder="请输入">
+                            <el-input v-model.trim="formData.eventContent" class="u-item-width-normal" size="small"
+                                clearable placeholder="请输入">
                             </el-input>
                         </el-form-item>
                         <el-form-item label="指派部门" prop="departId">
-                            <el-cascader ref="cascaderEvent" v-model.trim="formData.departId" :options="cateOptions" collapse-tags
-                                :show-all-levels="false"  clearable class="u-item-width-normal" :props="{
-                                    multiple: true,
-                                    checkStrictly: true,
-                                    emitPath: false,
-                                    children: 'children',
-                                    label: 'categoryName',
-                                    value: 'id',
-                                }"   />
+                            <el-cascader class="u-item-width-normal" size="small" ref="myCascader"
+                                v-model.trim="formData.departId" :options="orgOptions" :props="orgOptionProps"
+                                :show-all-levels="false" @change="handleChangeAgency" clearable></el-cascader>
                         </el-form-item>
                         <el-form-item label="办理状态" prop="operationType">
-                            <el-cascader class="u-item-width-normal"
-                                size="small"
-                                ref="myCascader"
-                                v-model.trim="formData.operationType"
-                               :options="ProcessingList"
-                                :show-all-levels="false"
+                            <el-cascader class="u-item-width-normal" size="small" ref="myCascader"
+                                v-model.trim="formData.operationType" :options="ProcessingList" :show-all-levels="false"
                                 clearable></el-cascader>
                         </el-form-item>
                         <el-form-item label="超时状态" prop="limitStatus">
@@ -58,18 +48,19 @@
                                 :options="timeoutList"
                                 :show-all-levels="false"
                                 clearable></el-cascader> -->
-                                <el-select v-model.trim="formData.limitStatus" clearable class="u-item-width-normal">
-                                    <el-option v-for="item in timeoutList" :key="item.value" :label="item.label" :value="item.value">
-                                    </el-option>
-                                </el-select>
+                            <el-select v-model.trim="formData.limitStatus" clearable class="u-item-width-normal">
+                                <el-option v-for="item in timeoutList" :key="item.value" :label="item.label"
+                                    :value="item.value">
+                                </el-option>
+                            </el-select>
                         </el-form-item>
                         <el-form-item label="办结时限" prop="timeLimit">
-                            <el-date-picker v-model.trim="formData.timeLimit" 
-                                class="u-item-width-daterange" size="small" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                            <el-date-picker v-model.trim="formData.limitStartTime" class="u-item-width-daterange"
+                                size="small" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
                                 value="yyyy-MM-dd HH:mm:ss" 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.limitEndTime"
                                 class="u-item-width-daterange u-data-tag" size="small" type="datetime"
                                 value-format="yyyy-MM-dd HH:mm:ss" value="yyyy-MM-dd HH:mm:ss" placeholder="结束时间">
                             </el-date-picker>
@@ -108,7 +99,7 @@
 
                     <el-table-column prop="workOrderNum" align="center" label="工单编号" :show-overflow-tooltip="true">
                     </el-table-column>
-                    <el-table-column prop="categoryAllName"  label="事件类别" min-width="140" align="center"
+                    <el-table-column prop="categoryAllName" label="事件类别" min-width="140" align="center"
                         :show-overflow-tooltip="true" />
                     <!-- <template slot-scope="scope">
               {{ scope.row.firstName + '-' + scope.row.secondName }}
@@ -133,28 +124,32 @@
                             </span>
                         </template>
                     </el-table-column> -->
-                    <el-table-column prop="latestOperatedTime" align="center" width="110" label="部门办结时限" :show-overflow-tooltip="true">
+                    <el-table-column prop="latestOperatedTime" align="center" width="110" label="部门办结时限"
+                        :show-overflow-tooltip="true">
                     </el-table-column>
-                    <el-table-column prop="limitStatus" align="center" width="110" label="办理超期" :show-overflow-tooltip="true">
+                    <el-table-column prop="limitStatus" align="center" width="110" label="办理超期"
+                        :show-overflow-tooltip="true">
                         <!-- <template slot-scope="scope">
                             <span v-if="scope.row.deliverystatus === 0">联系当事人超期</span>
                             <span v-else-if="scope.row.deliverystatus ===1">部门办结超期</span>
                             <span v-else>--</span>
                         </template> -->
                     </el-table-column>
-                    <el-table-column prop="statusName" align="center" width="110" label="办理状态" :show-overflow-tooltip="true">
+                    <el-table-column prop="statusName" align="center" width="110" label="办理状态"
+                        :show-overflow-tooltip="true">
                         <!-- <template slot-scope="scope">
                             <span v-if="scope.row.handlestatus === 0">联系当事人超期</span>
                             <span v-else-if="scope.row.handlestatus ===1">部门办结超期</span>
                             <span v-else>--</span>
                         </template> -->
                     </el-table-column>
-              
+
                     <el-table-column fixed="right" label="操作" align="center" width="200px" prop="status">
                         <template slot-scope="scope">
                             <el-button @click="handleWatch(scope.row)" type="text" size="small">查看</el-button>
-                            <el-button  @click="handleDispose(scope.row)" type="text" size="small" class="">催办</el-button>
-                       
+                            <el-button @click="handleDispose(scope.row)" type="text" size="small"
+                                class="">催办</el-button>
+
                         </template>
                     </el-table-column>
                 </el-table>
@@ -171,10 +166,11 @@
             <event-info ref="eleEditForm" :pageType="pageType" :eventId="eventId" :eventDetailData="eventDetailData"
                 @handleClose="handleClose" @handleOk="handleOk" @dialogOk="handleEditSuccess" />
         </div>
-        <el-dialog title="催办" :visible.sync="dialogVisible" width="650px" top="5vh" class="dialog-h" :before-close="handleClose">
-            
-            <Urging ref="ref_form"  v-if="dialogVisible" @dialogCancle="addFormCancle"
-              @dialogOk="addFormOk" :eventDetailData="eventDetailData"></Urging>
+        <el-dialog title="催办" :visible.sync="dialogVisible" width="650px" top="5vh" class="dialog-h"
+            :before-close="handleClose">
+
+            <Urging ref="ref_form" v-if="dialogVisible" @dialogCancle="addFormCancle" @dialogOk="addFormOk"
+                :eventDetailData="eventDetailData"></Urging>
             <span slot="footer" class="dialog-footer">
                 <el-button @click="dialogVisible = false">取 消</el-button>
                 <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
@@ -790,7 +786,18 @@ export default {
         },
       showAwoList(row) {
           this.$refs.awoList.open(row)
-      }
+      },
+        handleChangeAgency(val) {
+            this.sarr = []
+            const map = new Map();
+            this.getLastItem(
+                this.orgOptions,
+                val,
+                "agencyId"
+            );
+            this.level = this.sarr[this.sarr.length - 1].level
+            this.formData.departId = this.sarr[this.sarr.length - 1].agencyId
+        },
     },
 };
 </script>