diff --git a/src/views/caseManage/caseCommon/caseProcess.vue b/src/views/caseManage/caseCommon/caseProcess.vue
index 64ba2e4..727e64e 100644
--- a/src/views/caseManage/caseCommon/caseProcess.vue
+++ b/src/views/caseManage/caseCommon/caseProcess.vue
@@ -1,13 +1,6 @@
 <template>
   <div class="app-container">
     <el-form ref="processForm" :model="processForm" label-width="auto">
-      <el-row>
-        <el-form-item label="下一步处理方式">
-          <el-radio-group v-model="processForm.changeState" @change="selectNextOperation">
-            <el-radio v-for="node in nextNodeList" :key="'_node'+node.id" :label="node.nextState">{{ node.nextOperation }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-      </el-row>
       <div v-if="showDateTime">
         <el-row>
           <el-form-item label="完成时限">
@@ -20,17 +13,43 @@
           </el-form-item>
         </el-row>
       </div>
+      <div v-if="showCaseType">
+        <el-form-item label="事件类型" required>
+          <el-col :span="6">
+            <el-select key="eorcSelect" v-model="processForm.eorc" placeholder="请选择" style="width: 100%" @change="selectEorc">
+              <el-option v-for="item of eorcList" :key="'eorc_'+item.value" :label="item.name" :value="item.value"/>
+            </el-select>
+          </el-col>
+          <el-col :span="6">
+            <el-select key="typeSelect" v-model="processForm.caseTypeCode" placeholder="请选择" style="width: 100%" @change="selectCaseType">
+              <el-option v-for="item of caseTypeList" :key="'case_'+item.id" :label="item.typeName" :value="item.typeCode"/>
+            </el-select>
+          </el-col>
+          <el-col :span="6">
+            <el-select key="typeDetailSelect" v-model="processForm.caseTypeDetailCode" placeholder="请选择" style="width: 100%" clearable>
+              <el-option v-for="item of caseDetailTypeList" :key="'casedetail_'+item.id" :label="item.typeDetailName" :value="item.typeDetailCode"/>
+            </el-select>
+          </el-col>
+        </el-form-item>
+      </div>
+      <el-row>
+        <el-form-item label="下一步处理方式" required>
+          <el-radio-group v-model="processForm.changeState" @change="selectNextOperation">
+            <el-radio v-for="node in nextNodeList" :key="'_node'+node.id" :label="node.nextState">{{ node.nextOperation }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-row>
       <div v-if="showSingleSelect">
         <el-row>
           <el-col :span="6">
-            <el-form-item label="处理部门">
+            <el-form-item label="处理部门" required>
               <el-select key="muiltDept" v-model="processForm.dispatchDeptId" :loading="deptSelectLoading" filterable placeholder="请选择处理部门" @change="selectDisposalDept">
                 <el-option v-for="item in disposalDeptList" :key="item.id" :label="item.simplename" :value="item.id"/>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="交办处理人">
+            <el-form-item label="交办处理人" required>
               <el-select key="singleUser" v-model="processForm.taskUserId" :loading="userSelectLoading" filterable placeholder="请选择处理人">
                 <el-option v-for="item in normalUserList" :key="'single_'+item.id" :label="item.name" :value="item.id"/>
               </el-select>
@@ -41,14 +60,14 @@
       <div v-if="showMulitSelect">
         <el-row>
           <el-col :span="6">
-            <el-form-item label="处理部门">
+            <el-form-item label="处理部门" required>
               <el-select key="muiltDept" v-model="selectedDept" :loading="deptSelectLoading" filterable placeholder="请选择处理部门" @change="selectDept" >
                 <el-option v-for="item in deptList" :key="item.id" :label="item.simplename" :value="item.id"/>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="会签处理人">
+            <el-form-item label="会签处理人" required>
               <el-select key="MulitUser" v-model="selectedUserList" :loading="userSelectLoading" multiple filterable placeholder="请选择处理人" style="width:400px" @change="selectUser" >
                 <el-option v-for="item in userList" :key="'mulit_'+item.id" :label="item.name" :value="item.id"/>
               </el-select>
@@ -75,6 +94,8 @@
 
 <script>
 import DeptSelect from '@/components/DeptSelect'
+import { getEorc } from '@/api/allDict'
+import { getCaseType, getCaseDetailType } from '@/api/callCase'
 import { getDisposalDeptList, getUserList, getDeptList } from '@/api/callCase'
 import { getNextNodeList, completeCaseTask } from '@/api/process'
 export default {
@@ -100,6 +121,10 @@
     limitedTime: {
       type: String,
       default: ''
+    },
+    caseDetail: {
+      type: Object,
+      default: null
     }
   },
   data() {
@@ -112,14 +137,21 @@
         remarks: '', // 备注
         dispatchDeptId: '', // 指派任务给某个组织机构
         taskUserId: '', // 任务指派人员,
-        limitedTime: '' // 完成时限
+        limitedTime: '', // 完成时限,
+        eorc: '',
+        caseTypeCode: '',
+        caseTypeDetailCode: ''
       },
       nextNodeList: [], // 流程节点列表
+      eorcList: [],
+      caseTypeList: [],
+      caseDetailTypeList: [],
       disposalDeptList: [], // 处置部门列表（交办用）
       normalUserList: [], // 处置人员列表（交办用）
       showSingleSelect: false, // 选择人员，单选
       showMulitSelect: false, // 选择人员，多选
       showDateTime: false, // 选择延期时间
+      showCaseType: false,
       deptSelectLoading: false, // 处置部门选择框加载动画
       userSelectLoading: false, // 处理人选择框加载动画
       userQuery: {
@@ -144,6 +176,16 @@
     this.fetchNextNodeList()
     this.fetchDisposalDeptList()
     this.fetchDeptList()
+    this.fetchEorcList()
+
+    if ((this.caseState === 6 || this.caseState === 33 || this.caseState === 31) && this.hasPerm('/changeLimitedTime')) {
+      this.processForm.limitedTime = this.limitedTime
+      this.showDateTime = true
+    }
+    if (this.caseState === 6) {
+      this.setCaseType()
+      this.showCaseType = true
+    }
   },
   methods: {
     /**
@@ -154,6 +196,46 @@
         this.nextNodeList = response.data
       })
     },
+    // 大类列表
+    fetchEorcList() {
+      getEorc().then(response => {
+        if (response.code === 200) {
+          this.eorcList = response.data
+        }
+      })
+    },
+    // 二级类型列表
+    fetchCaseTypeList() {
+      getCaseType(this.processForm.eorc).then(response => {
+        this.caseTypeList = response.data
+      })
+    },
+    // 三级类型列表
+    fetchCaseDetailTypeList() {
+      getCaseDetailType(this.processForm.caseTypeCode).then(response => {
+        this.caseDetailTypeList = response.data
+      })
+    },
+    selectEorc(val) {
+      console.log('selectEorc', val)
+      if (val === '') {
+        this.processForm.caseTypeCode = ''
+        this.processForm.caseTypeDetailCode = ''
+      } else {
+        this.processForm.caseTypeCode = ''
+        this.processForm.caseTypeDetailCode = ''
+        this.fetchCaseTypeList()
+      }
+    },
+    selectCaseType(val) {
+      console.log('selectCaseType', val)
+      if (val === '') {
+        this.processForm.caseTypeDetailCode = ''
+      } else {
+        this.processForm.caseTypeDetailCode = ''
+        this.fetchCaseDetailTypeList()
+      }
+    },
     /**
      * 选择处理方式之后：
      * 如果下一步是交办，选择人员和部门（单选），清空相关信息
@@ -163,10 +245,10 @@
     selectNextOperation(changeState) {
       this.showSingleSelect = false
       this.showMulitSelect = false
-      this.showDateTime = false
+      // this.showDateTime = false
       this.processForm.dispatchDeptId = ''
       this.processForm.taskUserId = ''
-      this.processForm.limitedTime = ''
+      // this.processForm.limitedTime = ''
 
       this.normalUserList = []
       this.selectedDept = ''
@@ -181,14 +263,22 @@
       // 会签
       if (changeState === 9) {
         this.showMulitSelect = true
-        // console.log('select==>', this.selectedUserList)
       }
-      if ((this.caseState === 6 || this.caseState === 33 || this.caseState === 31) && this.hasPerm('/changeLimitedTime')) {
-        if (changeState !== 5 && changeState !== 4) {
-          this.processForm.limitedTime = this.limitedTime
-          this.showDateTime = true
-        }
-      }
+      // if ((this.caseState === 6 || this.caseState === 33 || this.caseState === 31) && this.hasPerm('/changeLimitedTime')) {
+      //   if (changeState !== 5 && changeState !== 4) {
+      //     // this.processForm.limitedTime = this.limitedTime
+      //     this.showDateTime = true
+      //   }
+      //   // this.setCaseType()
+      //   this.showCaseType = true
+      // }
+    },
+    async setCaseType() {
+      this.processForm.eorc = this.caseDetail.eorc
+      await this.fetchCaseTypeList()
+      this.processForm.caseTypeCode = this.caseDetail.caseTypeCode
+      await this.fetchCaseDetailTypeList()
+      this.processForm.caseTypeDetailCode = this.caseDetail.caseDetailTypeCode
     },
     // 提交
     onSubmit() {
@@ -251,6 +341,12 @@
         console.log('countersigns', counterSigns)
         this.processForm.countersigns = counterSigns
       }
+      if (this.showCaseType) {
+        if (!this.processForm.eorc || !this.processForm.caseTypeCode || !this.processForm.caseTypeDetailCode) {
+          this.$message.error('事件类型不能为空')
+          return false
+        }
+      }
       // 会签完成/未完成：传taskId
       if (this.processForm.currState === 9) {
         this.processForm.taskId = this.taskId

diff --git a/src/views/caseManage/caseCommon/caseProcess.vue b/src/views/caseManage/caseCommon/caseProcess.vue
index 64ba2e4..727e64e 100644
--- a/src/views/caseManage/caseCommon/caseProcess.vue
+++ b/src/views/caseManage/caseCommon/caseProcess.vue
@@ -1,13 +1,6 @@
 <template>
   <div class="app-container">
     <el-form ref="processForm" :model="processForm" label-width="auto">
-      <el-row>
-        <el-form-item label="下一步处理方式">
-          <el-radio-group v-model="processForm.changeState" @change="selectNextOperation">
-            <el-radio v-for="node in nextNodeList" :key="'_node'+node.id" :label="node.nextState">{{ node.nextOperation }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-      </el-row>
       <div v-if="showDateTime">
         <el-row>
           <el-form-item label="完成时限">
@@ -20,17 +13,43 @@
           </el-form-item>
         </el-row>
       </div>
+      <div v-if="showCaseType">
+        <el-form-item label="事件类型" required>
+          <el-col :span="6">
+            <el-select key="eorcSelect" v-model="processForm.eorc" placeholder="请选择" style="width: 100%" @change="selectEorc">
+              <el-option v-for="item of eorcList" :key="'eorc_'+item.value" :label="item.name" :value="item.value"/>
+            </el-select>
+          </el-col>
+          <el-col :span="6">
+            <el-select key="typeSelect" v-model="processForm.caseTypeCode" placeholder="请选择" style="width: 100%" @change="selectCaseType">
+              <el-option v-for="item of caseTypeList" :key="'case_'+item.id" :label="item.typeName" :value="item.typeCode"/>
+            </el-select>
+          </el-col>
+          <el-col :span="6">
+            <el-select key="typeDetailSelect" v-model="processForm.caseTypeDetailCode" placeholder="请选择" style="width: 100%" clearable>
+              <el-option v-for="item of caseDetailTypeList" :key="'casedetail_'+item.id" :label="item.typeDetailName" :value="item.typeDetailCode"/>
+            </el-select>
+          </el-col>
+        </el-form-item>
+      </div>
+      <el-row>
+        <el-form-item label="下一步处理方式" required>
+          <el-radio-group v-model="processForm.changeState" @change="selectNextOperation">
+            <el-radio v-for="node in nextNodeList" :key="'_node'+node.id" :label="node.nextState">{{ node.nextOperation }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-row>
       <div v-if="showSingleSelect">
         <el-row>
           <el-col :span="6">
-            <el-form-item label="处理部门">
+            <el-form-item label="处理部门" required>
               <el-select key="muiltDept" v-model="processForm.dispatchDeptId" :loading="deptSelectLoading" filterable placeholder="请选择处理部门" @change="selectDisposalDept">
                 <el-option v-for="item in disposalDeptList" :key="item.id" :label="item.simplename" :value="item.id"/>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="交办处理人">
+            <el-form-item label="交办处理人" required>
               <el-select key="singleUser" v-model="processForm.taskUserId" :loading="userSelectLoading" filterable placeholder="请选择处理人">
                 <el-option v-for="item in normalUserList" :key="'single_'+item.id" :label="item.name" :value="item.id"/>
               </el-select>
@@ -41,14 +60,14 @@
       <div v-if="showMulitSelect">
         <el-row>
           <el-col :span="6">
-            <el-form-item label="处理部门">
+            <el-form-item label="处理部门" required>
               <el-select key="muiltDept" v-model="selectedDept" :loading="deptSelectLoading" filterable placeholder="请选择处理部门" @change="selectDept" >
                 <el-option v-for="item in deptList" :key="item.id" :label="item.simplename" :value="item.id"/>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="会签处理人">
+            <el-form-item label="会签处理人" required>
               <el-select key="MulitUser" v-model="selectedUserList" :loading="userSelectLoading" multiple filterable placeholder="请选择处理人" style="width:400px" @change="selectUser" >
                 <el-option v-for="item in userList" :key="'mulit_'+item.id" :label="item.name" :value="item.id"/>
               </el-select>
@@ -75,6 +94,8 @@
 
 <script>
 import DeptSelect from '@/components/DeptSelect'
+import { getEorc } from '@/api/allDict'
+import { getCaseType, getCaseDetailType } from '@/api/callCase'
 import { getDisposalDeptList, getUserList, getDeptList } from '@/api/callCase'
 import { getNextNodeList, completeCaseTask } from '@/api/process'
 export default {
@@ -100,6 +121,10 @@
     limitedTime: {
       type: String,
       default: ''
+    },
+    caseDetail: {
+      type: Object,
+      default: null
     }
   },
   data() {
@@ -112,14 +137,21 @@
         remarks: '', // 备注
         dispatchDeptId: '', // 指派任务给某个组织机构
         taskUserId: '', // 任务指派人员,
-        limitedTime: '' // 完成时限
+        limitedTime: '', // 完成时限,
+        eorc: '',
+        caseTypeCode: '',
+        caseTypeDetailCode: ''
       },
       nextNodeList: [], // 流程节点列表
+      eorcList: [],
+      caseTypeList: [],
+      caseDetailTypeList: [],
       disposalDeptList: [], // 处置部门列表（交办用）
       normalUserList: [], // 处置人员列表（交办用）
       showSingleSelect: false, // 选择人员，单选
       showMulitSelect: false, // 选择人员，多选
       showDateTime: false, // 选择延期时间
+      showCaseType: false,
       deptSelectLoading: false, // 处置部门选择框加载动画
       userSelectLoading: false, // 处理人选择框加载动画
       userQuery: {
@@ -144,6 +176,16 @@
     this.fetchNextNodeList()
     this.fetchDisposalDeptList()
     this.fetchDeptList()
+    this.fetchEorcList()
+
+    if ((this.caseState === 6 || this.caseState === 33 || this.caseState === 31) && this.hasPerm('/changeLimitedTime')) {
+      this.processForm.limitedTime = this.limitedTime
+      this.showDateTime = true
+    }
+    if (this.caseState === 6) {
+      this.setCaseType()
+      this.showCaseType = true
+    }
   },
   methods: {
     /**
@@ -154,6 +196,46 @@
         this.nextNodeList = response.data
       })
     },
+    // 大类列表
+    fetchEorcList() {
+      getEorc().then(response => {
+        if (response.code === 200) {
+          this.eorcList = response.data
+        }
+      })
+    },
+    // 二级类型列表
+    fetchCaseTypeList() {
+      getCaseType(this.processForm.eorc).then(response => {
+        this.caseTypeList = response.data
+      })
+    },
+    // 三级类型列表
+    fetchCaseDetailTypeList() {
+      getCaseDetailType(this.processForm.caseTypeCode).then(response => {
+        this.caseDetailTypeList = response.data
+      })
+    },
+    selectEorc(val) {
+      console.log('selectEorc', val)
+      if (val === '') {
+        this.processForm.caseTypeCode = ''
+        this.processForm.caseTypeDetailCode = ''
+      } else {
+        this.processForm.caseTypeCode = ''
+        this.processForm.caseTypeDetailCode = ''
+        this.fetchCaseTypeList()
+      }
+    },
+    selectCaseType(val) {
+      console.log('selectCaseType', val)
+      if (val === '') {
+        this.processForm.caseTypeDetailCode = ''
+      } else {
+        this.processForm.caseTypeDetailCode = ''
+        this.fetchCaseDetailTypeList()
+      }
+    },
     /**
      * 选择处理方式之后：
      * 如果下一步是交办，选择人员和部门（单选），清空相关信息
@@ -163,10 +245,10 @@
     selectNextOperation(changeState) {
       this.showSingleSelect = false
       this.showMulitSelect = false
-      this.showDateTime = false
+      // this.showDateTime = false
       this.processForm.dispatchDeptId = ''
       this.processForm.taskUserId = ''
-      this.processForm.limitedTime = ''
+      // this.processForm.limitedTime = ''
 
       this.normalUserList = []
       this.selectedDept = ''
@@ -181,14 +263,22 @@
       // 会签
       if (changeState === 9) {
         this.showMulitSelect = true
-        // console.log('select==>', this.selectedUserList)
       }
-      if ((this.caseState === 6 || this.caseState === 33 || this.caseState === 31) && this.hasPerm('/changeLimitedTime')) {
-        if (changeState !== 5 && changeState !== 4) {
-          this.processForm.limitedTime = this.limitedTime
-          this.showDateTime = true
-        }
-      }
+      // if ((this.caseState === 6 || this.caseState === 33 || this.caseState === 31) && this.hasPerm('/changeLimitedTime')) {
+      //   if (changeState !== 5 && changeState !== 4) {
+      //     // this.processForm.limitedTime = this.limitedTime
+      //     this.showDateTime = true
+      //   }
+      //   // this.setCaseType()
+      //   this.showCaseType = true
+      // }
+    },
+    async setCaseType() {
+      this.processForm.eorc = this.caseDetail.eorc
+      await this.fetchCaseTypeList()
+      this.processForm.caseTypeCode = this.caseDetail.caseTypeCode
+      await this.fetchCaseDetailTypeList()
+      this.processForm.caseTypeDetailCode = this.caseDetail.caseDetailTypeCode
     },
     // 提交
     onSubmit() {
@@ -251,6 +341,12 @@
         console.log('countersigns', counterSigns)
         this.processForm.countersigns = counterSigns
       }
+      if (this.showCaseType) {
+        if (!this.processForm.eorc || !this.processForm.caseTypeCode || !this.processForm.caseTypeDetailCode) {
+          this.$message.error('事件类型不能为空')
+          return false
+        }
+      }
       // 会签完成/未完成：传taskId
       if (this.processForm.currState === 9) {
         this.processForm.taskId = this.taskId
diff --git a/src/views/caseManage/caseDetail.vue b/src/views/caseManage/caseDetail.vue
index bc5b6dc..b8ed029 100644
--- a/src/views/caseManage/caseDetail.vue
+++ b/src/views/caseManage/caseDetail.vue
@@ -20,6 +20,7 @@
         :task-id="taskId"
         :case-state="caseDetail.caseState"
         :limited-time="caseDetail.limitedTime"
+        :case-detail="caseDetail"
         @loading="loading"
         @submitSuccess="submitSuccess"
         @submitError="submitError"

diff --git a/src/views/caseManage/caseCommon/caseProcess.vue b/src/views/caseManage/caseCommon/caseProcess.vue
index 64ba2e4..727e64e 100644
--- a/src/views/caseManage/caseCommon/caseProcess.vue
+++ b/src/views/caseManage/caseCommon/caseProcess.vue
@@ -1,13 +1,6 @@
 <template>
   <div class="app-container">
     <el-form ref="processForm" :model="processForm" label-width="auto">
-      <el-row>
-        <el-form-item label="下一步处理方式">
-          <el-radio-group v-model="processForm.changeState" @change="selectNextOperation">
-            <el-radio v-for="node in nextNodeList" :key="'_node'+node.id" :label="node.nextState">{{ node.nextOperation }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-      </el-row>
       <div v-if="showDateTime">
         <el-row>
           <el-form-item label="完成时限">
@@ -20,17 +13,43 @@
           </el-form-item>
         </el-row>
       </div>
+      <div v-if="showCaseType">
+        <el-form-item label="事件类型" required>
+          <el-col :span="6">
+            <el-select key="eorcSelect" v-model="processForm.eorc" placeholder="请选择" style="width: 100%" @change="selectEorc">
+              <el-option v-for="item of eorcList" :key="'eorc_'+item.value" :label="item.name" :value="item.value"/>
+            </el-select>
+          </el-col>
+          <el-col :span="6">
+            <el-select key="typeSelect" v-model="processForm.caseTypeCode" placeholder="请选择" style="width: 100%" @change="selectCaseType">
+              <el-option v-for="item of caseTypeList" :key="'case_'+item.id" :label="item.typeName" :value="item.typeCode"/>
+            </el-select>
+          </el-col>
+          <el-col :span="6">
+            <el-select key="typeDetailSelect" v-model="processForm.caseTypeDetailCode" placeholder="请选择" style="width: 100%" clearable>
+              <el-option v-for="item of caseDetailTypeList" :key="'casedetail_'+item.id" :label="item.typeDetailName" :value="item.typeDetailCode"/>
+            </el-select>
+          </el-col>
+        </el-form-item>
+      </div>
+      <el-row>
+        <el-form-item label="下一步处理方式" required>
+          <el-radio-group v-model="processForm.changeState" @change="selectNextOperation">
+            <el-radio v-for="node in nextNodeList" :key="'_node'+node.id" :label="node.nextState">{{ node.nextOperation }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-row>
       <div v-if="showSingleSelect">
         <el-row>
           <el-col :span="6">
-            <el-form-item label="处理部门">
+            <el-form-item label="处理部门" required>
               <el-select key="muiltDept" v-model="processForm.dispatchDeptId" :loading="deptSelectLoading" filterable placeholder="请选择处理部门" @change="selectDisposalDept">
                 <el-option v-for="item in disposalDeptList" :key="item.id" :label="item.simplename" :value="item.id"/>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="交办处理人">
+            <el-form-item label="交办处理人" required>
               <el-select key="singleUser" v-model="processForm.taskUserId" :loading="userSelectLoading" filterable placeholder="请选择处理人">
                 <el-option v-for="item in normalUserList" :key="'single_'+item.id" :label="item.name" :value="item.id"/>
               </el-select>
@@ -41,14 +60,14 @@
       <div v-if="showMulitSelect">
         <el-row>
           <el-col :span="6">
-            <el-form-item label="处理部门">
+            <el-form-item label="处理部门" required>
               <el-select key="muiltDept" v-model="selectedDept" :loading="deptSelectLoading" filterable placeholder="请选择处理部门" @change="selectDept" >
                 <el-option v-for="item in deptList" :key="item.id" :label="item.simplename" :value="item.id"/>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="会签处理人">
+            <el-form-item label="会签处理人" required>
               <el-select key="MulitUser" v-model="selectedUserList" :loading="userSelectLoading" multiple filterable placeholder="请选择处理人" style="width:400px" @change="selectUser" >
                 <el-option v-for="item in userList" :key="'mulit_'+item.id" :label="item.name" :value="item.id"/>
               </el-select>
@@ -75,6 +94,8 @@
 
 <script>
 import DeptSelect from '@/components/DeptSelect'
+import { getEorc } from '@/api/allDict'
+import { getCaseType, getCaseDetailType } from '@/api/callCase'
 import { getDisposalDeptList, getUserList, getDeptList } from '@/api/callCase'
 import { getNextNodeList, completeCaseTask } from '@/api/process'
 export default {
@@ -100,6 +121,10 @@
     limitedTime: {
       type: String,
       default: ''
+    },
+    caseDetail: {
+      type: Object,
+      default: null
     }
   },
   data() {
@@ -112,14 +137,21 @@
         remarks: '', // 备注
         dispatchDeptId: '', // 指派任务给某个组织机构
         taskUserId: '', // 任务指派人员,
-        limitedTime: '' // 完成时限
+        limitedTime: '', // 完成时限,
+        eorc: '',
+        caseTypeCode: '',
+        caseTypeDetailCode: ''
       },
       nextNodeList: [], // 流程节点列表
+      eorcList: [],
+      caseTypeList: [],
+      caseDetailTypeList: [],
       disposalDeptList: [], // 处置部门列表（交办用）
       normalUserList: [], // 处置人员列表（交办用）
       showSingleSelect: false, // 选择人员，单选
       showMulitSelect: false, // 选择人员，多选
       showDateTime: false, // 选择延期时间
+      showCaseType: false,
       deptSelectLoading: false, // 处置部门选择框加载动画
       userSelectLoading: false, // 处理人选择框加载动画
       userQuery: {
@@ -144,6 +176,16 @@
     this.fetchNextNodeList()
     this.fetchDisposalDeptList()
     this.fetchDeptList()
+    this.fetchEorcList()
+
+    if ((this.caseState === 6 || this.caseState === 33 || this.caseState === 31) && this.hasPerm('/changeLimitedTime')) {
+      this.processForm.limitedTime = this.limitedTime
+      this.showDateTime = true
+    }
+    if (this.caseState === 6) {
+      this.setCaseType()
+      this.showCaseType = true
+    }
   },
   methods: {
     /**
@@ -154,6 +196,46 @@
         this.nextNodeList = response.data
       })
     },
+    // 大类列表
+    fetchEorcList() {
+      getEorc().then(response => {
+        if (response.code === 200) {
+          this.eorcList = response.data
+        }
+      })
+    },
+    // 二级类型列表
+    fetchCaseTypeList() {
+      getCaseType(this.processForm.eorc).then(response => {
+        this.caseTypeList = response.data
+      })
+    },
+    // 三级类型列表
+    fetchCaseDetailTypeList() {
+      getCaseDetailType(this.processForm.caseTypeCode).then(response => {
+        this.caseDetailTypeList = response.data
+      })
+    },
+    selectEorc(val) {
+      console.log('selectEorc', val)
+      if (val === '') {
+        this.processForm.caseTypeCode = ''
+        this.processForm.caseTypeDetailCode = ''
+      } else {
+        this.processForm.caseTypeCode = ''
+        this.processForm.caseTypeDetailCode = ''
+        this.fetchCaseTypeList()
+      }
+    },
+    selectCaseType(val) {
+      console.log('selectCaseType', val)
+      if (val === '') {
+        this.processForm.caseTypeDetailCode = ''
+      } else {
+        this.processForm.caseTypeDetailCode = ''
+        this.fetchCaseDetailTypeList()
+      }
+    },
     /**
      * 选择处理方式之后：
      * 如果下一步是交办，选择人员和部门（单选），清空相关信息
@@ -163,10 +245,10 @@
     selectNextOperation(changeState) {
       this.showSingleSelect = false
       this.showMulitSelect = false
-      this.showDateTime = false
+      // this.showDateTime = false
       this.processForm.dispatchDeptId = ''
       this.processForm.taskUserId = ''
-      this.processForm.limitedTime = ''
+      // this.processForm.limitedTime = ''
 
       this.normalUserList = []
       this.selectedDept = ''
@@ -181,14 +263,22 @@
       // 会签
       if (changeState === 9) {
         this.showMulitSelect = true
-        // console.log('select==>', this.selectedUserList)
       }
-      if ((this.caseState === 6 || this.caseState === 33 || this.caseState === 31) && this.hasPerm('/changeLimitedTime')) {
-        if (changeState !== 5 && changeState !== 4) {
-          this.processForm.limitedTime = this.limitedTime
-          this.showDateTime = true
-        }
-      }
+      // if ((this.caseState === 6 || this.caseState === 33 || this.caseState === 31) && this.hasPerm('/changeLimitedTime')) {
+      //   if (changeState !== 5 && changeState !== 4) {
+      //     // this.processForm.limitedTime = this.limitedTime
+      //     this.showDateTime = true
+      //   }
+      //   // this.setCaseType()
+      //   this.showCaseType = true
+      // }
+    },
+    async setCaseType() {
+      this.processForm.eorc = this.caseDetail.eorc
+      await this.fetchCaseTypeList()
+      this.processForm.caseTypeCode = this.caseDetail.caseTypeCode
+      await this.fetchCaseDetailTypeList()
+      this.processForm.caseTypeDetailCode = this.caseDetail.caseDetailTypeCode
     },
     // 提交
     onSubmit() {
@@ -251,6 +341,12 @@
         console.log('countersigns', counterSigns)
         this.processForm.countersigns = counterSigns
       }
+      if (this.showCaseType) {
+        if (!this.processForm.eorc || !this.processForm.caseTypeCode || !this.processForm.caseTypeDetailCode) {
+          this.$message.error('事件类型不能为空')
+          return false
+        }
+      }
       // 会签完成/未完成：传taskId
       if (this.processForm.currState === 9) {
         this.processForm.taskId = this.taskId
diff --git a/src/views/caseManage/caseDetail.vue b/src/views/caseManage/caseDetail.vue
index bc5b6dc..b8ed029 100644
--- a/src/views/caseManage/caseDetail.vue
+++ b/src/views/caseManage/caseDetail.vue
@@ -20,6 +20,7 @@
         :task-id="taskId"
         :case-state="caseDetail.caseState"
         :limited-time="caseDetail.limitedTime"
+        :case-detail="caseDetail"
         @loading="loading"
         @submitSuccess="submitSuccess"
         @submitError="submitError"
diff --git a/src/views/caseManage/delayApplyList.vue b/src/views/caseManage/delayApplyList.vue
index 1e34554..5ed2204 100644
--- a/src/views/caseManage/delayApplyList.vue
+++ b/src/views/caseManage/delayApplyList.vue
@@ -189,7 +189,7 @@
       })
     },
     approve(row) {
-      this.$confirm('确认同意延期吗', '提示', {
+      this.$confirm('确认同意延期吗?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
@@ -201,7 +201,7 @@
       })
     },
     reject(row) {
-      this.$confirm('确认拒绝延期吗', '提示', {
+      this.$confirm('确认拒绝延期吗?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

diff --git a/src/views/caseManage/caseCommon/caseProcess.vue b/src/views/caseManage/caseCommon/caseProcess.vue
index 64ba2e4..727e64e 100644
--- a/src/views/caseManage/caseCommon/caseProcess.vue
+++ b/src/views/caseManage/caseCommon/caseProcess.vue
@@ -1,13 +1,6 @@
 <template>
   <div class="app-container">
     <el-form ref="processForm" :model="processForm" label-width="auto">
-      <el-row>
-        <el-form-item label="下一步处理方式">
-          <el-radio-group v-model="processForm.changeState" @change="selectNextOperation">
-            <el-radio v-for="node in nextNodeList" :key="'_node'+node.id" :label="node.nextState">{{ node.nextOperation }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-      </el-row>
       <div v-if="showDateTime">
         <el-row>
           <el-form-item label="完成时限">
@@ -20,17 +13,43 @@
           </el-form-item>
         </el-row>
       </div>
+      <div v-if="showCaseType">
+        <el-form-item label="事件类型" required>
+          <el-col :span="6">
+            <el-select key="eorcSelect" v-model="processForm.eorc" placeholder="请选择" style="width: 100%" @change="selectEorc">
+              <el-option v-for="item of eorcList" :key="'eorc_'+item.value" :label="item.name" :value="item.value"/>
+            </el-select>
+          </el-col>
+          <el-col :span="6">
+            <el-select key="typeSelect" v-model="processForm.caseTypeCode" placeholder="请选择" style="width: 100%" @change="selectCaseType">
+              <el-option v-for="item of caseTypeList" :key="'case_'+item.id" :label="item.typeName" :value="item.typeCode"/>
+            </el-select>
+          </el-col>
+          <el-col :span="6">
+            <el-select key="typeDetailSelect" v-model="processForm.caseTypeDetailCode" placeholder="请选择" style="width: 100%" clearable>
+              <el-option v-for="item of caseDetailTypeList" :key="'casedetail_'+item.id" :label="item.typeDetailName" :value="item.typeDetailCode"/>
+            </el-select>
+          </el-col>
+        </el-form-item>
+      </div>
+      <el-row>
+        <el-form-item label="下一步处理方式" required>
+          <el-radio-group v-model="processForm.changeState" @change="selectNextOperation">
+            <el-radio v-for="node in nextNodeList" :key="'_node'+node.id" :label="node.nextState">{{ node.nextOperation }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-row>
       <div v-if="showSingleSelect">
         <el-row>
           <el-col :span="6">
-            <el-form-item label="处理部门">
+            <el-form-item label="处理部门" required>
               <el-select key="muiltDept" v-model="processForm.dispatchDeptId" :loading="deptSelectLoading" filterable placeholder="请选择处理部门" @change="selectDisposalDept">
                 <el-option v-for="item in disposalDeptList" :key="item.id" :label="item.simplename" :value="item.id"/>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="交办处理人">
+            <el-form-item label="交办处理人" required>
               <el-select key="singleUser" v-model="processForm.taskUserId" :loading="userSelectLoading" filterable placeholder="请选择处理人">
                 <el-option v-for="item in normalUserList" :key="'single_'+item.id" :label="item.name" :value="item.id"/>
               </el-select>
@@ -41,14 +60,14 @@
       <div v-if="showMulitSelect">
         <el-row>
           <el-col :span="6">
-            <el-form-item label="处理部门">
+            <el-form-item label="处理部门" required>
               <el-select key="muiltDept" v-model="selectedDept" :loading="deptSelectLoading" filterable placeholder="请选择处理部门" @change="selectDept" >
                 <el-option v-for="item in deptList" :key="item.id" :label="item.simplename" :value="item.id"/>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="会签处理人">
+            <el-form-item label="会签处理人" required>
               <el-select key="MulitUser" v-model="selectedUserList" :loading="userSelectLoading" multiple filterable placeholder="请选择处理人" style="width:400px" @change="selectUser" >
                 <el-option v-for="item in userList" :key="'mulit_'+item.id" :label="item.name" :value="item.id"/>
               </el-select>
@@ -75,6 +94,8 @@
 
 <script>
 import DeptSelect from '@/components/DeptSelect'
+import { getEorc } from '@/api/allDict'
+import { getCaseType, getCaseDetailType } from '@/api/callCase'
 import { getDisposalDeptList, getUserList, getDeptList } from '@/api/callCase'
 import { getNextNodeList, completeCaseTask } from '@/api/process'
 export default {
@@ -100,6 +121,10 @@
     limitedTime: {
       type: String,
       default: ''
+    },
+    caseDetail: {
+      type: Object,
+      default: null
     }
   },
   data() {
@@ -112,14 +137,21 @@
         remarks: '', // 备注
         dispatchDeptId: '', // 指派任务给某个组织机构
         taskUserId: '', // 任务指派人员,
-        limitedTime: '' // 完成时限
+        limitedTime: '', // 完成时限,
+        eorc: '',
+        caseTypeCode: '',
+        caseTypeDetailCode: ''
       },
       nextNodeList: [], // 流程节点列表
+      eorcList: [],
+      caseTypeList: [],
+      caseDetailTypeList: [],
       disposalDeptList: [], // 处置部门列表（交办用）
       normalUserList: [], // 处置人员列表（交办用）
       showSingleSelect: false, // 选择人员，单选
       showMulitSelect: false, // 选择人员，多选
       showDateTime: false, // 选择延期时间
+      showCaseType: false,
       deptSelectLoading: false, // 处置部门选择框加载动画
       userSelectLoading: false, // 处理人选择框加载动画
       userQuery: {
@@ -144,6 +176,16 @@
     this.fetchNextNodeList()
     this.fetchDisposalDeptList()
     this.fetchDeptList()
+    this.fetchEorcList()
+
+    if ((this.caseState === 6 || this.caseState === 33 || this.caseState === 31) && this.hasPerm('/changeLimitedTime')) {
+      this.processForm.limitedTime = this.limitedTime
+      this.showDateTime = true
+    }
+    if (this.caseState === 6) {
+      this.setCaseType()
+      this.showCaseType = true
+    }
   },
   methods: {
     /**
@@ -154,6 +196,46 @@
         this.nextNodeList = response.data
       })
     },
+    // 大类列表
+    fetchEorcList() {
+      getEorc().then(response => {
+        if (response.code === 200) {
+          this.eorcList = response.data
+        }
+      })
+    },
+    // 二级类型列表
+    fetchCaseTypeList() {
+      getCaseType(this.processForm.eorc).then(response => {
+        this.caseTypeList = response.data
+      })
+    },
+    // 三级类型列表
+    fetchCaseDetailTypeList() {
+      getCaseDetailType(this.processForm.caseTypeCode).then(response => {
+        this.caseDetailTypeList = response.data
+      })
+    },
+    selectEorc(val) {
+      console.log('selectEorc', val)
+      if (val === '') {
+        this.processForm.caseTypeCode = ''
+        this.processForm.caseTypeDetailCode = ''
+      } else {
+        this.processForm.caseTypeCode = ''
+        this.processForm.caseTypeDetailCode = ''
+        this.fetchCaseTypeList()
+      }
+    },
+    selectCaseType(val) {
+      console.log('selectCaseType', val)
+      if (val === '') {
+        this.processForm.caseTypeDetailCode = ''
+      } else {
+        this.processForm.caseTypeDetailCode = ''
+        this.fetchCaseDetailTypeList()
+      }
+    },
     /**
      * 选择处理方式之后：
      * 如果下一步是交办，选择人员和部门（单选），清空相关信息
@@ -163,10 +245,10 @@
     selectNextOperation(changeState) {
       this.showSingleSelect = false
       this.showMulitSelect = false
-      this.showDateTime = false
+      // this.showDateTime = false
       this.processForm.dispatchDeptId = ''
       this.processForm.taskUserId = ''
-      this.processForm.limitedTime = ''
+      // this.processForm.limitedTime = ''
 
       this.normalUserList = []
       this.selectedDept = ''
@@ -181,14 +263,22 @@
       // 会签
       if (changeState === 9) {
         this.showMulitSelect = true
-        // console.log('select==>', this.selectedUserList)
       }
-      if ((this.caseState === 6 || this.caseState === 33 || this.caseState === 31) && this.hasPerm('/changeLimitedTime')) {
-        if (changeState !== 5 && changeState !== 4) {
-          this.processForm.limitedTime = this.limitedTime
-          this.showDateTime = true
-        }
-      }
+      // if ((this.caseState === 6 || this.caseState === 33 || this.caseState === 31) && this.hasPerm('/changeLimitedTime')) {
+      //   if (changeState !== 5 && changeState !== 4) {
+      //     // this.processForm.limitedTime = this.limitedTime
+      //     this.showDateTime = true
+      //   }
+      //   // this.setCaseType()
+      //   this.showCaseType = true
+      // }
+    },
+    async setCaseType() {
+      this.processForm.eorc = this.caseDetail.eorc
+      await this.fetchCaseTypeList()
+      this.processForm.caseTypeCode = this.caseDetail.caseTypeCode
+      await this.fetchCaseDetailTypeList()
+      this.processForm.caseTypeDetailCode = this.caseDetail.caseDetailTypeCode
     },
     // 提交
     onSubmit() {
@@ -251,6 +341,12 @@
         console.log('countersigns', counterSigns)
         this.processForm.countersigns = counterSigns
       }
+      if (this.showCaseType) {
+        if (!this.processForm.eorc || !this.processForm.caseTypeCode || !this.processForm.caseTypeDetailCode) {
+          this.$message.error('事件类型不能为空')
+          return false
+        }
+      }
       // 会签完成/未完成：传taskId
       if (this.processForm.currState === 9) {
         this.processForm.taskId = this.taskId
diff --git a/src/views/caseManage/caseDetail.vue b/src/views/caseManage/caseDetail.vue
index bc5b6dc..b8ed029 100644
--- a/src/views/caseManage/caseDetail.vue
+++ b/src/views/caseManage/caseDetail.vue
@@ -20,6 +20,7 @@
         :task-id="taskId"
         :case-state="caseDetail.caseState"
         :limited-time="caseDetail.limitedTime"
+        :case-detail="caseDetail"
         @loading="loading"
         @submitSuccess="submitSuccess"
         @submitError="submitError"
diff --git a/src/views/caseManage/delayApplyList.vue b/src/views/caseManage/delayApplyList.vue
index 1e34554..5ed2204 100644
--- a/src/views/caseManage/delayApplyList.vue
+++ b/src/views/caseManage/delayApplyList.vue
@@ -189,7 +189,7 @@
       })
     },
     approve(row) {
-      this.$confirm('确认同意延期吗', '提示', {
+      this.$confirm('确认同意延期吗?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
@@ -201,7 +201,7 @@
       })
     },
     reject(row) {
-      this.$confirm('确认拒绝延期吗', '提示', {
+      this.$confirm('确认拒绝延期吗?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
diff --git a/src/views/caseManage/waitForHandle.vue b/src/views/caseManage/waitForHandle.vue
index 92113d6..b28f02c 100644
--- a/src/views/caseManage/waitForHandle.vue
+++ b/src/views/caseManage/waitForHandle.vue
@@ -17,10 +17,10 @@
     <el-dialog :visible.sync="delayDialogVisible" :close-on-click-modal="false" title="申请延期" append-to-body @close="cancelDelay">
       <el-form ref="delayForm" :model="delayForm" :rules="delayRules" label-width="auto">
         <el-form-item label="延期时间" prop="delayTime">
-          <el-date-picker v-model="delayForm.delayTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择延期时间"/>
+          <el-date-picker v-model="delayForm.delayTime" :picker-options="pickerOptions" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择延期时间" />
         </el-form-item>
         <el-form-item label="申请理由" prop="applyReason">
-          <el-input v-model="delayForm.applyReason" type="textarea"/>
+          <el-input v-model.trim="delayForm.applyReason" type="textarea"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -41,7 +41,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="上报处理人" prop="processUser">
-              <el-select v-model="reportForm.processUser" :loading="userSelectLoading" filterable placeholder="请选择处理人">
+              <el-select v-model.trim="reportForm.processUser" :loading="userSelectLoading" filterable placeholder="请选择处理人">
                 <el-option v-for="item in reportUserList" :key="item.id" :label="item.name" :value="item.id"/>
               </el-select>
             </el-form-item>
@@ -94,6 +94,8 @@
       total: 0, // 数据总数
       listLoading: true, // 列表加载动画
       delayDialogVisible: false, // 申请延期对话框
+      delayLimitTime: '',
+      // pickerOptions: {},
       delayForm: {
         caseId: '',
         delayTime: '',
@@ -126,6 +128,16 @@
       }
     }
   },
+  computed: {
+    pickerOptions() {
+      var changeTime = this.delayLimitTime
+      return {
+        disabledDate(time) {
+          return time.getTime() < changeTime
+        }
+      }
+    }
+  },
   created() {
     this.fetchData()
     this.fetchReportDeptList()
@@ -162,6 +174,16 @@
     applyDelay(row) {
       this.delayDialogVisible = true
       this.delayForm.caseId = row.id
+      if (row.limitedTime) {
+        const temptime = new Date(row.limitedTime.replace(/-/g, '/'))
+        if (Date.now() < temptime) {
+          this.delayLimitTime = temptime
+        } else {
+          this.delayLimitTime = new Date(Date.now())
+        }
+      } else {
+        this.delayLimitTime = new Date(Date.now())
+      }
     },
     resetDeleyForm() {
       this.$refs['delayForm'].resetFields()