|
@@ -134,6 +134,9 @@
|
|
</el-button>
|
|
</el-button>
|
|
<el-button size="small" icon="el-icon-download" @click="showResponsibility()">责任制
|
|
<el-button size="small" icon="el-icon-download" @click="showResponsibility()">责任制
|
|
</el-button>
|
|
</el-button>
|
|
|
|
+ <el-button v-if="eventStatusValue=='forest_event_status_2' && statusFlag=='1' && dataStatus=='0'"
|
|
|
|
+ size="small" icon="el-icon-download" @click="updateCentereventTEventcatalogueStatus('cz',true)">处置
|
|
|
|
+ </el-button>
|
|
</div>
|
|
</div>
|
|
<div class="z-info-btm-grp-right">
|
|
<div class="z-info-btm-grp-right">
|
|
<el-button size="small" icon="el-icon-mic" @click="joinMeeting()">会议
|
|
<el-button size="small" icon="el-icon-mic" @click="joinMeeting()">会议
|
|
@@ -183,7 +186,7 @@
|
|
@click="updateCentereventTEventcatalogueStatus('ld',false)">
|
|
@click="updateCentereventTEventcatalogueStatus('ld',false)">
|
|
联动
|
|
联动
|
|
</el-button>
|
|
</el-button>
|
|
- <el-button size="small" v-if="dataStatus=='1'"
|
|
|
|
|
|
+ <el-button size="small" v-if="statusFlag=='1'"
|
|
icon="el-icon-success" style="text-align:left"
|
|
icon="el-icon-success" style="text-align:left"
|
|
@click="updateCentereventTEventcatalogueStatus('bj',true)">
|
|
@click="updateCentereventTEventcatalogueStatus('bj',true)">
|
|
办结
|
|
办结
|
|
@@ -193,7 +196,7 @@
|
|
</el-button>
|
|
</el-button>
|
|
</div>
|
|
</div>
|
|
<div class="z-info-btm-input-btn"
|
|
<div class="z-info-btm-input-btn"
|
|
- v-else-if="eventStatusValue=='forest_event_status_5'&&dataStatus=='1'">
|
|
|
|
|
|
+ v-else-if="eventStatusValue=='forest_event_status_5'&&statusFlag=='1'">
|
|
<el-button size="small"
|
|
<el-button size="small"
|
|
icon="el-icon-success" style="text-align:left"
|
|
icon="el-icon-success" style="text-align:left"
|
|
@click="updateCentereventTEventcatalogueStatus('gd',false)">
|
|
@click="updateCentereventTEventcatalogueStatus('gd',false)">
|
|
@@ -962,7 +965,8 @@ import {
|
|
dutysystemList,
|
|
dutysystemList,
|
|
dutysystemAdd,
|
|
dutysystemAdd,
|
|
dutysystemRemove,
|
|
dutysystemRemove,
|
|
- userFeginlist
|
|
|
|
|
|
+ userFeginlist,
|
|
|
|
+ eventHandling
|
|
} from '@/api/forest'
|
|
} from '@/api/forest'
|
|
import {
|
|
import {
|
|
treeselectAll as deptTreeselect
|
|
treeselectAll as deptTreeselect
|
|
@@ -1133,7 +1137,7 @@ export default {
|
|
eventId: null,//事件ID
|
|
eventId: null,//事件ID
|
|
eventType: null,//事件类型-大类
|
|
eventType: null,//事件类型-大类
|
|
eventTypeXl: null,//事件类型-大类
|
|
eventTypeXl: null,//事件类型-大类
|
|
- dataStatus: null,//事件流程按钮
|
|
|
|
|
|
+ statusFlag: null,//事件流程按钮
|
|
deptId: null,//事件流程部门
|
|
deptId: null,//事件流程部门
|
|
eventCode: null,
|
|
eventCode: null,
|
|
eventName: null,
|
|
eventName: null,
|
|
@@ -1726,7 +1730,15 @@ export default {
|
|
that.showEventConfirm = false
|
|
that.showEventConfirm = false
|
|
}
|
|
}
|
|
})
|
|
})
|
|
-
|
|
|
|
|
|
+ } else if(eventStatus == 'cz'){
|
|
|
|
+ eventHandling(that.eventId,that.eventCode).then(res => {
|
|
|
|
+ if (res.code == 200) {
|
|
|
|
+ that.$message.success(`处理成功!`)
|
|
|
|
+ that.refreshEvent(that.eventCode)
|
|
|
|
+ that.cancelEventConfirm_send()
|
|
|
|
+ that.showEventConfirm = false
|
|
|
|
+ }
|
|
|
|
+ })
|
|
} else if (eventStatus == 'gd') {
|
|
} else if (eventStatus == 'gd') {
|
|
let double = /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/; //数字和两位小数
|
|
let double = /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/; //数字和两位小数
|
|
let number = /^[+]{0,1}(\d+)$/g; //正整数
|
|
let number = /^[+]{0,1}(\d+)$/g; //正整数
|
|
@@ -1839,7 +1851,7 @@ export default {
|
|
this.$refs.eventLogUpload.eventLogUpload(this.eventCode)
|
|
this.$refs.eventLogUpload.eventLogUpload(this.eventCode)
|
|
},
|
|
},
|
|
cancelEventShow() {
|
|
cancelEventShow() {
|
|
- this.dataStatus = null
|
|
|
|
|
|
+ this.statusFlag = null
|
|
this.deptId = null
|
|
this.deptId = null
|
|
console.log('关闭事件弹窗')
|
|
console.log('关闭事件弹窗')
|
|
this.eventLogList = []
|
|
this.eventLogList = []
|
|
@@ -1855,7 +1867,7 @@ export default {
|
|
that.address = res.data.catalogue.address
|
|
that.address = res.data.catalogue.address
|
|
that.eventStatusValue = res.data.catalogue.eventStatusValue
|
|
that.eventStatusValue = res.data.catalogue.eventStatusValue
|
|
that.eventType = res.data.catalogue.eventType
|
|
that.eventType = res.data.catalogue.eventType
|
|
- that.dataStatus = res.data.catalogue.dataStatus
|
|
|
|
|
|
+ that.statusFlag = res.data.catalogue.statusFlag
|
|
that.deptId = res.data.catalogue.deptId
|
|
that.deptId = res.data.catalogue.deptId
|
|
that.eventId = res.data.catalogue.id
|
|
that.eventId = res.data.catalogue.id
|
|
that.longitude = res.data.catalogue.longitude
|
|
that.longitude = res.data.catalogue.longitude
|
|
@@ -1940,7 +1952,7 @@ export default {
|
|
that.address = res.data.catalogue.address
|
|
that.address = res.data.catalogue.address
|
|
that.eventStatusValue = res.data.catalogue.eventStatusValue
|
|
that.eventStatusValue = res.data.catalogue.eventStatusValue
|
|
that.eventType = res.data.catalogue.eventType
|
|
that.eventType = res.data.catalogue.eventType
|
|
- that.dataStatus = res.data.catalogue.dataStatus
|
|
|
|
|
|
+ that.statusFlag = res.data.catalogue.statusFlag
|
|
that.deptId = res.data.catalogue.deptId
|
|
that.deptId = res.data.catalogue.deptId
|
|
that.eventId = res.data.catalogue.id
|
|
that.eventId = res.data.catalogue.id
|
|
that.latitude = res.data.catalogue.latitude
|
|
that.latitude = res.data.catalogue.latitude
|