|
|
@@ -350,7 +350,7 @@ export default {
|
|
|
this.size = parseInt(this.$route.query.size)
|
|
|
this.currentPage = parseInt(this.$route.query.currentPage)
|
|
|
|
|
|
- let searchmodel = store.get('samplewaitstoreseach')
|
|
|
+ let searchmodel = store.get('samplearchivedseach')
|
|
|
if (typeof (searchmodel) !== 'undefined') {
|
|
|
if (searchmodel.BarCode && searchmodel.BarCode !== '') { // 样本条码
|
|
|
this.BarCode = searchmodel.BarCode
|
|
|
@@ -391,10 +391,10 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
|
- store.set('samplewaitstoreseach', '')
|
|
|
+ store.set('samplearchivedseach', '')
|
|
|
}
|
|
|
|
|
|
- this.cachecols = store.get('samplewaitstoreshowcolumn')
|
|
|
+ this.cachecols = store.get('samplearchivedshowcolumn')
|
|
|
// 当前显示列无数据，使用已录入样本显示列数据
|
|
|
if (!(this.cachecols && this.cachecols !== '')) {
|
|
|
this.cachecols = store.get('sapminputshowcolumn')
|
|
|
@@ -474,6 +474,7 @@ export default {
|
|
|
kuoz: false
|
|
|
}]
|
|
|
}
|
|
|
+ this.initData()
|
|
|
this.getextends()
|
|
|
this.checkedshowall()
|
|
|
this.getAllSearchTab()
|
|
|
@@ -526,7 +527,7 @@ export default {
|
|
|
CreateBy: this.CreateBy,
|
|
|
SourceName: this.SourceName,
|
|
|
DItem: this.DItem,
|
|
|
- EquipmentIds: this.EquipmentIds,
|
|
|
+ EquipmentIds: this.EquipmentIds.join(','),
|
|
|
Name: this.Name,
|
|
|
Validity: this.Validity,
|
|
|
CreateOn: this.CreateOn,
|
|
|
@@ -564,7 +565,7 @@ export default {
|
|
|
.then(res => {
|
|
|
this.EquipmentList = res.data
|
|
|
})
|
|
|
- this.$refs.multipleTable.doLayout()
|
|
|
+ /* this.$refs.multipleTable.doLayout() */
|
|
|
// 获取样本扩展列表
|
|
|
service.postRequest('dashoo.biobank.bee-0.1', 'SampleRelated', 'CustomizeSearch', {type: 'Sample'})
|
|
|
.then(res => {
|
|
|
@@ -612,15 +613,18 @@ export default {
|
|
|
this.getSampleTypeList(this.multipleSelection)
|
|
|
this.exportType = 'exportchosen'
|
|
|
// _this.exportsamples('exportchosen')
|
|
|
- if (store.get('samplewaitstoreseach').searchWithTemplate && store.get('samplewaitstoreseach').searchWithTemplate !==
|
|
|
+ if (store.get('samplearchivedseach').searchWithTemplate && store.get('samplearchivedseach').searchWithTemplate !==
|
|
|
'') { // 自定义查询
|
|
|
- this.handleSearchCommand(store.get('samplewaitstoreseach').searchWithTemplate)
|
|
|
+ this.handleSearchCommand(store.get('samplearchivedseach').searchWithTemplate)
|
|
|
} else {
|
|
|
this.initData()
|
|
|
}
|
|
|
}).catch(() => {})
|
|
|
},
|
|
|
seachdata () {
|
|
|
+ if (this.selectedzuzhi.length > 0) {
|
|
|
+ this.selectsigorg = this.selectedzuzhi[this.selectedzuzhi.length - 1] + ''
|
|
|
+ }
|
|
|
this.currentPage = 1
|
|
|
this.initData()
|
|
|
this.dialogVisible = false
|
|
|
@@ -675,7 +679,7 @@ export default {
|
|
|
},
|
|
|
// 自定义显示列保存操作
|
|
|
saveshowfiled () {
|
|
|
- store.set('samplewaitstoreshowcolumn', this.showcolumn)
|
|
|
+ store.set('samplearchivedshowcolumn', this.showcolumn)
|
|
|
this.columndialogVisible = false
|
|
|
this.$message({
|
|
|
type: 'success',
|
|
|
@@ -687,7 +691,7 @@ export default {
|
|
|
for (var i = 0; i < this.showcolumn.length; i++) {
|
|
|
if (this.showcolumn[i].name === column.label) {
|
|
|
this.showcolumn[i].columnwidth = newWidth
|
|
|
- store.set('samplewaitstoreshowcolumn', this.showcolumn)
|
|
|
+ store.set('samplearchivedshowcolumn', this.showcolumn)
|
|
|
return
|
|
|
}
|
|
|
}
|
|
|
@@ -896,7 +900,7 @@ export default {
|
|
|
|
|
|
}
|
|
|
let _this = this
|
|
|
- this.$axios.get('/samplesunsave/search?name=' + name, {
|
|
|
+ this.$axios.get('/samplesfiles/search?name=' + name, {
|
|
|
params
|
|
|
})
|
|
|
.then(res => {
|
|
|
@@ -1017,7 +1021,7 @@ export default {
|
|
|
return
|
|
|
}
|
|
|
}
|
|
|
- this.$axios.put('/samplesunsave/batchresample', _this.multipleSelection)
|
|
|
+ this.$axios.put('/samplesfiles/batchresample', _this.multipleSelection)
|
|
|
.then(res => {
|
|
|
if (res.data.code == 0) {
|
|
|
_this.$message({
|
gongyb