|
@@ -285,7 +285,7 @@
|
|
</el-option>
|
|
</el-option>
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
- <el-form-item label="事件类型" v-if="eventStatusButton=='qs'">
|
|
|
|
|
|
+ <el-form-item label="事件类型" v-if="eventStatusButton=='qs'&& eventTypeXl == null">
|
|
<el-select v-model="sendEventType" placeholder="请选择事件类型!" clearable>
|
|
<el-select v-model="sendEventType" placeholder="请选择事件类型!" clearable>
|
|
<el-option
|
|
<el-option
|
|
v-for="item in eventTypeList"
|
|
v-for="item in eventTypeList"
|
|
@@ -1174,6 +1174,7 @@ export default {
|
|
eventStatusValue: null,//事件状态
|
|
eventStatusValue: null,//事件状态
|
|
eventId: null,//事件ID
|
|
eventId: null,//事件ID
|
|
eventType: null,//事件类型-大类
|
|
eventType: null,//事件类型-大类
|
|
|
|
+ eventTypeXl: null,//事件类型-小类
|
|
dataStatus: null,//事件流程按钮
|
|
dataStatus: null,//事件流程按钮
|
|
deptId: null,//事件流程部门
|
|
deptId: null,//事件流程部门
|
|
eventCode: null,
|
|
eventCode: null,
|
|
@@ -1656,12 +1657,16 @@ export default {
|
|
if (eventStatus == 'qs') {//签收
|
|
if (eventStatus == 'qs') {//签收
|
|
that.eventConfirmTitle = '事件签收'
|
|
that.eventConfirmTitle = '事件签收'
|
|
let param = { parentId: that.eventType }
|
|
let param = { parentId: that.eventType }
|
|
- await listSJfl(param).then(res => {
|
|
|
|
- //事件类型
|
|
|
|
- if (res.code == 200) {
|
|
|
|
- that.eventTypeList = res.data
|
|
|
|
- }
|
|
|
|
- })
|
|
|
|
|
|
+ if(that.eventTypeXl != null){
|
|
|
|
+ that.sendEventType = that.eventTypeXl;
|
|
|
|
+ }else{
|
|
|
|
+ await listSJfl(param).then(res => {
|
|
|
|
+ //事件类型
|
|
|
|
+ if (res.code == 200) {
|
|
|
|
+ that.eventTypeList = res.data
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ }
|
|
await listYuAn().then(res => {
|
|
await listYuAn().then(res => {
|
|
//关联预案
|
|
//关联预案
|
|
if (res.code == 200) {
|
|
if (res.code == 200) {
|
|
@@ -1899,6 +1904,7 @@ export default {
|
|
that.longitude = res.data.catalogue.longitude
|
|
that.longitude = res.data.catalogue.longitude
|
|
that.latitude = res.data.catalogue.latitude
|
|
that.latitude = res.data.catalogue.latitude
|
|
that.eventName = res.data.catalogue.eventName
|
|
that.eventName = res.data.catalogue.eventName
|
|
|
|
+ that.eventTypeXl = res.data.catalogue.eventTypeXl
|
|
let markersMap = {
|
|
let markersMap = {
|
|
lng: 124.59,
|
|
lng: 124.59,
|
|
lat: 43.02,
|
|
lat: 43.02,
|
|
@@ -1983,6 +1989,7 @@ export default {
|
|
that.latitude = res.data.catalogue.latitude
|
|
that.latitude = res.data.catalogue.latitude
|
|
that.longitude = res.data.catalogue.longitude
|
|
that.longitude = res.data.catalogue.longitude
|
|
that.eventName = res.data.catalogue.eventName
|
|
that.eventName = res.data.catalogue.eventName
|
|
|
|
+ that.eventTypeXl = res.data.catalogue.eventTypeXl
|
|
let markersMap = {
|
|
let markersMap = {
|
|
lng: 124.59,
|
|
lng: 124.59,
|
|
lat: 43.02,
|
|
lat: 43.02,
|