diff --git a/src/views/modules/sampleTracking/projectProofTracking.vue b/src/views/modules/sampleTracking/projectProofTracking.vue index 4142959..7f8b082 100644 --- a/src/views/modules/sampleTracking/projectProofTracking.vue +++ b/src/views/modules/sampleTracking/projectProofTracking.vue @@ -12,13 +12,13 @@ - + - + @@ -50,7 +50,7 @@ - + @@ -65,10 +65,17 @@ - + + - 查询 重置 @@ -1401,7 +1408,7 @@ export default { proofingNo: '', projectPartSyncFlag: '', proofSyncFlag: '', - proofingStatus: '' + proofingStatusList: [] }, searchCustomerOptions: [], searchCustomerOptionLoading: false, @@ -2381,6 +2388,20 @@ export default { getSelectedSearchBuNo () { return this.normalizeBuNo(this.searchData.buNo, this.searchData.site) }, + normalizeSearchProofingStatusList (statusList) { + if (!Array.isArray(statusList) || statusList.length === 0) { + return [] + } + const normalizedStatusList = [] + statusList.forEach(item => { + const status = this.isBlankValue(item) ? '' : String(item).trim() + if (!status || normalizedStatusList.indexOf(status) > -1) { + return + } + normalizedStatusList.push(status) + }) + return normalizedStatusList + }, getSearchCustomerOptionLabel (item) { const customerNo = item && !this.isBlankValue(item.customerNo) ? String(item.customerNo).trim() @@ -3692,11 +3713,14 @@ export default { } this.searchData.site = this.$store.state.user.site this.searchData.userName = this.$store.state.user.name + const normalizedProofingStatusList = this.normalizeSearchProofingStatusList(this.searchData.proofingStatusList) + this.searchData.proofingStatusList = normalizedProofingStatusList const inData = Object.assign({}, this.searchData, { page: this.pageIndex, limit: this.pageSize }) inData.buNo = this.normalizeBuNo(inData.buNo, inData.site) + inData.proofingStatusList = normalizedProofingStatusList this.dataListLoading = true searchProofTracking(inData).then(({ data }) => { this.dataListLoading = false @@ -3771,12 +3795,15 @@ export default { this.$message.warning('当前没有可导出的列') return } + const normalizedProofingStatusList = this.normalizeSearchProofingStatusList(this.searchData.proofingStatusList) + this.searchData.proofingStatusList = normalizedProofingStatusList const inData = Object.assign({}, this.searchData, { buNo: this.normalizeBuNo(this.searchData.buNo, this.searchData.site), exportTrackingColumns: exportTrackingColumns, exportProcessColumns: exportProcessColumns, exportCommentsColumn: true }) + inData.proofingStatusList = normalizedProofingStatusList this.exportLoading = true try { const response = await exportProofTracking(inData) @@ -3850,7 +3877,7 @@ export default { this.searchData.proofingNo = '' this.searchData.projectPartSyncFlag = '' this.searchData.proofSyncFlag = '' - this.searchData.proofingStatus = '' + this.searchData.proofingStatusList = [] this.ensureSearchBuNoSelected() this.queryProcessColumns().then(() => { this.getDataList('Y') @@ -4967,7 +4994,7 @@ export default { this.searchData.proofingNo = '' this.searchData.projectPartSyncFlag = '' this.searchData.proofSyncFlag = '' - this.searchData.proofingStatus = '' + this.searchData.proofingStatusList = [] this.getDataList('Y') } else { this.$message.error(data.msg || '一键创建失败') @@ -5837,6 +5864,17 @@ export default { margin-bottom: 0; } +.search-proofing-status-select .el-select__tags { + flex-wrap: nowrap; + overflow-x: auto; + overflow-y: hidden; +} + +.search-proofing-status-select .el-select__tags > span { + display: inline-flex; + flex-wrap: nowrap; +} + .button-group-col { width: 100%; margin-top: 16px;