diff --git a/src/views/modules/base/workCenter.vue b/src/views/modules/base/workCenter.vue index 266e130..fd495ef 100644 --- a/src/views/modules/base/workCenter.vue +++ b/src/views/modules/base/workCenter.vue @@ -1551,18 +1551,21 @@ export default { sopFileListSearch(inData).then(({data}) => { // 遍历data for (let i = 0; i < data.rows.length; i++) { - if (data.rows[i].expiryDate != null) { - if (data.rows[i].expiryDate < this.dayjs().format('YYYY-MM-DD')) { - data.rows[i].status = '失效' + if (i + 1 !== data.rows.length){ + data.rows[i].status = '失效' + } else { + if (data.rows[i].expiryDate != null) { + if (data.rows[i].expiryDate < this.dayjs().format('YYYY-MM-DD')) { + data.rows[i].status = '失效' + } else { + data.rows[i].status = '有效' + } } else { data.rows[i].status = '有效' } - } else { - data.rows[i].status = '有效' } this.sopFileList.push(data.rows[i]); this.sopFileList[i].versionNumber = data.rows[i].orderRef4 - } // 如果this.sopFileList不为空,拿到versionNumber的最后一个并给versionNumber赋值(versionNumber由 A + 两位数组成,赋值时给数字+1) if (this.sopFileList.length > 0) { diff --git a/src/views/modules/shopOrder/shopOrder/shopNotice.vue b/src/views/modules/shopOrder/shopOrder/shopNotice.vue index 11fab77..5d0f1e6 100644 --- a/src/views/modules/shopOrder/shopOrder/shopNotice.vue +++ b/src/views/modules/shopOrder/shopOrder/shopNotice.vue @@ -263,13 +263,13 @@ + width="120"> @@ -811,22 +811,29 @@ export default { } this.dataList = data.rows2 // 遍历sopFileList,将每个对象的orderRef4赋值给versionNumber - data.rows3.forEach((item) => { + data.rows3.forEach((item,index) => { + const finalIndex = data.rows3.length - 1 item.fileType = item.fileSuffix item.versionNumber = item.orderRef4 item.resourceInfo = item.orderRef3 + '(' + item.resourceDesc + ')' - if (item.expiryDate !== null) { - if (new Date(item.expiryDate) < new Date()) { - item.status = '失效' + console.log(index) + if (index !== 0){ + if(item.orderRef3 !== data.rows3[index - 1].orderRef3){ + data.rows3[index - 1].status = '有效' + } else { + data.rows3[index - 1].status = '无效' + if (index === finalIndex){ + item.status = '有效' + } } - else { + if (index + 1 === data.rows3.length){ item.status = '有效' } - } else { - item.status = '有效' } + }) + data.rows3.forEach((item) =>{ if (this.searchData.status === '有效'){ - if (item.status !== '失效'){ + if (item.status === '有效'){ this.sopFileList.push(item) } } else {