|
@@ -644,6 +644,8 @@ export default {
|
|
|
this.setTicketTitle('编辑作业票')
|
|
this.setTicketTitle('编辑作业票')
|
|
|
}
|
|
}
|
|
|
} else {
|
|
} else {
|
|
|
|
|
+ this.handleAutoGenChange(true)
|
|
|
|
|
+ this.autoGenFlag=true
|
|
|
this.setSelectSopPoints([])
|
|
this.setSelectSopPoints([])
|
|
|
this.setPointTableData([])
|
|
this.setPointTableData([])
|
|
|
this.setTicketTitle('新建作业票')
|
|
this.setTicketTitle('新建作业票')
|
|
@@ -778,7 +780,15 @@ export default {
|
|
|
return item.userRole !== 'jtlocker'
|
|
return item.userRole !== 'jtlocker'
|
|
|
})//过滤上锁人
|
|
})//过滤上锁人
|
|
|
this.tableData = response.data.pointDetailVOList
|
|
this.tableData = response.data.pointDetailVOList
|
|
|
-
|
|
|
|
|
|
|
+ this.orderTableData = response.data.pointDetailVOList.map((point) => {
|
|
|
|
|
+ return {
|
|
|
|
|
+ pointName: point.pointName, // 显示的名称
|
|
|
|
|
+ pointId: point.pointId, // 对应的值
|
|
|
|
|
+ pointType: point.pointType,
|
|
|
|
|
+ powerType: point.powerType,
|
|
|
|
|
+ prePointId: point.prePointId
|
|
|
|
|
+ }
|
|
|
|
|
+ })
|
|
|
this.form.workareaId = response.data.workareaId
|
|
this.form.workareaId = response.data.workareaId
|
|
|
this.newticketUserDTOList = response.data.ticketUserDTOList.filter((item) => {
|
|
this.newticketUserDTOList = response.data.ticketUserDTOList.filter((item) => {
|
|
|
return item.userRole == 'jtlocker'
|
|
return item.userRole == 'jtlocker'
|
|
@@ -1001,7 +1011,7 @@ export default {
|
|
|
new Set(points.map(point => point.pointId))
|
|
new Set(points.map(point => point.pointId))
|
|
|
).map(id => points.find(point => point.pointId === id))
|
|
).map(id => points.find(point => point.pointId === id))
|
|
|
|
|
|
|
|
- if (this.$route.query.ticketId == 'null') {
|
|
|
|
|
|
|
+ if (this.$route.query.ticketId == 'null'&&this.form.sopId=='') {
|
|
|
this.tableData = uniquePoints // 子组件传递过来的选中节点(去重后)
|
|
this.tableData = uniquePoints // 子组件传递过来的选中节点(去重后)
|
|
|
} else {
|
|
} else {
|
|
|
this.tableData = this.sortTableDataByOrder(uniquePoints, this.orderTableData)//去重并排序
|
|
this.tableData = this.sortTableDataByOrder(uniquePoints, this.orderTableData)//去重并排序
|