|
|
@@ -611,7 +611,6 @@ export default {
|
|
|
.then(res => {
|
|
|
this.getSampleTypeList(this.multipleSelection)
|
|
|
this.exportType = 'exportchosen'
|
|
|
- this.sampleExportVisible = true
|
|
|
// _this.exportsamples('exportchosen')
|
|
|
if (store.get('samplewaitstoreseach').searchWithTemplate && store.get('samplewaitstoreseach').searchWithTemplate !==
|
|
|
'') { // 自定义查询
|
|
|
@@ -1147,23 +1146,23 @@ export default {
|
|
|
let params = {
|
|
|
currentPage: this.currentPage,
|
|
|
size: this.size,
|
|
|
- BarCode: this.BarCode,
|
|
|
- SampleCode: this.SampleCode,
|
|
|
- SampleType: this.SampleType,
|
|
|
- Stnotevalue: this.Stnotevalue,
|
|
|
- STNoteField: this.STNoteField,
|
|
|
- Noteitemvalue: this.Noteitemvalue,
|
|
|
- Noteitem: this.Noteitem,
|
|
|
- DItem: this.DItem,
|
|
|
- EquipmentIds: this.EquipmentIds,
|
|
|
- CreateBy: this.CreateBy,
|
|
|
- SourceName: this.SourceName,
|
|
|
- Name: this.Name,
|
|
|
- Validity: this.Validity,
|
|
|
- InnerCode: this.InnerCode,
|
|
|
- GroupName: this.GroupName,
|
|
|
- showColumn: showcolumnarr + '',
|
|
|
- showColumnName: showcolumnnamearr + '',
|
|
|
+ bar_code: this.BarCode,
|
|
|
+ sample_code: this.SampleCode,
|
|
|
+ sample_type: this.SampleType,
|
|
|
+ start_date: this.StartDate,
|
|
|
+ end_date: this.EndDate,
|
|
|
+ d_item: this.DItem,
|
|
|
+ equipment_ids: this.EquipmentIds,
|
|
|
+ stnote_value: this.Stnotevalue,
|
|
|
+ stnote_field: this.STNoteField,
|
|
|
+ create_by: this.CreateBy,
|
|
|
+ source_name: this.SourceName,
|
|
|
+ name: this.Name,
|
|
|
+ validity: this.Validity,
|
|
|
+ inner_code: this.InnerCode,
|
|
|
+ group_name: this.GroupName,
|
|
|
+ show_column: showcolumnarr + '',
|
|
|
+ show_column_name: showcolumnnamearr + '',
|
|
|
type: 'archived'
|
|
|
// showcolumnarr: showcolumnarr + '',
|
|
|
// showcolumnnamearr: showcolumnnamearr + '',
|
|
|
@@ -1207,7 +1206,7 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
let paramsid = {
|
|
|
- Id: id
|
|
|
+ id: id
|
|
|
}
|
|
|
params = Object.assign(params, paramsid)
|
|
|
}
|