Merge branch 'bug_mk' into feature

src/views/modules/shequzhili/Delivery/index.vue

@@ -151,7 +151,7 @@
                            
                         </template>
                     </el-table-column>
-                    <el-table-column prop="deptName" align="center" width="110" label="指定部门"
+                    <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="办结时限（部门）"
@@ -166,7 +166,7 @@
                             <!-- <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 == 'processing'|| scope.row.status === 'assigned') && scope.row.operationType === '5'">改派</el-button>
+                                v-if="(scope.row.status == 'processing'|| scope.row.status === 'assigned') && (scope.row.operationType === '5'|| scope.row.operationType === '10')">改派</el-button>
                             <el-button @click="handleDispose(scope.row,'assign')" type="text" size="small"
                                 v-if="scope.row.status =='unassigned'||scope.row.status =='processing'||scope.row.operationType =='13'">派件</el-button>
                             <el-button @click="handleDispose(scope.row,'check')" type="text" size="small"

src/views/modules/shequzhili/event/cpts/event-info.vue

@@ -428,7 +428,7 @@ changeName(val) {
                 this.formData.operationType = this.$refs.ref_processinfo_dispose.operationType;
                 this.replayInfo = this.$refs.ref_processinfo_dispose.replayInfo;
                 this.replayInfo.icEventId = this.eventId;
-                await this.submitDispose('/governance/icEvent/reply', this.replayInfo);
+                await this.submitDispose(this.pageTypeCopy =='assign'?'/governance/icEvent/reply':'/governance/icEvent/multiReply', this.replayInfo);
             } else {
                 return false;
             }