Merge branch '7.31' into dev

# Conflicts:加改派
#	src/views/modules/shequzhili/Delivery/index.vue

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

@@ -156,6 +156,8 @@
                              -->
                             <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>
                             <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"

src/views/modules/shequzhili/event/cpts/process-form-assign.vue

@@ -81,7 +81,7 @@ export default {
                 timeLimit:'',//办结时限
                 deptId:'', //指派部门
                 deptName:'',
-                sendMsg:0,
+                sendMsg:1,
                 status:'assigned'
             },
             orgOptions: [],