|
|
@@ -904,7 +904,11 @@
|
|
|
}
|
|
|
this.getSampleTypeList(this.multipleSelection)
|
|
|
this.exportType = 'exportchosen'
|
|
|
+ // if (this.ExportSampleTypeList.length <= 2) {
|
|
|
+ // _this.exportsamples(this.exportType)
|
|
|
+ // } else {
|
|
|
this.sampleExportVisible = true
|
|
|
+ // }
|
|
|
// _this.exportsamples('exportchosen')
|
|
|
} else if (command == 'exportpage') { // 导出当前页数据
|
|
|
if (_this.list.length < 1) {
|
|
|
@@ -916,7 +920,11 @@
|
|
|
}
|
|
|
this.getSampleTypeList(null)
|
|
|
this.exportType = 'exportpage'
|
|
|
+ // if (this.ExportSampleTypeList.length <= 2) {
|
|
|
+ // _this.exportsamples(this.exportType)
|
|
|
+ // } else {
|
|
|
this.sampleExportVisible = true
|
|
|
+ // }
|
|
|
// _this.exportsamples('exportpage')
|
|
|
} else if (command == 'exportall') { // 导出所有数据
|
|
|
_this.$confirm('此操作将导出所有满足条件的数据!是否继续导出?', '提示', {
|
|
|
@@ -980,8 +988,8 @@
|
|
|
}
|
|
|
}
|
|
|
let params = {
|
|
|
- currentPage: this.currentPage,
|
|
|
- size: this.size,
|
|
|
+ currentPage: this.exportType == 'exportchosen' ? 0 : this.currentPage,
|
|
|
+ size: this.exportType == 'exportchosen' ? 0 : this.size,
|
|
|
BarCode: this.BarCode,
|
|
|
SampleCode: this.SampleCode,
|
|
|
SampleType: this.SampleType,
|