Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216
This commit is contained in:
@@ -888,7 +888,7 @@ export default {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', {
|
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoSplitPage', {
|
||||||
page: this.conditionForm.page,
|
page: this.conditionForm.page,
|
||||||
pageSize: this.conditionForm.pageSize,
|
pageSize: this.conditionForm.pageSize,
|
||||||
standNumber: this.conditionForm.numberName,
|
standNumber: this.conditionForm.numberName,
|
||||||
|
|||||||
@@ -461,7 +461,7 @@ export default {
|
|||||||
// this.standinfoList.push(item)
|
// this.standinfoList.push(item)
|
||||||
// }
|
// }
|
||||||
// })
|
// })
|
||||||
this.total = this.standinfoList.length
|
this.total = res.data.count
|
||||||
this.$nextTick(()=>{
|
this.$nextTick(()=>{
|
||||||
this.$refs.selection.doLayout();
|
this.$refs.selection.doLayout();
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -480,7 +480,7 @@ export default {
|
|||||||
// this.standinfoList.push(item)
|
// this.standinfoList.push(item)
|
||||||
// }
|
// }
|
||||||
// })
|
// })
|
||||||
this.total = this.standinfoList.length
|
this.total = res.data.count
|
||||||
this.$nextTick(()=>{
|
this.$nextTick(()=>{
|
||||||
this.$refs.selection.doLayout();
|
this.$refs.selection.doLayout();
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user