diff --git a/src/views/modules/sampleTracking/projectProofTracking.vue b/src/views/modules/sampleTracking/projectProofTracking.vue
index ccfc6f4..caac7cd 100644
--- a/src/views/modules/sampleTracking/projectProofTracking.vue
+++ b/src/views/modules/sampleTracking/projectProofTracking.vue
@@ -2,7 +2,7 @@
-
+
{
+ this.loadUserBuList().then(() => {
+ return Promise.all([this.queryProcessColumns(), this.loadTrackingColumns()])
+ }).then(() => {
this.queryBuProcessConfig()
+ this.getDataList()
})
- this.getDataList()
},
deactivated () {
this.destroyDefaultProcessConfigSortable()
@@ -1684,8 +1686,29 @@ export default {
const displayName = this.getRoleDisplayName(roleValue)
return this.isBlankValue(displayName) ? '-' : displayName
},
+ getSearchBuOptionList () {
+ return this.userBuList
+ .map(item => this.normalizeBuNo(item && item.buNo ? item.buNo : '', this.searchData.site))
+ .filter(item => !!item)
+ },
+ ensureSearchBuNoSelected () {
+ const buOptionList = this.getSearchBuOptionList()
+ if (buOptionList.length === 0) {
+ this.searchData.buNo = ''
+ return ''
+ }
+ const currentBuNo = this.normalizeBuNo(this.searchData.buNo, this.searchData.site)
+ if (currentBuNo && buOptionList.indexOf(currentBuNo) > -1) {
+ this.searchData.buNo = currentBuNo
+ return currentBuNo
+ }
+ // 需求要求查询BU必须有值:为空或无效时默认回退到首个可用BU。
+ this.searchData.buNo = buOptionList[0]
+ return this.searchData.buNo
+ },
loadUserBuList () {
if (this.userBuList.length > 0) {
+ this.ensureSearchBuNoSelected()
this.ensureBuProcessConfigRows()
return Promise.resolve(this.userBuList)
}
@@ -1697,11 +1720,13 @@ export default {
const buNo = item && item.buNo ? String(item.buNo).trim() : ''
return excludedBuNoList.indexOf(buNo) === -1
})
+ this.ensureSearchBuNoSelected()
this.ensureBuProcessConfigRows()
}
return this.userBuList
}).catch(() => {
this.userBuList = []
+ this.ensureSearchBuNoSelected()
this.ensureBuProcessConfigRows()
return []
})
@@ -1916,7 +1941,8 @@ export default {
return this.normalizeBuNo(this.searchData.buNo, this.searchData.site)
},
handleSearchBuChange () {
- // BU筛选变化(含清空)后立即重新查询,并回到第一页。
+ this.ensureSearchBuNoSelected()
+ // BU筛选变化后立即重新查询,并回到第一页。
this.queryProcessColumns().then(() => {
this.getDataList('Y')
})
@@ -2976,7 +3002,6 @@ export default {
resetSearch () {
this.searchData.projectNo = ''
this.searchData.projectDesc = ''
- this.searchData.buNo = ''
this.searchData.testPartNo = ''
this.searchData.partDesc = ''
this.searchData.dryWetType = ''
@@ -2985,6 +3010,7 @@ export default {
this.searchData.projectPartSyncFlag = ''
this.searchData.proofSyncFlag = ''
this.searchData.proofingStatus = ''
+ this.ensureSearchBuNoSelected()
this.queryProcessColumns().then(() => {
this.getDataList('Y')
})