|
|
@@ -81,17 +81,32 @@
|
|
|
indexof = indexof + 1
|
|
|
}
|
|
|
})
|
|
|
+ console.log(dataNew,'数据')
|
|
|
if (this.delList && this.delList.length > 0){
|
|
|
- this.tableData = [...dataNew,...this.delList]
|
|
|
+ let indexof = 0
|
|
|
+ let delNew = []
|
|
|
+ dataNew.forEach((t,indexs)=>{
|
|
|
+ let float1 = 0
|
|
|
+ this.delList.forEach((i,index)=>{
|
|
|
+ if (t.sa_dispatchid == i.sa_dispatchid){
|
|
|
+ float1 = 1
|
|
|
+ }
|
|
|
+ })
|
|
|
+ if (float1 != 1){
|
|
|
+ delNew[indexof] = dataNew[indexs]
|
|
|
+ indexof = indexof + 1
|
|
|
+ }
|
|
|
+ })
|
|
|
+ if (delNew && delNew.length > 0){
|
|
|
+ this.tableData = [...dataNew,...delNew]
|
|
|
+ }else {
|
|
|
+ this.tableData = dataNew
|
|
|
+ }
|
|
|
}else {
|
|
|
this.tableData = dataNew
|
|
|
}
|
|
|
}else {
|
|
|
- if (this.delList && this.delList.length > 0){
|
|
|
- this.tableData = [...res.data,...this.delList]
|
|
|
- }else {
|
|
|
- this.tableData = res.data
|
|
|
- }
|
|
|
+ this.tableData = res.data
|
|
|
}
|
|
|
}else {
|
|
|
if (this.addList && this.addList.length > 0){
|